diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-13 06:51:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-13 06:51:35 +0000 |
| commit | 057b6e3aebfa54a4468a23d8e78c0217281bfd25 (patch) | |
| tree | ff0a193c8d2666e8c452498d7e8ff9549f0beb64 | |
| parent | be8f4afdafe2e968e9b3e7f627b6b31d1f0560fa (diff) | |
| parent | 46279be9cb77ec9cf6e53e77c239a51efda06d80 (diff) | |
Merge "Add RoleConfig output"
| -rw-r--r-- | common/deploy-steps.j2 | 18 | ||||
| -rw-r--r-- | overcloud.j2.yaml | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index bd8d9bc0..9cf4ead0 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -302,3 +302,21 @@ resources: {% endfor %} + +outputs: + RoleConfig: + description: Mapping of config data for all roles + value: + deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml} + deploy_steps_playbook: | + - hosts: overcloud + tasks: +{%- for role in roles %} + - include: {{role.name}}/host_prep_tasks.yaml + when: role_name == '{{role.name}}' +{%- endfor %} + - include: deploy_steps_tasks.yaml + with_sequence: count={{deploy_steps_max-1}} + loop_control: + loop_var: step + diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 7241a974..a7a4fe25 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -929,6 +929,9 @@ outputs: - {get_attr: [{{role.name}}ServiceChainRoleData, value]} - {get_attr: [{{role.name}}MergedConfigSettings, value]} {% endfor %} + RoleConfig: + description: The configuration workflows associated with each role + value: {get_attr: [AllNodesDeploySteps, RoleConfig]} RoleNetIpMap: description: Mapping of each network to a list of IPs for each role value: |