openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Clean up host var for pre/post deployment" into stable/rocky

This commit is contained in:
Zuul 2019-09-10 22:55:52 +00:00 committed by Gerrit Code Review
parent 45fda88b3c ec168cb358
commit 3776a79b86
3 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tripleo_common/templates/group_var_role.j2
View File

@ -1,22 +1,9 @@
{{ role }}_pre_deployments:
{% 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/Compute
View File

@ -1,11 +1,3 @@
Compute_pre_deployments:
- ComputeHostEntryDeployment
- NetworkDeployment
- MyExtraConfigPost
- AnsibleDeployment
Compute_post_deployments: []
pre_deployments_Compute: pre_deployments_Compute:
- ComputeHostEntryDeployment - ComputeHostEntryDeployment
- NetworkDeployment - NetworkDeployment

8
tripleo_common/tests/utils/data/Controller
View File

@ -1,11 +1,3 @@
Controller_pre_deployments:
- ControllerHostEntryDeployment
- NetworkDeployment
- MyPostConfig
- MyExtraConfigPost
Controller_post_deployments: []
pre_deployments_Controller: pre_deployments_Controller:
- ControllerHostEntryDeployment - ControllerHostEntryDeployment
- NetworkDeployment - NetworkDeployment