Adjust roles-data file for P->Q upgrade.
As described in rhbz-1540546 and rhbz-1541382 services available during P deployment got renamed/removed in Q. This change modifies custom roles-data file wrt aforementioned changes. Partial-Bug: 1708680 Partial-Bug: 1746493 Depends-On: I9b488d84fa6e86ed9ce03c7b5fda5d42f713724d Change-Id: I8dc672d3b909afc781c3f62a77c16aa1445bec40
This commit is contained in:
parent
20e89f5e3a
commit
67aa778890
@ -107,6 +107,9 @@ upstream_container_images: true
|
||||
# tripleo-heat-templates directory
|
||||
tht_directory: "/usr/share/openstack-tripleo-heat-templates"
|
||||
|
||||
# default roles_data.yaml
|
||||
default_roles_data: "{{ tht_directory }}/roles_data.yaml"
|
||||
|
||||
# local registry environment file location
|
||||
containers_default_parameters: "{{ working_dir }}/docker-osp12.yaml"
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
- name: set roles-data fact
|
||||
vars:
|
||||
default_roles_data: "{{ tht_directory }}/roles_data.yaml"
|
||||
roles_data: "{{ roles_data_file.stdout }}"
|
||||
set_fact:
|
||||
roles_data: "{{ (roles_data_file.stdout|length > 0) | ternary(roles_data, default_roles_data)}}"
|
||||
custom_roles_used: "{{ (roles_data_file.stdout|length > 0) | ternary(true, false)}}"
|
||||
|
14
tasks/upgrade/adjust-roles-data.yaml
Normal file
14
tasks/upgrade/adjust-roles-data.yaml
Normal file
@ -0,0 +1,14 @@
|
||||
---
|
||||
- name: rename FluentdClient to Fluentd
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1540546
|
||||
replace:
|
||||
path: "{{ roles_data }}"
|
||||
regexp: '(\s+)- OS::TripleO::Services::FluentdClient$'
|
||||
replace: '\1- OS::TripleO::Services::Fluentd'
|
||||
|
||||
- name: remove ManilaBackendGeneric resource
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1541382
|
||||
replace:
|
||||
path: "{{ roles_data }}"
|
||||
regexp: '(\s+)- OS::TripleO::Services::ManilaBackendGeneric$'
|
||||
replace: ''
|
@ -1,4 +1,8 @@
|
||||
---
|
||||
- name: adjust role-data for P->Q upgrade
|
||||
include: adjust-roles-data.yaml
|
||||
when: custom_roles_used|bool
|
||||
|
||||
- name: add upgrade init script to upgrade prepare params
|
||||
set_fact:
|
||||
upgrade_prepare_extra_params: "{{ upgrade_prepare_extra_params + [upgrade_init_command_dest] }}"
|
||||
|
Loading…
Reference in New Issue
Block a user