From 44da685cb03d99d9ae34598741b40ed7af54633c Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 30 Aug 2019 17:00:07 -0400
Subject: [PATCH] config-download: rename pre/post deployment hostvars

We can't have numbers starting an Ansible var, so we need to rename the
pre/post deployments host vars, or we hit this error:
  template error while templating string: expected token 'end of print statement'

https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#creating-valid-variable-names

In this patch we have to duplicate host vars but it'll be cleaned up
once we change to the new file in THT.

Change-Id: Idbdd6a21eb2cd488daa1e3ddc844b4fc5267047c
Related-Bug: #1842141
(cherry picked from commit 21754e9987abd33b5c4f4d79dfbab324186f1fc8)
---
 tripleo_common/templates/host_var_server.j2        | 14 ++++++++++++++
 .../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, 44 insertions(+)

diff --git a/tripleo_common/templates/host_var_server.j2 b/tripleo_common/templates/host_var_server.j2
index 49c40a00f..ef81ccf78 100644
--- a/tripleo_common/templates/host_var_server.j2
+++ b/tripleo_common/templates/host_var_server.j2
@@ -3,8 +3,22 @@
   - {{ 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 %}
+  - {{ deployment }}
+{% endfor %}
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 f0a6bbd8c..98f19bfe4 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-controller-0
@@ -4,4 +4,12 @@ Controller_pre_deployments:
   - 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 fcadbeeac..b0e84754a 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0
@@ -3,4 +3,11 @@ Compute_pre_deployments:
   - 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 fcadbeeac..b0e84754a 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1
@@ -3,4 +3,11 @@ Compute_pre_deployments:
   - 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 b74d0f6f6..b0a0cc9a1 100644
--- a/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
+++ b/tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2
@@ -4,4 +4,12 @@ Compute_pre_deployments:
   - MyExtraConfigPost
   - AnsibleDeployment
 
+pre_deployments_Compute:
+  - ComputeHostEntryDeployment
+  - NetworkDeployment
+  - MyExtraConfigPost
+  - AnsibleDeployment
+
 Compute_post_deployments:  []
+
+post_deployments_Compute:  []