diff --git a/contrail/environment/modules/contrail/files/galera_setup_gcomm_mod.py b/contrail/environment/modules/contrail/files/galera_setup_gcomm_mod.py
index 512bd5aa..3e5a65c7 100755
--- a/contrail/environment/modules/contrail/files/galera_setup_gcomm_mod.py
+++ b/contrail/environment/modules/contrail/files/galera_setup_gcomm_mod.py
@@ -102,6 +102,7 @@ def fixup_config_files(self):
                                         template_vals,
                                         self._temp_dir_name + '/galera_param')
         local("sudo mv %s/galera_param /etc/contrail/ha/" % (self._temp_dir_name))
+        zk_servers_ports = ','.join(['%s:2181' %(s) for s in self._args.zoo_ip_list])
 
 
         if self.check_cluster(self._args.galera_ip_list, self._args.self_ip):
diff --git a/contrail/environment/modules/contrail/manifests/lib/contrail_install_repo.pp b/contrail/environment/modules/contrail/manifests/lib/contrail_install_repo.pp
index 6dccc30b..9ef0aed8 100644
--- a/contrail/environment/modules/contrail/manifests/lib/contrail_install_repo.pp
+++ b/contrail/environment/modules/contrail/manifests/lib/contrail_install_repo.pp
@@ -14,10 +14,13 @@
 
     if ( $package_name != '' ) {
         package {$package_name: ensure => latest, install_options => '--force-yes'} ->
+
         package { ['binutils', 'make', 'libdpkg-perl', 'patch', 'dpkg-dev',
                    'python-software-properties', 'contrail-fabric-utils', 'contrail-setup' ] :
             ensure => latest
         } ->
+
+        package {Fabric: ensure => present, provider => pip, install_options => ['--find-links=file://opt/contrail/python_packages']}
         # May need to install fabric-utils here. below commented out code is kept for reference, in case needed.
         # pip install --upgrade --no-deps --index-url='' /opt/contrail/python_packages/Fabric-*.tar.gz
 
diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp b/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp
index c0696465..34ec6142 100644
--- a/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp
@@ -2,7 +2,9 @@
 # The puppet module to set up openstack::heat for contrail
 #
 #
-class contrail::profile::openstack::heat () {
+class contrail::profile::openstack::heat (
+  $heat_auth_encryption_key = $::openstack::config::heat_encryption_key
+) {
     openstack::resources::controller { 'heat': }
     openstack::resources::database { 'heat': }
     openstack::resources::firewall { 'Heat API': port     => '8004', }
@@ -65,7 +67,7 @@
     }
 
     class { '::heat::engine':
-      auth_encryption_key => $::openstack::config::heat_encryption_key,
+      auth_encryption_key => $heat_auth_encryption_key
     }
 
     $contrail_api_server = $::contrail::params::config_ip_to_use
diff --git a/contrail/environment/modules/neutron/manifests/init.pp b/contrail/environment/modules/neutron/manifests/init.pp
index eb36c673..267ce244 100644
--- a/contrail/environment/modules/neutron/manifests/init.pp
+++ b/contrail/environment/modules/neutron/manifests/init.pp
@@ -189,11 +189,6 @@
 #   If set to boolean false, it will not log to any directory
 #   Defaults to /var/log/neutron
 #
-# [*notification_driver*]
-#   (optional) Driver or drivers to handle sending notifications.
-#   Value can be a string or a list.
-#   Defaults to []
-#
 class neutron (
   $enabled                     = true,
   $package_ensure              = 'present',
@@ -251,7 +246,6 @@
   $log_facility                = 'LOG_USER',
   $log_file                    = false,
   $log_dir                     = '/var/log/neutron',
-  $notification_driver         = '',
 ) {
 
   include neutron::params
@@ -321,7 +315,6 @@
     'DEFAULT/allow_overlapping_ips':   value => $allow_overlapping_ips;
     'DEFAULT/control_exchange':        value => $control_exchange;
     'DEFAULT/rpc_backend':             value => $rpc_backend;
-    'DEFAULT/notification_driver':     value => $notification_driver;
     'agent/root_helper':               value => $root_helper;
     'agent/report_interval':           value => $report_interval;
   }
diff --git a/contrail/environment/modules/openstack/manifests/common/contrail/neutron.pp b/contrail/environment/modules/openstack/manifests/common/contrail/neutron.pp
index 3643d492..75a43062 100644
--- a/contrail/environment/modules/openstack/manifests/common/contrail/neutron.pp
+++ b/contrail/environment/modules/openstack/manifests/common/contrail/neutron.pp
@@ -5,12 +5,6 @@
 # This follows the suggest deployment from the neutron Administrator Guide.
 class openstack::common::contrail::neutron {
   $controller_management_address = $::openstack::config::controller_address_management
-  $enable_ceilometer = $::contrail::params::enable_ceilometer
-  if ($enable_ceilometer) {
-       $notification_driver = 'neutron.openstack.common.notifier.rpc_notifier'
-  } else {
-       $notification_driver = ''
-  }
 
   $data_network = $::openstack::config::network_data
   $data_address = ip_for_network($data_network)
@@ -33,7 +27,6 @@
     debug                 => $::openstack::config::debug,
     verbose               => $::openstack::config::verbose,
     service_plugins       => ['neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin'],
-    notification_driver   => $notification_driver,
   }
 
   class { '::neutron::server':
diff --git a/contrail/environment/modules/openstack/manifests/init.pp b/contrail/environment/modules/openstack/manifests/init.pp
index da08afc9..d8f60d66 100644
--- a/contrail/environment/modules/openstack/manifests/init.pp
+++ b/contrail/environment/modules/openstack/manifests/init.pp
@@ -179,6 +179,7 @@
 #
 # [*heat_encryption_key*]
 #   The encyption key for the shared heat services.
+#   Defaults to "notgood but just long enough i think"
 #
 # == Horizon
 # [*horizon_secret_key*]
@@ -283,7 +284,7 @@
   $ceilometer_password = undef,
   $ceilometer_meteringsecret = undef,
   $heat_password = undef,
-  $heat_encryption_key = undef,
+  $heat_encryption_key = "notgood but just long enough i think",
   $horizon_secret_key = undef,
   $tempest_configure_images    = undef,
   $tempest_image_name          = undef,
@@ -348,7 +349,7 @@
       ceilometer_password           => hiera(openstack::ceilometer::password),
       ceilometer_meteringsecret     => hiera(openstack::ceilometer::meteringsecret),
       heat_password                 => hiera(openstack::heat::password),
-      heat_encryption_key           => hiera(openstack::heat::encryption_key),
+      heat_encryption_key           => hiera(openstack::heat::encryption_key, $heat_encryption_key),
       horizon_secret_key            => hiera(openstack::horizon::secret_key),
       verbose                       => hiera(openstack::verbose),
       debug                         => hiera(openstack::debug),