openstack/tripleo-heat-templates
Code Issues Proposed changes

Add new ansible tag for network configuration

Browse Source 
This seprates the overcloud network configuration as a separate
play and adds a new tag 'network_deploy_steps' so that it can be
executed alone using '--tags network_deploy_steps'.

Change-Id: I96b0d838e79bcaa8b08ffaa2fb745ee7003d1284
This commit is contained in:
Rabi Mishra 2020-09-02 10:52:07 +05:30
parent 2b108eb869
commit 846cb94bcc
1 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
common/deploy-steps.j2
View File

@ -530,6 +530,49 @@ outputs:
- overcloud
- pre_deploy_steps
- hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
strategy: tripleo_free
name: Server network deployments
gather_facts: "{% raw %}{{ gather_facts | default(false) }}{% endraw %}"
any_errors_fatal: yes
tasks:
{% raw %}
- name: Check NetworkConfig script existence
local_action:
module: stat
path: "{{ lookup('first_found', NetworkConfig_paths, errors='ignore') }}"
register: NetworkConfig_stat
vars:
NetworkConfig_paths:
- "{{ tripleo_role_name ~ '/' ~ inventory_hostname ~ '/NetworkConfig' }}"
- "{{ tripleo_role_name ~ '/NetworkConfig' }}"
- name: Run Network Config
import_role:
name: tripleo_network_config
vars:
tripleo_network_config_script_path: "{{ NetworkConfig_stat.stat.path }}"
tripleo_network_config_bridge_name: "{{ neutron_physical_bridge_name }}"
tripleo_network_config_interface_name: "{{ neutron_public_interface_name }}"
tripleo_network_config_action: "{{ stack_action }}"
tripleo_network_config_network_deployment_actions: "{{ network_deployment_actions }}"
tripleo_network_config_async_timeout: "{{ async_timeout | default(300) }}"
tripleo_network_config_async_poll: "{{ async_poll | default(3) }}"
when:
- NetworkConfig_stat.stat.exists
- name: AllNodesValidationConfig
script: all_nodes_validation_script.sh
environment:
validate_controllers_icmp: "{{ validate_controllers_icmp }}"
validate_gateways_icmp: "{{ validate_gateways_icmp }}"
validate_fqdn: "{{ validate_fqdn }}"
ping_test_ips: "{{ ping_test_ips | to_json }}"
tripleo_role_name: "{{ tripleo_role_name }}"
tags:
- overcloud
- pre_deploy_steps
- network_deploy_steps
{% endraw %}
- hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
strategy: tripleo_free
name: Server deployments
@ -546,46 +589,10 @@ outputs:
vars:
force: false
with_items: "{{ hostvars[inventory_hostname]['pre_deployments_' ~ tripleo_role_name]|default([]) }}"
- name: Check NetworkConfig script existence
local_action:
module: stat
path: "{{ lookup('first_found', NetworkConfig_paths, errors='ignore') }}"
become: no
register: NetworkConfig_stat
vars:
NetworkConfig_paths:
- "{{ tripleo_role_name ~ '/' ~ inventory_hostname ~ '/NetworkConfig' }}"
- "{{ tripleo_role_name ~ '/NetworkConfig' }}"
- name: Run Network Config
import_role:
name: tripleo_network_config
vars:
tripleo_network_config_script_path: "{{ NetworkConfig_stat.stat.path }}"
tripleo_network_config_bridge_name: "{{ neutron_physical_bridge_name }}"
tripleo_network_config_interface_name: "{{ neutron_public_interface_name }}"
tripleo_network_config_action: "{{ stack_action }}"
tripleo_network_config_network_deployment_actions: "{{ network_deployment_actions }}"
tripleo_network_config_async_timeout: "{{ async_timeout | default(300) }}"
tripleo_network_config_async_poll: "{{ async_poll | default(3) }}"
when:
- NetworkConfig_stat.stat.exists
- name: AllNodesValidationConfig
script: all_nodes_validation_script.sh
environment:
validate_controllers_icmp: "{{ validate_controllers_icmp }}"
validate_gateways_icmp: "{{ validate_gateways_icmp }}"
validate_fqdn: "{{ validate_fqdn }}"
ping_test_ips: "{{ ping_test_ips | to_json }}"
tripleo_role_name: "{{ tripleo_role_name }}"
- name: ArtifactsConfig
script: deploy-artifacts.sh
environment:
artifact_urls: "{{ deploy_artifact_urls }}"
tags:
- overcloud
- pre_deploy_steps