diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-18 09:44:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-18 09:44:24 +0000 |
| commit | d6574fa32a0954aea02684984d9a93c444ec34f0 (patch) | |
| tree | 333ee97f026707a4726bc3f03fe64a25f160239f /puppet/services/pacemaker | |
| parent | 9223f5d2613102505a02334300134190527f1d9f (diff) | |
| parent | a3bae06b2eeb934d7da52440f24a576b5acddbec (diff) | |
Merge "Ensure manage_service and enabled are false for Pacemaker"
Diffstat (limited to 'puppet/services/pacemaker')
| -rw-r--r-- | puppet/services/pacemaker/glance-api.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/pacemaker/glance-registry.yaml | 5 | ||||
| -rw-r--r-- | puppet/services/pacemaker/keystone.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/pacemaker/neutron-dhcp.yaml | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/puppet/services/pacemaker/glance-api.yaml b/puppet/services/pacemaker/glance-api.yaml index 815eb5bf..ad964216 100644 --- a/puppet/services/pacemaker/glance-api.yaml +++ b/puppet/services/pacemaker/glance-api.yaml @@ -56,5 +56,7 @@ outputs: glance_file_pcmk_fstype: {get_param: GlanceFilePcmkFstype} glance_file_pcmk_manage: {get_param: GlanceFilePcmkManage} glance_file_pcmk_options: {get_param: GlanceFilePcmkOptions} + glance::api::manage_service: false + glance::api::enabled: false step_config: | include ::tripleo::profile::pacemaker::glance diff --git a/puppet/services/pacemaker/glance-registry.yaml b/puppet/services/pacemaker/glance-registry.yaml index 56353459..393fbaaf 100644 --- a/puppet/services/pacemaker/glance-registry.yaml +++ b/puppet/services/pacemaker/glance-registry.yaml @@ -26,7 +26,10 @@ outputs: description: Role data for the Glance role. value: config_settings: - get_attr: [GlanceRegistryBase, role_data, config_settings] + map_merge: + - get_attr: [GlanceRegistryBase, role_data, config_settings] + - glance::registry::manage_service: false + glance::registry::enabled: false # No puppet manifests since glance-registry is included in # ::tripleo::profile::pacemaker::glance which is maintained alongside of # pacemaker/glance-api.yaml. diff --git a/puppet/services/pacemaker/keystone.yaml b/puppet/services/pacemaker/keystone.yaml index 8fcab15f..db52cae7 100644 --- a/puppet/services/pacemaker/keystone.yaml +++ b/puppet/services/pacemaker/keystone.yaml @@ -28,7 +28,7 @@ outputs: config_settings: map_merge: - get_attr: [KeystoneServiceBase, role_data, config_settings] - #- - # custom keystone hiera goes here if we need it!? + - keystone::manage_service: false + keystone::enabled: false step_config: | include ::tripleo::profile::pacemaker::keystone diff --git a/puppet/services/pacemaker/neutron-dhcp.yaml b/puppet/services/pacemaker/neutron-dhcp.yaml index 4be711ca..0e972b28 100644 --- a/puppet/services/pacemaker/neutron-dhcp.yaml +++ b/puppet/services/pacemaker/neutron-dhcp.yaml @@ -29,5 +29,7 @@ outputs: map_merge: - get_attr: [NeutronDhcpBase, role_data, config_settings] - tripleo::profile::pacemaker::neutron::enable_dhcp: True + neutron::agents::dhcp::enabled: false + neutron::agents::dhcp::manage_service: false step_config: | include ::tripleo::profile::pacemaker::neutron::dhcp |