Clone params for pacemaker rabbitmq resource

[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 6e8bf5a..a11df05 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -24,51 +24,13 @@ if !str2bool(hiera('enable_package_install', 'false')) {
   }
 }
 
-$enable_pacemaker = str2bool(hiera('enable_pacemaker'))
-$enable_keepalived = !$enable_pacemaker
-if $::hostname == downcase(hiera('bootstrap_nodeid')) {
-  $pacemaker_master = true
-} else {
-  $pacemaker_master = false
-}
-
 if hiera('step') >= 1 {
 
   $controller_node_ips = split(hiera('controller_node_ips'), ',')
 
   class { '::tripleo::loadbalancer' :
     controller_hosts => $controller_node_ips,
-    manage_vip       => $enable_keepalived,
-  }
-
-  if $enable_pacemaker {
-    $pacemaker_cluster_members = regsubst(hiera('controller_node_ips'), ',', ' ', 'G')
-    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 $pacemaker_master {
-      $control_vip = hiera('tripleo::loadbalancer::controller_virtual_ip')
-      pacemaker::resource::ip { 'control_vip':
-        ip_address => $control_vip,
-      }
-      $public_vip = hiera('tripleo::loadbalancer::public_virtual_ip')
-      pacemaker::resource::ip { 'public_vip':
-        ip_address => $public_vip,
-      }
-      pacemaker::resource::systemd { 'haproxy':
-        clone => true,
-      }
-    }
+    manage_vip       => true,
   }
 
 }
@@ -82,6 +44,7 @@ if hiera('step') >= 2 {
   # MongoDB
   if downcase(hiera('ceilometer_backend')) == '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')
@@ -127,8 +90,10 @@ if hiera('step') >= 2 {
     config_file => $mysql_config_file,
     override_options => {
       'mysqld' => {
-        'bind-address' => hiera('controller_host')
-      }
+        'bind-address' => hiera('controller_host'),
+        'max_connections' => '1024',
+        'open_files_limit' => '-1',
+      },
     }
   }
 
@@ -195,46 +160,24 @@ if hiera('step') >= 2 {
     }
   }
 
-  if $enable_pacemaker {
-    # the module ignores erlang_cookie if cluster_config is false
-    file { '/var/lib/rabbitmq/.erlang.cookie':
-      ensure  => 'present',
-      owner   => 'rabbitmq',
-      group   => 'rabbitmq',
-      mode    => '0400',
-      content => hiera('rabbitmq::erlang_cookie'),
-      replace => true,
-    } ->
+  $rabbit_nodes = hiera('rabbit_node_ips')
+  if count($rabbit_nodes) > 1 {
     class { '::rabbitmq':
-      service_manage        => false,
-      environment_variables => {
-        'RABBITMQ_NODENAME' => "rabbit@$::hostname",
-      },
+      config_cluster          => true,
+      cluster_nodes           => $rabbit_nodes,
+      tcp_keepalive           => false,
+      config_kernel_variables => hiera('rabbitmq_kernel_variables'),
+      config_variables        => hiera('rabbitmq_config_variables'),
+      environment_variables   => hiera('rabbitmq_environment'),
     }
-    if $pacemaker_master {
-      pacemaker::resource::ocf { 'rabbitmq':
-        resource_name => 'heartbeat:rabbitmq-cluster',
-        options       => 'set_policy=\'ha-all ^(?!amq\.).* {"ha-mode":"all"}\'',
-        clone         => true,
-        require       => Class['::rabbitmq'],
-      }
+    rabbitmq_policy { 'ha-all@/':
+      pattern    => '^(?!amq\.).*',
+      definition => {
+        'ha-mode' => 'all',
+      },
     }
   } else {
-    $rabbit_nodes = split(hiera('rabbit_node_ips'), ',')
-    if count($rabbit_nodes) > 1 {
-      class { '::rabbitmq':
-        config_cluster  => true,
-        cluster_nodes   => $rabbit_nodes,
-      }
-      rabbitmq_policy { 'ha-all@/':
-        pattern    => '^(?!amq\.).*',
-        definition => {
-          'ha-mode' => 'all',
-        },
-      }
-    } else {
-      include ::rabbitmq
-    }
+    include ::rabbitmq
   }
 
   # pre-install swift here so we can build rings
@@ -293,11 +236,21 @@ if hiera('step') >= 3 {
     require => File['/etc/keystone/ssl/certs'],
   }
 
+  $glance_backend = downcase(hiera('glance_backend', 'swift'))
+  case $glance_backend {
+      swift: { $glance_store = 'glance.store.swift.Store' }
+      file: { $glance_store = 'glance.store.filesystem.Store' }
+      rbd: { $glance_store = 'glance.store.rbd.Store' }
+      default: { fail('Unrecognized glance_backend parameter.') }
+  }
+
   # TODO: notifications, scrubber, etc.
   include ::glance
-  include ::glance::api
+  class { 'glance::api':
+    known_stores => [$glance_store]
+  }
   include ::glance::registry
-  include ::glance::backend::swift
+  include join(['::glance::backend::', $glance_backend])
 
   class { 'nova':
     glance_api_servers     => join([hiera('glance_protocol'), '://', hiera('controller_virtual_ip'), ':', hiera('glance_port')]),
@@ -462,6 +415,13 @@ if hiera('step') >= 3 {
   include ::heat::api_cloudwatch
   include ::heat::engine
 
+  # Horizon
+  $vhost_params = { add_listen => false }
+  class { 'horizon':
+    cache_server_ip    => split(hiera('memcache_node_ips', '127.0.0.1'), ','),
+    vhost_extra_params => $vhost_params,
+  }
+
   $snmpd_user = hiera('snmpd_readonly_user_name')
   snmp::snmpv3_user { $snmpd_user:
     authtype => 'MD5',