Merge "Gnocchi composable roles"

2 files changed, 0 insertions, 87 deletions

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 9cdbda0f..bc9a42a4 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -43,9 +43,6 @@ if hiera('step') >= 2 {
 
   # 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,26 +74,6 @@ 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
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index cfa693be..aae5a09f 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -208,12 +208,6 @@ if hiera('step') >= 2 {
       user       => 'clustercheck@localhost',
     }
 
-    if downcase(hiera('gnocchi_indexer_backend')) == 'mysql' {
-      class { '::gnocchi::db::mysql':
-        require => Exec['galera-ready'],
-      }
-    }
-
     class { '::aodh::db::mysql':
         require => Exec['galera-ready'],
     }
@@ -295,40 +289,6 @@ MYSQL_HOST=localhost\n",
     enabled        => false,
   }
 
-  # Gnocchi
-  $gnocchi_database_connection = hiera('gnocchi_mysql_conn_string')
-  include ::gnocchi::client
-  if $sync_db {
-    include ::gnocchi::db::sync
-  }
-  include ::gnocchi::storage
-  $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.') }
-  }
-  class { '::gnocchi':
-    database_connection => $gnocchi_database_connection,
-  }
-  class { '::gnocchi::api' :
-    manage_service => false,
-    enabled        => false,
-    service_name   => 'httpd',
-  }
-  class { '::gnocchi::wsgi::apache' :
-    ssl => false,
-  }
-  class { '::gnocchi::metricd' :
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::gnocchi::statsd' :
-    manage_service => false,
-    enabled        => false,
-  }
-
   hiera_include('controller_classes')
 
 } #END STEP 4
@@ -526,30 +486,6 @@ password=\"${mysql_root_password}\"",
                   Pacemaker::Resource::Service[$::aodh::params::listener_service_name]],
     }
 
-    # gnocchi
-    pacemaker::resource::service { $::gnocchi::params::metricd_service_name :
-      clone_params => 'interleave=true',
-    }
-    pacemaker::resource::service { $::gnocchi::params::statsd_service_name :
-      clone_params => 'interleave=true',
-    }
-    pacemaker::constraint::base { 'gnocchi-metricd-then-gnocchi-statsd-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::gnocchi::params::metricd_service_name}-clone",
-      second_resource => "${::gnocchi::params::statsd_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::gnocchi::params::metricd_service_name],
-                          Pacemaker::Resource::Service[$::gnocchi::params::statsd_service_name]],
-    }
-    pacemaker::constraint::colocation { 'gnocchi-statsd-with-metricd-colocation':
-      source  => "${::gnocchi::params::statsd_service_name}-clone",
-      target  => "${::gnocchi::params::metricd_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::gnocchi::params::metricd_service_name],
-                  Pacemaker::Resource::Service[$::gnocchi::params::statsd_service_name]],
-    }
-
     # Horizon and Keystone
     pacemaker::resource::service { $::apache::params::service_name:
       clone_params     => 'interleave=true',