diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-09-17 02:53:28 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-09-17 02:53:28 +0000 |
commit | 22da7a0fcecf5cc0e833a660f3bd06f40e1ff6fd (patch) | |
tree | fec8e1a6caebe716702c15ceefe275c5855684dd /overcloud.j2.yaml | |
parent | 3031decbe230b9068c6af87004894bca469b1e89 (diff) | |
parent | b738e9ca7839772065f3db3ea29b057a7152eed5 (diff) |
Merge "Convert AllNodesExtraConfig to support composable roles"
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r-- | overcloud.j2.yaml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 5c0d9148..067f1517 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -442,17 +442,13 @@ resources: type: OS::TripleO::AllNodesExtraConfig depends_on: - UpdateWorkflow - - ComputeAllNodesValidationDeployment - - BlockStorageAllNodesValidationDeployment - - ObjectStorageAllNodesValidationDeployment - - CephStorageAllNodesValidationDeployment - - ControllerAllNodesValidationDeployment +{% for role in roles %} + - {{role.name}}AllNodesValidationDeployment +{% endfor %} properties: - controller_servers: {get_attr: [Controller, attributes, nova_server_resource]} - compute_servers: {get_attr: [Compute, attributes, nova_server_resource]} - blockstorage_servers: {get_attr: [BlockStorage, attributes, nova_server_resource]} - objectstorage_servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]} - cephstorage_servers: {get_attr: [CephStorage, attributes, nova_server_resource]} +{% for role in roles %} + servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]} +{% endfor %} # Post deployment steps for all roles AllNodesDeploySteps: |