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 ac05c36..ae5001a 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -55,6 +55,7 @@ if hiera('step') >= 1 {
   class { '::tripleo::loadbalancer' :
     controller_hosts       => $controller_node_ips,
     controller_hosts_names => $controller_node_names,
+    redis                  => false,
     manage_vip             => false,
     haproxy_service_manage => false,
   }
@@ -96,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,
     }
   }
 
@@ -109,6 +107,13 @@ if hiera('step') >= 1 {
     service_manage => false,
   }
 
+  # Redis
+  class { '::redis' :
+    bind           => '0.0.0.0',
+    service_manage => false,
+    notify_service => false,
+  }
+
   # Galera
   if str2bool(hiera('enable_galera', 'true')) {
     $mysql_config_file = '/etc/my.cnf.d/galera.cnf'
@@ -215,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'],
       }
     }
 
@@ -246,25 +246,35 @@ if hiera('step') >= 2 {
       require         => Class['::mysql::server'],
       before          => Exec['galera-ready'],
     }
-  }
-
-  # Redis
-  $redis_node_ips = hiera('redis_node_ips')
-  $redis_master_hostname = downcase(hiera('bootstrap_nodeid'))
 
-  if $redis_master_hostname == $::hostname {
-    $slaveof = undef
-  } else {
-    $slaveof = "${redis_master_hostname} 6379"
-  }
-  class {'::redis' :
-    slaveof => $slaveof,
-  }
+    pacemaker::resource::ocf { 'redis':
+      ocf_agent_name  => 'heartbeat:redis',
+      master_params   => '',
+      meta_params     => 'notify=true ordered=true interleave=true',
+      resource_params => 'wait_last_known_master=true',
+      require         => Class['::redis'],
+    }
+    $redis_vip = hiera('redis_vip')
+    pacemaker::resource::ip { 'vip-redis':
+      ip_address => $redis_vip,
+    }
+    pacemaker::constraint::base { 'redis-master-then-vip-redis':
+      constraint_type => 'order',
+      first_resource  => 'redis-master',
+      second_resource => "ip-${redis_vip}",
+      first_action    => 'promote',
+      second_action   => 'start',
+      require => [Pacemaker::Resource::Ocf['redis'],
+                  Pacemaker::Resource::Ip['vip-redis']],
+    }
+    pacemaker::constraint::colocation { 'vip-redis-with-redis-master':
+      source  => "ip-${redis_vip}",
+      target  => 'redis-master',
+      score   => 'INFINITY',
+      require => [Pacemaker::Resource::Ocf['redis'],
+                  Pacemaker::Resource::Ip['vip-redis']],
+    }
 
-  if count($redis_node_ips) > 1 {
-    Class['::tripleo::redis_notification'] -> Service['redis-sentinel']
-    include ::redis::sentinel
-    include ::tripleo::redis_notification
   }
 
   exec { 'galera-ready' :
@@ -509,7 +519,6 @@ if hiera('step') >= 3 {
   class { 'neutron::plugins::ml2':
     flat_networks   => split(hiera('neutron_flat_networks'), ','),
     tenant_network_types => [hiera('neutron_tenant_network_type')],
-    type_drivers    => [hiera('neutron_tenant_network_type')],
   }
   class { 'neutron::agents::ml2::ovs':
     # manage_service   => false # not implemented
@@ -574,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,
   }
@@ -648,6 +673,7 @@ if hiera('step') >= 3 {
   class { '::ceilometer::agent::central' :
     manage_service => false,
     enabled => false,
+    coordination_url => "redis://${redis_vip}:6379",
   }
   class { '::ceilometer::alarm::notifier' :
     manage_service => false,
@@ -1176,6 +1202,15 @@ if hiera('step') >= 4 {
                             Pacemaker::Resource::Service[$::mongodb::params::service_name]],
       }
     }
+    pacemaker::constraint::base { 'vip-redis-then-ceilometer-central':
+      constraint_type => 'order',
+      first_resource  => "ip-${redis_vip}",
+      second_resource => "${::ceilometer::params::agent_central_service_name}-clone",
+      first_action    => 'start',
+      second_action   => 'start',
+      require => [Pacemaker::Resource::Service[$::ceilometer::params::agent_central_service_name],
+                  Pacemaker::Resource::Ip['vip-redis']],
+    }
     pacemaker::constraint::base { 'keystone-then-ceilometer-central-constraint':
       constraint_type => 'order',
       first_resource  => "${::keystone::params::service_name}-clone",