Browse Source

Merge "config-download: rename pre/post deployment hostvars" into stable/stein

tags/10.8.1
Zuul 1 week ago
parent
commit
ed077b4ef1

+ 14
- 0
tripleo_common/templates/host_var_server.j2 View File

@@ -3,8 +3,22 @@
3 3
   - {{ deployment }}
4 4
 {% endfor %}
5 5
 
6
+# Temporary duplication
7
+# https://bugs.launchpad.net/tripleo/+bug/1842141
8
+pre_deployments_{{ role }}: {% if not pre_deployments %} [] {% endif %}
9
+
10
+{% for deployment in pre_deployments %}
11
+  - {{ deployment }}
12
+{% endfor %}
13
+
6 14
 {{ role }}_post_deployments: {% if not post_deployments %} [] {% endif %}
7 15
 
8 16
 {% for deployment in post_deployments %}
9 17
   - {{ deployment }}
10 18
 {% endfor %}
19
+
20
+post_deployments_{{ role }}: {% if not post_deployments %} [] {% endif %}
21
+
22
+{% for deployment in post_deployments %}
23
+  - {{ deployment }}
24
+{% endfor %}

+ 8
- 0
tripleo_common/tests/utils/data/host_vars/overcloud-controller-0 View File

@@ -4,4 +4,12 @@ Controller_pre_deployments:
4 4
   - MyPostConfig
5 5
   - MyExtraConfigPost
6 6
 
7
+pre_deployments_Controller:
8
+  - ControllerHostEntryDeployment
9
+  - NetworkDeployment
10
+  - MyPostConfig
11
+  - MyExtraConfigPost
12
+
7 13
 Controller_post_deployments:  []
14
+
15
+post_deployments_Controller:  []

+ 7
- 0
tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0 View File

@@ -3,4 +3,11 @@ Compute_pre_deployments:
3 3
   - NetworkDeployment
4 4
   - MyExtraConfigPost
5 5
 
6
+pre_deployments_Compute:
7
+  - ComputeHostEntryDeployment
8
+  - NetworkDeployment
9
+  - MyExtraConfigPost
10
+
6 11
 Compute_post_deployments:  []
12
+
13
+post_deployments_Compute:  []

+ 7
- 0
tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1 View File

@@ -3,4 +3,11 @@ Compute_pre_deployments:
3 3
   - NetworkDeployment
4 4
   - MyExtraConfigPost
5 5
 
6
+pre_deployments_Compute:
7
+  - ComputeHostEntryDeployment
8
+  - NetworkDeployment
9
+  - MyExtraConfigPost
10
+
6 11
 Compute_post_deployments:  []
12
+
13
+post_deployments_Compute:  []

+ 8
- 0
tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2 View File

@@ -4,4 +4,12 @@ Compute_pre_deployments:
4 4
   - MyExtraConfigPost
5 5
   - AnsibleDeployment
6 6
 
7
+pre_deployments_Compute:
8
+  - ComputeHostEntryDeployment
9
+  - NetworkDeployment
10
+  - MyExtraConfigPost
11
+  - AnsibleDeployment
12
+
7 13
 Compute_post_deployments:  []
14
+
15
+post_deployments_Compute:  []

Loading…
Cancel
Save