X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_controller.pp;h=3778271c129d8a9ca7fcbc65e7bc9dd0eb1b0282;hb=77f6c40352adaad6e59b9f39435406a8176e134f;hp=de84bcf8ab27d1406ea1a56aa70e400a154bdf75;hpb=2b2c1ded0b30907194d3e497a9654bbd40f2adba;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index de84bcf8..3778271c 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -16,59 +16,9 @@
 include ::tripleo::packages
 include ::tripleo::firewall
 
-$enable_load_balancer = hiera('enable_load_balancer', true)
-
 if hiera('step') >= 2 {
-
-  # MongoDB
-  if downcase(hiera('ceilometer_backend')) == 'mongodb' {
-    # NOTE(gfidente): We need to pass the list of IPv6 addresses *with* port and
-    # without the brackets as 'members' argument for the 'mongodb_replset'
-    # resource.
-    if str2bool(hiera('mongodb::server::ipv6', false)) {
-      $mongo_node_ips_with_port_prefixed = prefix(hiera('mongo_node_ips'), '[')
-      $mongo_node_ips_with_port = suffix($mongo_node_ips_with_port_prefixed, ']:27017')
-      $mongo_node_ips_with_port_nobr = suffix(hiera('mongo_node_ips'), ':27017')
-    } else {
-      $mongo_node_ips_with_port = suffix(hiera('mongo_node_ips'), ':27017')
-      $mongo_node_ips_with_port_nobr = 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 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
-  # FIXME: due to https://bugzilla.redhat.com/show_bug.cgi?id=1298671 we
-  # set bind-address to a hostname instead of an ip address; to move Mysql
-  # from internal_api on another network we'll have to customize both
-  # MysqlNetwork and ControllerHostnameResolveNetwork in ServiceNetMap
-  class { '::mysql::server':
-    config_file             => $mysql_config_file,
-    override_options        => {
-      'mysqld' => {
-        'bind-address'     => $::hostname,
-        'max_connections'  => hiera('mysql_max_connections'),
-        'open_files_limit' => '-1',
-      },
-    },
-    remove_default_accounts => true,
-  }
-
   # FIXME: this should only occur on the bootstrap host (ditto for db syncs)
   # Create all the database schemas
-  if downcase(hiera('gnocchi_indexer_backend')) == 'mysql' {
-    include ::gnocchi::db::mysql
-  }
-  if downcase(hiera('ceilometer_backend')) == 'mysql' {
-    include ::ceilometer::db::mysql
-  }
   include ::aodh::db::mysql
 
 } #END STEP 2
@@ -87,31 +37,6 @@ if hiera('step') >= 4 {
   }
   include ::nova::config
 
-  # 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::config
-  include ::ceilometer::api
-  include ::ceilometer::agent::notification
-  include ::ceilometer::agent::central
-  include ::ceilometer::expirer
-  include ::ceilometer::collector
-  include ::ceilometer::agent::auth
-  include ::ceilometer::dispatcher::gnocchi
-  class { '::ceilometer::db' :
-    database_connection => $ceilometer_database_connection,
-  }
-
-  Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" }
-
   # Aodh
   class { '::aodh' :
     database_connection => hiera('aodh_mysql_conn_string'),
@@ -125,58 +50,9 @@ if hiera('step') >= 4 {
   include ::aodh::listener
   include ::aodh::client
 
-  # Horizon
-  include ::apache::mod::remoteip
-  if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
-    $_profile_support = 'cisco'
-  } else {
-    $_profile_support = 'None'
-  }
-  $neutron_options   = merge({'profile_support' => $_profile_support },hiera('horizon::neutron_options',undef))
-
-  $memcached_ipv6 = hiera('memcached_ipv6', false)
-  if $memcached_ipv6 {
-    $horizon_memcached_servers = hiera('memcache_node_ips_v6', '[::1]')
-  } else {
-    $horizon_memcached_servers = hiera('memcache_node_ips', '127.0.0.1')
-  }
-
-  class { '::horizon':
-    cache_server_ip => $horizon_memcached_servers,
-    neutron_options => $neutron_options,
-  }
-
-  # Gnocchi
-  $gnocchi_database_connection = hiera('gnocchi_mysql_conn_string')
-  class { '::gnocchi':
-    database_connection => $gnocchi_database_connection,
-  }
-  include ::gnocchi::api
-  include ::gnocchi::wsgi::apache
-  include ::gnocchi::client
-  include ::gnocchi::db::sync
-  include ::gnocchi::storage
-  include ::gnocchi::metricd
-  include ::gnocchi::statsd
-  $gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift'))
-  case $gnocchi_backend {
-      'swift': { include ::gnocchi::storage::swift }
-      'file': { include ::gnocchi::storage::file }
-      'rbd': { include ::gnocchi::storage::ceph }
-      default: { fail('Unrecognized gnocchi_backend parameter.') }
-  }
-
   hiera_include('controller_classes')
 
 } #END STEP 4
 
-if hiera('step') >= 5 {
-  $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
-
-  if $nova_enable_db_purge {
-    include ::nova::cron::archive_deleted_rows
-  }
-} #END STEP 5
-
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])
 package_manifest{$package_manifest_name: ensure => present}