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 "Implement scenario004 with Ceph Rados Gateway scenario"
[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
dc81498
..
24f31dc
100644
(file)
--- a/
puppet/controller-config-pacemaker.yaml
+++ b/
puppet/controller-config-pacemaker.yaml
@@
-8,6
+8,10
@@
parameters:
default: false
description: Whether to run config management (e.g. Puppet) in debug mode.
type: boolean
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:
resources:
@@
-19,10
+23,17
@@
resources:
enable_debug: {get_param: ConfigDebug}
enable_hiera: True
enable_facter: False
enable_debug: {get_param: ConfigDebug}
enable_hiera: True
enable_facter: False
+ modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
outputs:
- name: result
outputs:
- name: result
+ inputs:
+ - name: step
+ type: Number
config:
config:
- get_file: manifests/overcloud_controller_pacemaker.pp
+ list_join:
+ - ''
+ - - get_file: manifests/overcloud_controller_pacemaker.pp
+ - {get_param: StepConfig}
outputs:
OS::stack_id:
outputs:
OS::stack_id: