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 3e3f2e7..caf9fcf 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -26,11 +26,36 @@ if !str2bool(hiera('enable_package_install', 'false')) {
 
 if hiera('step') >= 1 {
 
-  $controller_node_ips = split(downcase(hiera('controller_node_ips')), ',')
+  $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,
   }
 
+  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,
+    }
+  }
+
 }
 
 if hiera('step') >= 2 {
@@ -39,12 +64,47 @@ if hiera('step') >= 2 {
     include ::ntp
   }
 
+  # MongoDB
+  include ::mongodb::globals
+  include ::mongodb::server
+  $mongo_node_ips = split(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')
+  $ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}"
+  if downcase(hiera('bootstrap_nodeid')) == $::hostname {
+    mongodb_replset { $mongodb_replset :
+      members => $mongo_node_ips_with_port,
+    }
+  }
+
+  # 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,
@@ -107,14 +167,6 @@ if hiera('step') >= 2 {
     dbname        => $heat_dsn[6],
     allowed_hosts => $allowed_hosts,
   }
-  $ceilometer_dsn = split(hiera('ceilometer::db::database_connection'), '[@:/?]')
-  class { 'ceilometer::db::mysql':
-    user          => $ceilometer_dsn[3],
-    password      => $ceilometer_dsn[4],
-    host          => $ceilometer_dsn[5],
-    dbname        => $ceilometer_dsn[6],
-    allowed_hosts => $allowed_hosts,
-  }
 
   $rabbit_nodes = split(downcase(hiera('rabbit_node_names', $::hostname)), ',')
   if count($rabbit_nodes) > 1 {
@@ -154,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 {
@@ -193,6 +250,7 @@ if hiera('step') >= 3 {
   }
 
   # TODO: notifications, scrubber, etc.
+  include ::glance
   include ::glance::api
   include ::glance::registry
   include ::glance::backend::swift
@@ -327,13 +385,15 @@ if hiera('step') >= 3 {
   # Ceilometer
   include ::ceilometer
   include ::ceilometer::api
-  include ::ceilometer::db
   include ::ceilometer::agent::notification
   include ::ceilometer::agent::central
   include ::ceilometer::alarm::notifier
   include ::ceilometer::alarm::evaluator
   include ::ceilometer::expirer
   include ::ceilometer::collector
+  class { '::ceilometer::db' :
+    database_connection => $ceilometer_mongodb_conn_string,
+  }
   class { 'ceilometer::agent::auth':
     auth_url => join(['http://', hiera('controller_virtual_ip'), ':5000/v2.0']),
   }