Add option to enable ceph storage on controller

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

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index a6518c0..caf9fcf 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -27,25 +27,33 @@ if !str2bool(hiera('enable_package_install', 'false')) {
 if hiera('step') >= 1 {
 
   $controller_node_ips = split(hiera('controller_node_ips'), ',')
+  $enable_pacemaker = str2bool(hiera('enable_pacemaker'))
+  $enable_keepalived = !$enable_pacemaker
+
   class { '::tripleo::loadbalancer' :
     controller_hosts => $controller_node_ips,
   }
 
-  class { '::corosync':
-    quorum_members => $controller_node_ips,
-  }
-  corosync::service { 'pacemaker':
-    version => '0',
-  }
-  service { 'pacemaker':
-    ensure  => running,
-    require => Service['corosync'],
-  }
-  cs_property { 'stonith-enabled':
-    value => 'false',
-  }
-  cs_property { 'no-quorum-policy':
-    value => 'ignore',
+  if $enable_pacemaker {
+    $pacemaker_cluster_members = regsubst(hiera('controller_node_ips'), ',', ' ', 'G')
+    if $::hostname == downcase(hiera('bootstrap_nodeid')) {
+      $pacemaker_master = true
+    } else {
+      $pacemaker_master = false
+    }
+    user { 'hacluster':
+     ensure => present,
+    } ->
+    class { '::pacemaker':
+      hacluster_pwd => hiera('hacluster_pwd'),
+    } ->
+    class { '::pacemaker::corosync':
+      cluster_members => $pacemaker_cluster_members,
+      setup_cluster   => $pacemaker_master,
+    }
+    class { '::pacemaker::stonith':
+      disable => true,
+    }
   }
 
 }
@@ -71,12 +79,32 @@ if hiera('step') >= 2 {
     }
   }
 
+  # Redis
+  $redis_node_ips = split(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,
+  }
+
+  if count($redis_node_ips) > 1 {
+    Class['::tripleo::redis_notification'] -> Service['redis-sentinel']
+    include ::redis::sentinel
+    class {'::tripleo::redis_notification' :
+      haproxy_monitor_ip => hiera('tripleo::loadbalancer::controller_virtual_ip'),
+    }
+  }
+
   if str2bool(hiera('enable_galera', 'true')) {
     $mysql_config_file = '/etc/my.cnf.d/galera.cnf'
   } else {
     $mysql_config_file = '/etc/my.cnf.d/server.cnf'
   }
-
   # TODO Galara
   class { 'mysql::server':
     config_file => $mysql_config_file,
@@ -178,6 +206,11 @@ if hiera('step') >= 2 {
     include ::ceph::profile::mon
   }
 
+  if str2bool(hiera('enable_ceph_storage', 'false')) {
+    include ::ceph::profile::client
+    include ::ceph::profile::osd
+  }
+
 } #END STEP 2
 
 if hiera('step') >= 3 {
@@ -217,6 +250,7 @@ if hiera('step') >= 3 {
   }
 
   # TODO: notifications, scrubber, etc.
+  include ::glance
   include ::glance::api
   include ::glance::registry
   include ::glance::backend::swift