Add support for network-data-file.
TripleO offers a default network topology when deploying with network isolation enabled, and this is reflected in the network_data.yaml file in tripleo-heat-templates. If this is the case it has to be handled during update/upgrade. Change-Id: If50109753d4845357c869986c256186e8e22006d
This commit is contained in:
parent
39d4b47821
commit
663d380f6f
|
@ -16,6 +16,15 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
deployment_with_ha_upstream: "{{ is_upstream.rc == 0 and pacemaker_present.rc == 0 }}"
|
deployment_with_ha_upstream: "{{ is_upstream.rc == 0 and pacemaker_present.rc == 0 }}"
|
||||||
|
|
||||||
|
- name: get network-data-file
|
||||||
|
shell: |
|
||||||
|
awk '/-n\s/ {gsub(/[[:space:]]/, "", $2); print $2}' {{ overcloud_deploy_script }}
|
||||||
|
register: network_data_file
|
||||||
|
|
||||||
|
- name: set network_data_file fact
|
||||||
|
set_fact:
|
||||||
|
network_data_file: "{{ network_data_file.stdout }}"
|
||||||
|
|
||||||
- name: get env files used during deploy
|
- name: get env files used during deploy
|
||||||
shell: |
|
shell: |
|
||||||
awk '/-e\s|--environment-file\s/ {gsub(/[[:space:]]/, "", $2); print $2}' {{ overcloud_deploy_script }}
|
awk '/-e\s|--environment-file\s/ {gsub(/[[:space:]]/, "", $2); print $2}' {{ overcloud_deploy_script }}
|
||||||
|
|
|
@ -25,6 +25,9 @@ openstack overcloud update converge \
|
||||||
--disable-validations \
|
--disable-validations \
|
||||||
--deployed-server \
|
--deployed-server \
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
{% if network_data_file|length >0 -%}
|
||||||
|
-n {{ network_data_file }} \
|
||||||
|
{% endif -%}
|
||||||
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
|
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
|
||||||
{% for _env in initial_env_file.stdout_lines -%}
|
{% for _env in initial_env_file.stdout_lines -%}
|
||||||
-e {{ _env }} \
|
-e {{ _env }} \
|
||||||
|
|
|
@ -22,6 +22,9 @@ openstack overcloud update prepare --templates {{ tht_directory }} \
|
||||||
{% if tripleo_upgrade_validations_non_fatal|bool -%}
|
{% if tripleo_upgrade_validations_non_fatal|bool -%}
|
||||||
--validation-errors-nonfatal \
|
--validation-errors-nonfatal \
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
{% if network_data_file|length >0 -%}
|
||||||
|
-n {{ network_data_file }} \
|
||||||
|
{% endif -%}
|
||||||
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
|
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
|
||||||
{% for _env in initial_env_file.stdout_lines -%}
|
{% for _env in initial_env_file.stdout_lines -%}
|
||||||
-e {{ _env }} \
|
-e {{ _env }} \
|
||||||
|
|
|
@ -48,6 +48,9 @@ openstack overcloud {% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgra
|
||||||
--disable-validations \
|
--disable-validations \
|
||||||
--deployed-server \
|
--deployed-server \
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
{% if network_data_file|length >0 -%}
|
||||||
|
-n {{ network_data_file }} \
|
||||||
|
{% endif -%}
|
||||||
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
|
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
|
||||||
{% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%}
|
{% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%}
|
||||||
-e {{ _env }} \
|
-e {{ _env }} \
|
||||||
|
|
|
@ -25,6 +25,9 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
|
||||||
--disable-validations \
|
--disable-validations \
|
||||||
--deployed-server \
|
--deployed-server \
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
{% if network_data_file|length >0 -%}
|
||||||
|
-n {{ network_data_file }} \
|
||||||
|
{% endif -%}
|
||||||
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
|
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%}
|
||||||
{% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%}
|
{% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%}
|
||||||
-e {{ _env }} \
|
-e {{ _env }} \
|
||||||
|
|
Loading…
Reference in New Issue