X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_controller.pp;h=9316ae14b372494d8173c13d8e1cb0552c42a525;hb=6b0b761062033ffff68374d182a4b0db1bb33268;hp=8f6398f328ce84dc51afc0d84bd63388ab4a3bad;hpb=17e06c0aa799fc78cb5e03bac518c8b782b8f562;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 8f6398f3..9316ae14 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -26,7 +26,14 @@ if !str2bool(hiera('enable_package_install', 'false')) {
 
 if hiera('step') >= 1 {
 
-  include ::tripleo::loadbalancer
+  create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
+  $controller_node_ips = split(hiera('controller_node_ips'), ',')
+
+  class { '::tripleo::loadbalancer' :
+    controller_hosts => $controller_node_ips,
+    manage_vip       => true,
+  }
 
 }
 
@@ -36,19 +43,65 @@ if hiera('step') >= 2 {
     include ::ntp
   }
 
+  # MongoDB
+  if downcase(hiera('ceilometer_backend')) == 'mongodb' {
+    include ::mongodb::globals
+
+    include ::mongodb::server
+    $mongo_node_ips_with_port = suffix(hiera('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 = 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,
     override_options => {
       'mysqld' => {
-        'bind-address' => hiera('controller_host')
-      }
+        'bind-address' => hiera('mysql_bind_host'),
+        'max_connections' => '1024',
+        'open_files_limit' => '-1',
+      },
     }
   }
 
   # FIXME: this should only occur on the bootstrap host (ditto for db syncs)
   # Create all the database schemas
   # Example DSN format: mysql://user:password@host/dbname
-  $allowed_hosts = ['%',hiera('controller_host')]
+  $allowed_hosts = ['%',hiera('mysql_bind_host')]
   $keystone_dsn = split(hiera('keystone::database_connection'), '[@:/?]')
   class { 'keystone::db::mysql':
     user          => $keystone_dsn[3],
@@ -97,49 +150,35 @@ 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,
-  }
-
-  if $::osfamily == 'RedHat' {
-    $rabbit_provider = 'yum'
-  } else {
-    $rabbit_provider = undef
+  if downcase(hiera('ceilometer_backend')) == 'mysql' {
+    $ceilometer_dsn = split(hiera('ceilometer_mysql_conn_string'), '[@:/?]')
+    class { 'ceilometer::db::mysql':
+      user          => $ceilometer_dsn[3],
+      password      => $ceilometer_dsn[4],
+      host          => $ceilometer_dsn[5],
+      dbname        => $ceilometer_dsn[6],
+      allowed_hosts => $allowed_hosts,
+    }
   }
 
-  Class['rabbitmq'] -> Rabbitmq_vhost <| |>
-  Class['rabbitmq'] -> Rabbitmq_user <| |>
-  Class['rabbitmq'] -> Rabbitmq_user_permissions <| |>
-
-  $rabbit_nodes = split(downcase(hiera('rabbit_nodes', $::hostname)), ',')
+  $rabbit_nodes = hiera('rabbit_node_ips')
   if count($rabbit_nodes) > 1 {
-    $rabbit_cluster = true
-  }
-  else {
-    $rabbit_cluster = false
-  }
-  class { 'rabbitmq':
-    package_provider => $rabbit_provider,
-    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
@@ -155,14 +194,9 @@ if hiera('step') >= 2 {
     include ::ceph::profile::mon
   }
 
-  if $cinder_enable_rbd_backend {
-    ceph::key { 'client.openstack' :
-      secret  => hiera('ceph::profile::params::mon_key'),
-      cap_mon => hiera('ceph_openstack_default_cap_mon'),
-      cap_osd => hiera('ceph_openstack_default_cap_osd'),
-      user    => 'cinder',
-      inject  => 'true',
-    }
+  if str2bool(hiera('enable_ceph_storage', 'false')) {
+    include ::ceph::profile::client
+    include ::ceph::profile::osd
   }
 
 } #END STEP 2
@@ -203,10 +237,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::api
+  include ::glance
+  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')]),
@@ -222,8 +267,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'),
@@ -234,18 +282,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']
@@ -299,7 +342,7 @@ if hiera('step') >= 3 {
     }
   }
 
-  $cinder_enabled_backends = concat(any2array($cinder_iscsi_backend), $cinder_rbd_backend)
+  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend])
   class { '::cinder::backends' :
     enabled_backends => $cinder_enabled_backends,
   }
@@ -320,31 +363,44 @@ if hiera('step') >= 3 {
   include ::swift::proxy::formpost
 
   # swift storage
-  class {'swift::storage::all':
-    mount_check => str2bool(hiera('swift_mount_check'))
-  }
-  if(!defined(File['/srv/node'])) {
-    file { '/srv/node':
-      ensure  => directory,
-      owner   => 'swift',
-      group   => 'swift',
-      require => Package['openstack-swift'],
+  if str2bool(hiera('enable_swift_storage', 'true')) {
+    class {'swift::storage::all':
+      mount_check => str2bool(hiera('swift_mount_check'))
+    }
+    if(!defined(File['/srv/node'])) {
+      file { '/srv/node':
+        ensure  => directory,
+        owner   => 'swift',
+        group   => 'swift',
+        require => Package['openstack-swift'],
+      }
     }
+    $swift_components = ['account', 'container', 'object']
+    swift::storage::filter::recon { $swift_components : }
+    swift::storage::filter::healthcheck { $swift_components : }
   }
-  $swift_components = ['account', 'container', 'object']
-  swift::storage::filter::recon { $swift_components : }
-  swift::storage::filter::healthcheck { $swift_components : }
 
   # Ceilometer
+  $ceilometer_backend = downcase(hiera('ceilometer_backend'))
+  case $ceilometer_backend {
+    /mysql/ : {
+      $ceilometer_database_connection = hiera('ceilometer_mysql_conn_string')
+    }
+    default : {
+      $ceilometer_database_connection = $ceilometer_mongodb_conn_string
+    }
+  }
   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_database_connection,
+  }
   class { 'ceilometer::agent::auth':
     auth_url => join(['http://', hiera('controller_virtual_ip'), ':5000/v2.0']),
   }
@@ -358,6 +414,13 @@ if hiera('step') >= 3 {
   include ::heat::api_cloudwatch
   include ::heat::engine
 
+  # Horizon
+  $vhost_params = { add_listen => false }
+  class { 'horizon':
+    cache_server_ip    => 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',