Merge "Composable firewall rules"

[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 9cdbda0..3778271 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -16,36 +16,9 @@
 include ::tripleo::packages
 include ::tripleo::firewall
 
-$enable_load_balancer = hiera('enable_load_balancer', true)
-
 if hiera('step') >= 2 {
-  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
-  }
   include ::aodh::db::mysql
 
 } #END STEP 2
@@ -77,37 +50,9 @@ if hiera('step') >= 4 {
   include ::aodh::listener
   include ::aodh::client
 
-  # 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}