openstack/tripleo-upgrade
Code Issues Proposed changes

Adapt nic templates play for Rocky to Stein upgrade.

Browse Source 
As well as in the rocky upgrade, some NIC parameters have been modified [0]
and a nic templates adaptation is needed. As this upgrade covers the
Rocky to Stein upgrade, we'll simply reuse (and adapt) the tasks existing
in the Rocky upgrade.

[0] - https://review.opendev.org/#/c/604943/

Change-Id: Ic5289010ad874037c779a573e2baef0709b7c900
This commit is contained in:
Jose Luis Franco Arza 2019-07-08 15:09:00 +02:00
parent 5b100af2c7
commit 4a0ec40b19
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/common/queens_to_rocky_adjust_nic_templates.yaml → tasks/common/rocky_to_stein_adjust_nic_templates.yaml
View File

@ -19,14 +19,15 @@
awk -F': ' '/OS::TripleO::.*::Net::SoftwareConfig/ {print $2}' {{ nic_config_env }} awk -F': ' '/OS::TripleO::.*::Net::SoftwareConfig/ {print $2}' {{ nic_config_env }}
register: nic_template_files register: nic_template_files
- name: add Rocky specific parameters to NICs - name: add Stein specific parameters to NICs
vars: vars:
relative_path: "{{ '/'.join(nic_config_env.split('/')[0:-1]) + '/' + item }}" relative_path: "{{ '/'.join(nic_config_env.split('/')[0:-1]) + '/' + item }}"
nic_path: "{{ (item[0] == '/')|ternary(item, relative_path) }}" nic_path: "{{ (item[0] == '/')|ternary(item, relative_path) }}"
python_bin: "{{ 'python' if use_oooq|bool else 'python3' }}"
shell: | shell: |
set -o pipefail set -o pipefail
NIC_ROLE_NAME=$( grep {{ item }} {{ nic_config_env }} | awk -F '::' '{ print $3 }' ); NIC_ROLE_NAME=$( grep {{ item }} {{ nic_config_env }} | awk -F '::' '{ print $3 }' );
python /usr/share/openstack-tripleo-heat-templates/tools/merge-new-params-nic-config-script.py \ {{ python_bin }} /usr/share/openstack-tripleo-heat-templates/tools/merge-new-params-nic-config-script.py \
--tht-dir {{ tht_directory }} \ --tht-dir {{ tht_directory }} \
--role-name $NIC_ROLE_NAME \ --role-name $NIC_ROLE_NAME \
--roles-data {{ roles_data }} \ --roles-data {{ roles_data }} \

4
tasks/upgrade/create-overcloud-upgrade-scripts.yaml
View File

@ -129,5 +129,5 @@
- name: import create HTTP test scripts - name: import create HTTP test scripts
import_tasks: ../common/create_http_test_scripts.yml import_tasks: ../common/create_http_test_scripts.yml
- name: update nic configs to rocky format - name: update nic configs to stein format
import_tasks: ../common/queens_to_rocky_adjust_nic_templates.yaml import_tasks: ../common/rocky_to_stein_adjust_nic_templates.yaml