aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker/glance-registry.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-18 09:44:24 +0000
committerGerrit Code Review <review@openstack.org>2016-05-18 09:44:24 +0000
commitd6574fa32a0954aea02684984d9a93c444ec34f0 (patch)
tree333ee97f026707a4726bc3f03fe64a25f160239f /puppet/services/pacemaker/glance-registry.yaml
parent9223f5d2613102505a02334300134190527f1d9f (diff)
parenta3bae06b2eeb934d7da52440f24a576b5acddbec (diff)
Merge "Ensure manage_service and enabled are false for Pacemaker"
Diffstat (limited to 'puppet/services/pacemaker/glance-registry.yaml')
-rw-r--r--puppet/services/pacemaker/glance-registry.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/services/pacemaker/glance-registry.yaml b/puppet/services/pacemaker/glance-registry.yaml
index 5635345..393fbaa 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.