Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Ensure manage_service and enabled are false for Pacemaker"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
pacemaker
/
keystone.yaml
diff --git
a/puppet/services/pacemaker/keystone.yaml
b/puppet/services/pacemaker/keystone.yaml
index
8fcab15
..
db52cae
100644
(file)
--- 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]
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
step_config: |
include ::tripleo::profile::pacemaker::keystone