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
Mv Ceilometer settings out of puppet/compute.yaml
[apex-tripleo-heat-templates.git]
/
puppet
/
controller-config.yaml
diff --git
a/puppet/controller-config.yaml
b/puppet/controller-config.yaml
index
f7a6a56
..
cadba70
100644
(file)
--- a/
puppet/controller-config.yaml
+++ b/
puppet/controller-config.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:
@@
-25,7
+29,7
@@
resources:
list_join:
- ''
- - get_file: manifests/overcloud_controller.pp
list_join:
- ''
- - get_file: manifests/overcloud_controller.pp
- -
get_file: manifests/ringbuilder.pp
+ -
{get_param: StepConfig}
outputs:
OS::stack_id:
outputs:
OS::stack_id: