Merge "Add host_vars to define tasks executed before network configurations" into stable/ussuri

tripleo_common/templates/host_var_server.j2

@@ -1,3 +1,9 @@
+pre_network_{{ role }}: {% if not pre_network %} [] {% endif %}
+
+{% for deployment in pre_network %}
+  - {{ deployment }}
+{% endfor %}
+
 pre_deployments_{{ role }}: {% if not pre_deployments %} [] {% endif %}
 
 {% for deployment in pre_deployments %}

tripleo_common/tests/utils/data/host_vars/overcloud-controller-0

@@ -1,3 +1,5 @@
+pre_network_Controller:  []
+
 pre_deployments_Controller:
   - ControllerHostEntryDeployment
   - NetworkDeployment

tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-0

@@ -1,3 +1,5 @@
+pre_network_Compute:  []
+
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment

tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-1

@@ -1,3 +1,5 @@
+pre_network_Compute:  []
+
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment

tripleo_common/tests/utils/data/host_vars/overcloud-novacompute-2

@@ -1,3 +1,5 @@
+pre_network_Compute:  []
+
 pre_deployments_Compute:
   - ComputeHostEntryDeployment
   - NetworkDeployment

tripleo_common/utils/config.py

@@ -443,6 +443,9 @@ class Config(object):
                 raise Exception(err_msg)
 
             role = self.get_role_from_server_id(stack, server_id)
+            server_pre_network = server_deployment_names.setdefault(
+                server_names[server_id], {}).setdefault(
+                'pre_network', [])
             server_pre_deployments = server_deployment_names.setdefault(
                 server_names[server_id], {}).setdefault(
                 'pre_deployments', [])
@@ -460,6 +463,9 @@ class Config(object):
                     'PostConfig' in deployment.physical_resource_id:
                 if deployment_name not in server_post_deployments:
                     server_post_deployments.append(deployment_name)
+            elif 'PreNetworkConfig' in deployment.physical_resource_id:
+                if deployment_name not in server_pre_network:
+                    server_pre_network.append(deployment_name)
             else:
                 if deployment_name not in server_pre_deployments:
                     server_pre_deployments.append(deployment_name)
@@ -552,6 +558,8 @@ class Config(object):
                     role_host_vars[role][server],
                     default_flow_style=False) if role_host_vars else None)
 
+            pre_network = server_deployment_names.get(
+                server, {}).get('pre_network', [])
             pre_deployments = server_deployment_names.get(
                 server, {}).get('pre_deployments', [])
             post_deployments = server_deployment_names.get(
@@ -560,6 +568,7 @@ class Config(object):
             with open(host_var_server_path, 'w') as f:
                 template_data = host_var_server_template.render(
                     role=role,
+                    pre_network=pre_network,
                     pre_deployments=pre_deployments,
                     post_deployments=post_deployments,
                     ansible_host_vars=ansible_host_vars)