summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-02 15:04:49 +0000
committerGerrit Code Review <review@openstack.org>2016-06-02 15:04:49 +0000
commitbcd726f1242d78169e6a5687e998473c1043c622 (patch)
tree789a1805d1d9488029c5b6596c2c570371f57a65 /puppet/manifests
parent006daae9253b6545fab708c204c30325318554f2 (diff)
parentd9409b48ad6c9052defa05c79f0d28535d6ba933 (diff)
Merge "Composable Sahara services"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp6
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp45
2 files changed, 1 insertions, 50 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 53bf62c7..439036a2 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -108,7 +108,6 @@ if hiera('step') >= 2 {
include ::nova::db::mysql_api
include ::neutron::db::mysql
include ::cinder::db::mysql
- include ::sahara::db::mysql
if downcase(hiera('gnocchi_indexer_backend')) == 'mysql' {
include ::gnocchi::db::mysql
}
@@ -504,11 +503,6 @@ if hiera('step') >= 4 {
include ::aodh::listener
include ::aodh::client
- # Sahara
- include ::sahara
- include ::sahara::service::api
- include ::sahara::service::engine
-
# Horizon
include ::apache::mod::remoteip
if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index d6d14a83..abe586f4 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -25,8 +25,7 @@ Service <|
tag == 'ceilometer-service' or
tag == 'gnocchi-service' or
tag == 'neutron-service' or
- tag == 'nova-service' or
- tag == 'sahara-service'
+ tag == 'nova-service'
|> {
hasrestart => true,
restart => '/bin/true',
@@ -313,9 +312,6 @@ if hiera('step') >= 2 {
require => Exec['galera-ready'],
}
}
- class { '::sahara::db::mysql':
- require => Exec['galera-ready'],
- }
}
# Ceph
@@ -683,18 +679,6 @@ MYSQL_HOST=localhost\n",
enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
}
- class { '::sahara':
- sync_db => $sync_db,
- }
- class { '::sahara::service::api':
- manage_service => false,
- enabled => false,
- }
- class { '::sahara::service::engine':
- manage_service => false,
- enabled => false,
- }
-
# swift storage
if str2bool(hiera('enable_swift_storage', true)) {
class {'::swift::storage::all':
@@ -971,33 +955,6 @@ password=\"${mysql_root_password}\"",
Pacemaker::Resource::Service[$::cinder::params::volume_service]],
}
- # Sahara
- pacemaker::resource::service { $::sahara::params::api_service_name :
- clone_params => 'interleave=true',
- require => Pacemaker::Resource::Ocf['openstack-core'],
- }
- pacemaker::resource::service { $::sahara::params::engine_service_name :
- clone_params => 'interleave=true',
- }
- pacemaker::constraint::base { 'keystone-then-sahara-api-constraint':
- constraint_type => 'order',
- first_resource => 'openstack-core-clone',
- second_resource => "${::sahara::params::api_service_name}-clone",
- first_action => 'start',
- second_action => 'start',
- require => [Pacemaker::Resource::Service[$::sahara::params::api_service_name],
- Pacemaker::Resource::Ocf['openstack-core']],
- }
- pacemaker::constraint::base { 'sahara-api-then-sahara-engine-constraint':
- constraint_type => 'order',
- first_resource => "${::sahara::params::api_service_name}-clone",
- second_resource => "${::sahara::params::engine_service_name}-clone",
- first_action => 'start',
- second_action => 'start',
- require => [Pacemaker::Resource::Service[$::sahara::params::api_service_name],
- Pacemaker::Resource::Service[$::sahara::params::engine_service_name]],
- }
-
if hiera('neutron::enable_ovs_agent', true) {
pacemaker::resource::service { $::neutron::params::ovs_agent_service:
clone_params => 'interleave=true',