From f502dcd0e3fa81a5e311380180ca58c547569ae2 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 30 Aug 2019 17:10:52 -0400
Subject: [PATCH] Clean up host var for pre/post deployment

Just final clean-up.

Change-Id: I9cd558bb83090c0d6fb58f72f3a1a01ec2141f3a
Closes-Bug: #1842141
Depends-On: Id0f708e6d6ce9565a5569716edfe993c7eceabaa
(cherry picked from commit e198e9fb5eb13c549cc57b5d993e94f22ce390e7)
---
 tripleo_common/templates/host_var_server.j2         | 13 -------------
 .../utils/data/host_vars/overcloud-controller-0     |  8 --------
 .../utils/data/host_vars/overcloud-novacompute-0    |  7 -------
 .../utils/data/host_vars/overcloud-novacompute-1    |  7 -------
 .../utils/data/host_vars/overcloud-novacompute-2    |  8 --------
 5 files changed, 43 deletions(-)

diff --git a/tripleo_common/templates/host_var_server.j2 b/tripleo_common/templates/host_var_server.j2
index ef81ccf78..bfb3c04b3 100644
--- a/tripleo_common/templates/host_var_server.j2
+++ b/tripleo_common/templates/host_var_server.j2
@@ -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 %}
 
 {% 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 %}
diff --git a/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0 b/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
index 98f19bfe4..86a9af1f3 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
@@ -1,15 +1,7 @@
-Controller_pre_deployments:
-  - ControllerHostEntryDeployment
-  - NetworkDeployment
-  - MyPostConfig
-  - MyExtraConfigPost
-
 pre_deployments_Controller:
   - ControllerHostEntryDeployment
   - NetworkDeployment
   - MyPostConfig
   - MyExtraConfigPost
 
-Controller_post_deployments:  []
-
 post_deployments_Controller:  []
diff --git a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0 b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
index b0e84754a..55a612848 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
@@ -1,13 +1,6 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment
   - MyExtraConfigPost
 
-Compute_post_deployments:  []
-
 post_deployments_Compute:  []
diff --git a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1 b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
index b0e84754a..55a612848 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
@@ -1,13 +1,6 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment
   - MyExtraConfigPost
 
-Compute_post_deployments:  []
-
 post_deployments_Compute:  []
diff --git a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2 b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
index b0a0cc9a1..3cb18c9ee 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
@@ -1,15 +1,7 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-  - AnsibleDeployment
-
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment
   - MyExtraConfigPost
   - AnsibleDeployment
 
-Compute_post_deployments:  []
-
 post_deployments_Compute:  []