Merge "Clean up host var for pre/post deployment"

2019-09-06 06:31:39 +00:00 · 2019-09-06 06:31:39 +00:00 · 6d11f4b5a6
parent e10d43055d e198e9fb5e
commit 6d11f4b5a6
5 changed files with 0 additions and 44 deletions
--- a/tripleo_common/templates/host_var_server.j2
+++ b/tripleo_common/templates/host_var_server.j2
@ -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 %}

 {% for deployment in pre_deployments %}
  - {{ deployment }}
 {% endfor %}

-{{ role }}_post_deployments: {% if not post_deployments %} [] {% endif %}
-
-{% for deployment in post_deployments %}
-  - {{ deployment }}
-{% endfor %}
-
 post_deployments_{{ role }}: {% if not post_deployments %} [] {% endif %}

 {% for deployment in post_deployments %}
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
@ -1,17 +1,9 @@
-Controller_pre_deployments:
-  - ControllerHostEntryDeployment
-  - NetworkDeployment
-  - MyPostConfig
-  - MyExtraConfigPost
-
 pre_deployments_Controller:
  - ControllerHostEntryDeployment
  - NetworkDeployment
  - MyPostConfig
  - MyExtraConfigPost

-Controller_post_deployments:  []
-
 post_deployments_Controller:  []

 uuid: 0
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
@ -1,15 +1,8 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-
 pre_deployments_Compute:
  - ComputeHostEntryDeployment
  - NetworkDeployment
  - MyExtraConfigPost

-Compute_post_deployments:  []
-
 post_deployments_Compute:  []

 uuid: 1
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
@ -1,15 +1,8 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-
 pre_deployments_Compute:
  - ComputeHostEntryDeployment
  - NetworkDeployment
  - MyExtraConfigPost

-Compute_post_deployments:  []
-
 post_deployments_Compute:  []

 uuid: 2
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
@ -1,17 +1,9 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-  - AnsibleDeployment
-
 pre_deployments_Compute:
  - ComputeHostEntryDeployment
  - NetworkDeployment
  - MyExtraConfigPost
  - AnsibleDeployment

-Compute_post_deployments:  []
-
 post_deployments_Compute:  []

 uuid: 3