diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-09-07 17:05:56 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-09-16 00:24:24 +0000 |
| commit | da283a785bee4a6e17501ee064bfd08e56d1930b (patch) | |
| tree | 4a50af5aaead0959ec4819520b09ba129cd94e37 /overcloud.j2.yaml | |
| parent | 89f9a3f2e0274169f305a503f642867ef14244e1 (diff) | |
Convert deploy steps to jinja2 loop
Refactor so the post-deploy steps recently moved into
puppet/post.yaml are generated by jinja2 instead of hard-coded
Change-Id: I488e46aaa449c95571bd3d1de9513c3d0730baf3
Partially-Implements: blueprint custom-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 fa160e4d..ec4db843 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -460,17 +460,13 @@ resources: type: OS::TripleO::PostDeploySteps properties: servers: - Controller: {get_attr: [Controller, attributes, nova_server_resource]} - Compute: {get_attr: [Compute, attributes, nova_server_resource]} - BlockStorage: {get_attr: [BlockStorage, attributes, nova_server_resource]} - ObjectStorage: {get_attr: [ObjectStorage, attributes, nova_server_resource]} - CephStorage: {get_attr: [CephStorage, attributes, nova_server_resource]} +{% for role in roles %} + {{role.name}}: {get_attr: [{{role.name}}, attributes, nova_server_resource]} +{% endfor %} role_data: - Controller: {get_attr: [ControllerServiceChain, role_data]} - Compute: {get_attr: [ComputeServiceChain, role_data]} - BlockStorage: {get_attr: [BlockStorageServiceChain, role_data]} - ObjectStorage: {get_attr: [ObjectStorageServiceChain, role_data]} - CephStorage: {get_attr: [CephStorageServiceChain, role_data]} +{% for role in roles %} + {{role.name}}: {get_attr: [{{role.name}}ServiceChain, role_data]} +{% endfor %} outputs: ManagedEndpoints: |