openstack
/
tripleo-heat-templates
Code Issues Proposed changes

[Train-only] Fix the tripleo-container-stop role in train 

When we backported the tripleo_container_stop tasks for some services,
we forgot that in train the role was called 'tripleo-container-stop'.

Without this change upgrade tasks fail with:
2021-04-09 17:46:45 | The error appears to be in '/home/stack/undercloud-ansible-xd1nbsp0/external_upgrade_steps_tasks.yaml': line 84, column 13, but may
2021-04-09 17:46:45 | be elsewhere in the file depending on the exact syntax problem.
2021-04-09 17:46:45 |
2021-04-09 17:46:45 | The offending line appears to be:
2021-04-09 17:46:45 |
2021-04-09 17:46:45 |   - import_role:
2021-04-09 17:46:45 |       name: tripleo_container_stop
2021-04-09 17:46:45 |             ^ here
2021-04-09 17:46:45 | Exception: Online Upgrade failed

Tested by applying this patch to a previously failing train UC upgrade,
which now succeeds.

Closes-Bug: #1923235

Change-Id: I089a0e7ca22e51ff7171a68d97ae296f5a2a4199
This commit is contained in:
Michele Baldessari 2021-04-09 19:57:14 +02:00
parent 7befdd2f6e
commit 7951870db2
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -819,7 +819,7 @@ outputs:
block:
- name: Stop barbican api container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- barbican_api

2
deployment/cinder/cinder-backup-container-puppet.yaml
View File

@ -228,7 +228,7 @@ outputs:
block:
- name: Stop cinder backup container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- cinder_backup

2
deployment/cinder/cinder-volume-container-puppet.yaml
View File

@ -364,7 +364,7 @@ outputs:
block:
- name: Stop cinder volume container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- cinder_volume

2
deployment/ironic/ironic-api-container-puppet.yaml
View File

@ -339,7 +339,7 @@ outputs:
block:
- name: Stop ironic api container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- ironic_api

2
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -621,7 +621,7 @@ outputs:
block:
- name: Stop ironic conductor container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- ironic_conductor

2
deployment/ironic/ironic-inspector-container-puppet.yaml
View File

@ -527,7 +527,7 @@ outputs:
block:
- name: Stop ironic inspector container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- ironic_inspector

2
deployment/ironic/ironic-pxe-container-puppet.yaml
View File

@ -174,7 +174,7 @@ outputs:
block:
- name: Stop ironic pxe container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- ironic_pxe_tftp

2
deployment/manila/manila-api-container-puppet.yaml
View File

@ -320,7 +320,7 @@ outputs:
block:
- name: Stop manila api container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- manila_api

2
deployment/manila/manila-scheduler-container-puppet.yaml
View File

@ -127,7 +127,7 @@ outputs:
block:
- name: Stop manila scheduler container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- manila_scheduler

2
deployment/manila/manila-share-container-puppet.yaml
View File

@ -182,7 +182,7 @@ outputs:
block:
- name: Stop manila share container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- manila_share

2
deployment/nova/nova-ironic-container-puppet.yaml
View File

@ -224,7 +224,7 @@ outputs:
block:
- name: Stop nova ironic container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- nova_compute

2
deployment/octavia/octavia-api-container-puppet.yaml
View File

@ -455,7 +455,7 @@ outputs:
block:
- name: Stop octavia api container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- octavia_api

2
deployment/octavia/octavia-health-manager-container-puppet.yaml
View File

@ -216,7 +216,7 @@ outputs:
block:
- name: Stop octavia health manager container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- octavia_health_manager

2
deployment/octavia/octavia-housekeeping-container-puppet.yaml
View File

@ -167,7 +167,7 @@ outputs:
block:
- name: Stop octavia housekeeping container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- octavia_housekeeping

2
deployment/octavia/octavia-worker-container-puppet.yaml
View File

@ -178,7 +178,7 @@ outputs:
block:
- name: Stop octavia api container
import_role:
name: tripleo_container_stop
name: tripleo-container-stop
vars:
tripleo_containers_to_stop:
- octavia_worker