openstack/tripleo-common
Code Issues Proposed changes

Clean up host var for pre/post deployment

Browse Source 
Just final clean-up.

Change-Id: I9cd558bb83090c0d6fb58f72f3a1a01ec2141f3a
Closes-Bug: #1842141
Depends-On: Id0f708e6d6ce9565a5569716edfe993c7eceabaa
This commit is contained in:
Emilien Macchi 2019-08-30 17:10:52 -04:00
parent 21754e9987
commit e198e9fb5e
5 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tripleo_common/templates/host_var_server.j2
View File

@ -1,23 +1,9 @@
{{ role }}_pre_deployments: {% if not pre_deployments %} [] {% endif %}
{% for deployment in pre_deployments %}
- {{ deployment }}
{% endfor %}
# Temporary duplication
# https://bugs.launchpad.net/tripleo/+bug/1842141
pre_deployments_{{ role }}: {% if not pre_deployments %} [] {% endif %} pre_deployments_{{ role }}: {% if not pre_deployments %} [] {% endif %}
{% for deployment in pre_deployments %} {% for deployment in pre_deployments %}
- {{ deployment }} - {{ deployment }}
{% endfor %} {% endfor %}
{{ role }}_post_deployments: {% if not post_deployments %} [] {% endif %}
{% for deployment in post_deployments %}
- {{ deployment }}
{% endfor %}
post_deployments_{{ role }}: {% if not post_deployments %} [] {% endif %} post_deployments_{{ role }}: {% if not post_deployments %} [] {% endif %}
{% for deployment in post_deployments %} {% for deployment in post_deployments %}

8
tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
View File

@ -1,17 +1,9 @@
Controller_pre_deployments:
- ControllerHostEntryDeployment
- NetworkDeployment
- MyPostConfig
- MyExtraConfigPost
pre_deployments_Controller: pre_deployments_Controller:
- ControllerHostEntryDeployment - ControllerHostEntryDeployment
- NetworkDeployment - NetworkDeployment
- MyPostConfig - MyPostConfig
- MyExtraConfigPost - MyExtraConfigPost
Controller_post_deployments: []
post_deployments_Controller: [] post_deployments_Controller: []
uuid: 0 uuid: 0

7
tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
View File

@ -1,15 +1,8 @@
Compute_pre_deployments:
- ComputeHostEntryDeployment
- NetworkDeployment
- MyExtraConfigPost
pre_deployments_Compute: pre_deployments_Compute:
- ComputeHostEntryDeployment - ComputeHostEntryDeployment
- NetworkDeployment - NetworkDeployment
- MyExtraConfigPost - MyExtraConfigPost
Compute_post_deployments: []
post_deployments_Compute: [] post_deployments_Compute: []
uuid: 1 uuid: 1

7
tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
View File

@ -1,15 +1,8 @@
Compute_pre_deployments:
- ComputeHostEntryDeployment
- NetworkDeployment
- MyExtraConfigPost
pre_deployments_Compute: pre_deployments_Compute:
- ComputeHostEntryDeployment - ComputeHostEntryDeployment
- NetworkDeployment - NetworkDeployment
- MyExtraConfigPost - MyExtraConfigPost
Compute_post_deployments: []
post_deployments_Compute: [] post_deployments_Compute: []
uuid: 2 uuid: 2

8
tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
View File

@ -1,17 +1,9 @@
Compute_pre_deployments:
- ComputeHostEntryDeployment
- NetworkDeployment
- MyExtraConfigPost
- AnsibleDeployment
pre_deployments_Compute: pre_deployments_Compute:
- ComputeHostEntryDeployment - ComputeHostEntryDeployment
- NetworkDeployment - NetworkDeployment
- MyExtraConfigPost - MyExtraConfigPost
- AnsibleDeployment - AnsibleDeployment
Compute_post_deployments: []
post_deployments_Compute: [] post_deployments_Compute: []
uuid: 3 uuid: 3