From 7951870db23e3b630e3cd1e23f1536d6551c2a59 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Fri, 9 Apr 2021 19:57:14 +0200 Subject: [PATCH] [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 --- deployment/barbican/barbican-api-container-puppet.yaml | 2 +- deployment/cinder/cinder-backup-container-puppet.yaml | 2 +- deployment/cinder/cinder-volume-container-puppet.yaml | 2 +- deployment/ironic/ironic-api-container-puppet.yaml | 2 +- deployment/ironic/ironic-conductor-container-puppet.yaml | 2 +- deployment/ironic/ironic-inspector-container-puppet.yaml | 2 +- deployment/ironic/ironic-pxe-container-puppet.yaml | 2 +- deployment/manila/manila-api-container-puppet.yaml | 2 +- deployment/manila/manila-scheduler-container-puppet.yaml | 2 +- deployment/manila/manila-share-container-puppet.yaml | 2 +- deployment/nova/nova-ironic-container-puppet.yaml | 2 +- deployment/octavia/octavia-api-container-puppet.yaml | 2 +- deployment/octavia/octavia-health-manager-container-puppet.yaml | 2 +- deployment/octavia/octavia-housekeeping-container-puppet.yaml | 2 +- deployment/octavia/octavia-worker-container-puppet.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index 423b9eea3d..b6354802fb 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -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 diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 9685bdb2da..76fc1f5d91 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/deployment/cinder/cinder-backup-container-puppet.yaml @@ -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 diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 588d1dc7fb..6b96599855 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/deployment/cinder/cinder-volume-container-puppet.yaml @@ -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 diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index b0112c1825..b79fe33573 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -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 diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 553ccf8289..177d08f1b4 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -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 diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 9ad5cd72ee..5bb69e5dfc 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/deployment/ironic/ironic-inspector-container-puppet.yaml @@ -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 diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index 34c8d8f964..283da98645 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -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 diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 337cb43687..88ab27579a 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -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 diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index 2116ee0b22..18aca0647d 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/deployment/manila/manila-scheduler-container-puppet.yaml @@ -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 diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index 08758604cf..257c946e3e 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/deployment/manila/manila-share-container-puppet.yaml @@ -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 diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index e3c995212e..4dd64aecbf 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-container-puppet.yaml @@ -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 diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index b96d19d114..67b13dcc93 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-api-container-puppet.yaml @@ -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 diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 6220c9eae3..4d4ea2019b 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -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 diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index f222b6a635..18dad43374 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml @@ -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 diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 27354153c1..5186dbffdd 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -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