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 "Additional parameters for Nuage Neutron plugin integration"
[apex-tripleo-heat-templates.git]
/
puppet
/
controller-config-pacemaker.yaml
diff --git
a/puppet/controller-config-pacemaker.yaml
b/puppet/controller-config-pacemaker.yaml
index
38161cd
..
dfebcf8
100644
(file)
--- a/
puppet/controller-config-pacemaker.yaml
+++ b/
puppet/controller-config-pacemaker.yaml
@@
-3,6
+3,16
@@
heat_template_version: 2015-04-30
description: >
A software config which runs manifests/overcloud_controller_pacemaker.pp
description: >
A software config which runs manifests/overcloud_controller_pacemaker.pp
+parameters:
+ ConfigDebug:
+ default: false
+ description: Whether to run config management (e.g. Puppet) in debug mode.
+ type: boolean
+ StepConfig:
+ type: string
+ description: Config manifests that will be used to step through the deployment.
+ default: ''
+
resources:
ControllerPuppetConfigImpl:
resources:
ControllerPuppetConfigImpl:
@@
-10,12
+20,17
@@
resources:
properties:
group: puppet
options:
properties:
group: puppet
options:
+ enable_debug: {get_param: ConfigDebug}
enable_hiera: True
enable_facter: False
outputs:
- name: result
config:
enable_hiera: True
enable_facter: False
outputs:
- name: result
config:
- get_file: manifests/overcloud_controller_pacemaker.pp
+ list_join:
+ - ''
+ - - get_file: manifests/overcloud_controller_pacemaker.pp
+ - get_file: manifests/ringbuilder.pp
+ - {get_param: StepConfig}
outputs:
OS::stack_id:
outputs:
OS::stack_id: