diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-07 16:09:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-07 16:09:13 +0000 |
| commit | eab3b9f72e4d27cdb20572b9907b3f22e8062e48 (patch) | |
| tree | 1a9840c3f8f58707fbe46146f2b621ece42a71ca | |
| parent | 20188a2bf00b8b8e32c8fccd631b3c50b7bb2a9d (diff) | |
| parent | d297e02c0396e24b4dcb8ab8daadaee724277d61 (diff) | |
Merge "Move per role Services defaults into environment file"
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 5 | ||||
| -rw-r--r-- | overcloud.j2.yaml | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 980a7189..f06f51e0 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -214,3 +214,8 @@ resource_registry: parameter_defaults: EnablePackageInstall: false SoftwareConfigTransport: POLL_TEMP_URL + +{% for role in roles %} + # Parameters generated for {{role.name}} Role + {{role.name}}Services: {{role.ServicesDefault|default([])}} +{% endfor %} diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 3e4dae8c..47c73f8e 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -121,7 +121,6 @@ parameters: resource_registry) which represent nested stacks for each service that should get installed on the {{role.name}} role. type: comma_delimited_list - default: {{role.ServicesDefault|default([])}} {{role.name}}Count: description: Number of {{role.name}} nodes to deploy |