Add $hostname.localdomain alias to /etc/hosts

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller_pacemaker.pp

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 1130518..ae5001a 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -97,11 +97,8 @@ if hiera('step') >= 1 {
 
   if downcase(hiera('ceilometer_backend')) == 'mongodb' {
     include ::mongodb::globals
-    # FIXME: replace with service_manage => false on ::mongodb::server
-    # when this is merged: https://github.com/puppetlabs/pupp etlabs-mongodb/pull/198
     class { '::mongodb::server' :
-      service_ensure => undef,
-      service_enable => false,
+      service_manage => false,
     }
   }
 
@@ -223,25 +220,20 @@ if hiera('step') >= 2 {
         op_params    => 'start timeout=120s',
         clone_params => true,
         require      => Class['::mongodb::server'],
-        before       => Exec['mongodb-ready'],
       }
       # NOTE (spredzy) : The replset can only be run
       # once all the nodes have joined the cluster.
       $mongo_node_ips = hiera('mongo_node_ips')
       $mongo_node_ips_with_port = suffix($mongo_node_ips, ':27017')
       $mongo_node_string = join($mongo_node_ips_with_port, ',')
-      $mongodb_replset = hiera('mongodb::server::replset')
-      $mongodb_cluster_ready_command = join(suffix(prefix($mongo_node_ips, '/bin/nc -w1 '), ' 27017 < /dev/null'), ' && ')
       $mongodb_pacemaker_resource = Pacemaker::Resource::Service[$::mongodb::params::service_name]
-      exec { 'mongodb-ready' :
-        command   => $mongodb_cluster_ready_command,
-        timeout   => 30,
-        tries     => 180,
-        try_sleep => 10,
+      $mongodb_replset = hiera('mongodb::server::replset')
+      mongodb_conn_validator { $mongo_node_ips_with_port :
+        require => Pacemaker::Resource::Service[$::mongodb::params::service_name],
+        before  => Mongodb_replset[$mongodb_replset],
       }
       mongodb_replset { $mongodb_replset :
         members => $mongo_node_ips_with_port,
-        require => Exec['mongodb-ready'],
       }
     }
 
@@ -591,7 +583,23 @@ if hiera('step') >= 3 {
     }
   }
 
-  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend])
+  if hiera('cinder_enable_netapp_backend', false) {
+    $cinder_netapp_backend = hiera('cinder::backend::netapp::title')
+
+    cinder_config {
+      "${cinder_netapp_backend}/host": value => 'hostgroup';
+    }
+
+    if hiera('cinder_netapp_nfs_shares', undef) {
+      $cinder_netapp_nfs_shares = split(hiera('cinder_netapp_nfs_shares', undef), ',')
+    }
+
+    cinder::backend::netapp { $cinder_netapp_backend :
+      nfs_shares => $cinder_netapp_nfs_shares,
+    }
+  }
+
+  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_netapp_backend])
   class { '::cinder::backends' :
     enabled_backends => $cinder_enabled_backends,
   }