Adds neutron-server and agents as pacemaker resources

[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 eca6a9d..14c74ca 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -26,48 +26,13 @@ if !str2bool(hiera('enable_package_install', 'false')) {
 
 if hiera('step') >= 1 {
 
+  create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
   $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,
-    manage_vip       => $enable_keepalived,
-  }
-
-  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 $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,
   }
 
 }
@@ -81,6 +46,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')
@@ -126,8 +92,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',
+      },
     }
   }
 
@@ -194,29 +162,24 @@ if hiera('step') >= 2 {
     }
   }
 
-  $rabbit_nodes = split(downcase(hiera('rabbit_node_names', $::hostname)), ',')
+  $rabbit_nodes = hiera('rabbit_node_ips')
   if count($rabbit_nodes) > 1 {
-    $rabbit_cluster = true
-  }
-  else {
-    $rabbit_cluster = false
-  }
-  class { 'rabbitmq':
-    config_cluster   => $rabbit_cluster,
-    cluster_nodes    => $rabbit_nodes,
-    node_ip_address  => hiera('controller_host'),
-  }
-  if $rabbit_cluster {
+    class { '::rabbitmq':
+      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'),
+    }
     rabbitmq_policy { 'ha-all@/':
       pattern    => '^(?!amq\.).*',
       definition => {
-        'ha-mode'      => 'all',
-        'ha-sync-mode' => 'automatic',
+        'ha-mode' => 'all',
       },
     }
-  }
-  rabbitmq_vhost { '/':
-    provider => 'rabbitmqctl',
+  } else {
+    include ::rabbitmq
   }
 
   # pre-install swift here so we can build rings
@@ -275,11 +238,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')]),
@@ -295,8 +268,11 @@ if hiera('step') >= 3 {
 
   include ::neutron
   include ::neutron::server
-  include ::neutron::agents::dhcp
   include ::neutron::agents::l3
+  include ::neutron::agents::dhcp
+  class { 'neutron::agents::metadata':
+    auth_url => join(['http://', hiera('controller_virtual_ip'), ':35357/v2.0']),
+  }
 
   file { '/etc/neutron/dnsmasq-neutron.conf':
     content => hiera('neutron_dnsmasq_options'),
@@ -307,18 +283,13 @@ if hiera('step') >= 3 {
   }
 
   class { 'neutron::plugins::ml2':
-    flat_networks        => split(hiera('neutron_flat_networks'), ','),
+    flat_networks => split(hiera('neutron_flat_networks'), ','),
     tenant_network_types => [hiera('neutron_tenant_network_type')],
-    type_drivers         => [hiera('neutron_tenant_network_type')],
+    type_drivers => [hiera('neutron_tenant_network_type')],
   }
-
   class { 'neutron::agents::ml2::ovs':
-    bridge_mappings  => split(hiera('neutron_bridge_mappings'), ','),
-    tunnel_types     => split(hiera('neutron_tunnel_types'), ','),
-  }
-
-  class { 'neutron::agents::metadata':
-    auth_url => join(['http://', hiera('controller_virtual_ip'), ':35357/v2.0']),
+    bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
+    tunnel_types => split(hiera('neutron_tunnel_types'), ','),
   }
 
   Service['neutron-server'] -> Service['neutron-dhcp-service']
@@ -444,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',