diff options
author | Steven Hardy <shardy@redhat.com> | 2016-09-08 11:51:20 +0100 |
---|---|---|
committer | Emilien Macchi <emilien@redhat.com> | 2016-09-16 00:24:35 +0000 |
commit | 3a8d20a63dccc61c958e09a7fcbbaab6690551b4 (patch) | |
tree | 8962661b54940dcccafe2b53b3ecd4c91bb4190c /overcloud.j2.yaml | |
parent | da283a785bee4a6e17501ee064bfd08e56d1930b (diff) |
Convert UpdateWorkflow to support composable roles
We need to remove the hard-coded roles from overcloud.j2.yaml
as now it's valid to e.g remove BlockStorage completely.
The previous behavior for the per-role upgrade scripts is maintained
but we'll need to rework this for newton->ocata upgrades where we
can no longer be sure the servers mapping will contain all roles.
Change-Id: I25e6c84757e3c00fba2aae834cd8206c62e44acf
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r-- | overcloud.j2.yaml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index ec4db843..5c0d9148 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -428,11 +428,10 @@ resources: UpdateWorkflow: type: OS::TripleO::Tasks::UpdateWorkflow 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]} + servers: +{% for role in roles %} + {{role.name}}: {get_attr: [{{role.name}}, attributes, nova_server_resource]} +{% endfor %} input_values: deploy_identifier: {get_param: DeployIdentifier} update_identifier: {get_param: UpdateIdentifier} |