diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-06-01 16:39:20 -0400 |
|---|---|---|
| committer |   Steven Hardy <shardy@redhat.com> | 2016-06-06 12:47:19 +0000 |
| commit | 3d01f650f18b9e4f1892a6d9aa17f1bfc99b5091 (patch) | |
| tree | 6954c9292212a4a83e7f8f610546f4cd9a191822 /puppet/manifests | |
| parent | dc507862061360e0d777cdcb96cfb46d8bac75fe (diff) | |
Enable nova-conductor as a composable service
Implement NovaConductor service using nova-base for common parameters.
* Move rabbitmq parameters from controller.yaml to nova-base service, as
an example. More parameters will move in the future.
* Move nova-conductor bits from monolithic manifests to the new service
using new profiles from puppet-tripleo.
Depends-On: Iaaf3a3c2528d9747e41f360a1fe55f95ed37b2d1
Implements: blueprint composable-services-within-roles
Change-Id: I178f092b74ae12f2cb6f006db7cb00e4d6bddfd8
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 9b4e76cc..89569ae5 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -162,7 +162,6 @@ if hiera('step') >= 4 { include ::nova::config include ::nova::api include ::nova::cert - include ::nova::conductor include ::nova::consoleauth include ::nova::network::neutron include ::nova::vncproxy diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index dc53d6d4..10f0398c 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -384,10 +384,6 @@ MYSQL_HOST=localhost\n", manage_service => false, enabled => false, } - class { '::nova::conductor' : - manage_service => false, - enabled => false, - } class { '::nova::consoleauth' : manage_service => false, enabled => false, @@ -839,9 +835,6 @@ password=\"${mysql_root_password}\"", pacemaker::resource::service { $::nova::params::api_service_name : clone_params => 'interleave=true', } - pacemaker::resource::service { $::nova::params::conductor_service_name : - clone_params => 'interleave=true', - } pacemaker::resource::service { $::nova::params::consoleauth_service_name : clone_params => 'interleave=true', require => Pacemaker::Resource::Ocf['openstack-core'], |