From ad16c138c8588cb57d6d95654ec1275f6d56de2d 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)
(cherry picked from commit f502dcd0e3fa81a5e311380180ca58c547569ae2)
(cherry picked from commit ec168cb3587730475a71d538a36a9a390e08df66)
---
 tripleo_common/templates/group_var_role.j2 | 13 -------------
 tripleo_common/tests/utils/data/Compute    |  8 --------
 tripleo_common/tests/utils/data/Controller |  8 --------
 3 files changed, 29 deletions(-)

diff --git a/tripleo_common/templates/group_var_role.j2 b/tripleo_common/templates/group_var_role.j2
index ef81ccf78..bfb3c04b3 100644
--- a/tripleo_common/templates/group_var_role.j2
+++ b/tripleo_common/templates/group_var_role.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/Compute b/tripleo_common/tests/utils/data/Compute
index f8960f736..3cb18c9ee 100644
--- a/tripleo_common/tests/utils/data/Compute
+++ b/tripleo_common/tests/utils/data/Compute
@@ -1,11 +1,3 @@
-Compute_pre_deployments:
-  - ComputeHostEntryDeployment
-  - NetworkDeployment
-  - MyExtraConfigPost
-  - AnsibleDeployment
-
-Compute_post_deployments:  []
-
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment
diff --git a/tripleo_common/tests/utils/data/Controller b/tripleo_common/tests/utils/data/Controller
index bf4fdeabf..86a9af1f3 100644
--- a/tripleo_common/tests/utils/data/Controller
+++ b/tripleo_common/tests/utils/data/Controller
@@ -1,11 +1,3 @@
-Controller_pre_deployments:
-  - ControllerHostEntryDeployment
-  - NetworkDeployment
-  - MyPostConfig
-  - MyExtraConfigPost
-
-Controller_post_deployments:  []
-
 pre_deployments_Controller:
   - ControllerHostEntryDeployment
   - NetworkDeployment