Browse Source

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

changes/76/681876/1
Zuul 6 days ago
parent
commit
b24fc50610

+ 0
- 13
tripleo_common/templates/group_var_role.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/Compute View File

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

+ 0
- 8
tripleo_common/tests/utils/data/Controller View File

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

Loading…
Cancel
Save