Browse Source

Merge "Clean up host var for pre/post deployment" into stable/stein

changes/95/681695/1
Zuul 1 week ago
parent
commit
a632b6fcb7

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save