From 40257618388e628771c7de4191baf03c87ec2369 Mon Sep 17 00:00:00 2001 From: Daniel Bengtsson Date: Tue, 10 Dec 2019 13:35:57 +0100 Subject: [PATCH] Fix the undefined operation_type variable. On the update_noop or upgrade_noop the operation_type is undefined. Change-Id: I8ae541b4148c8a40b1fe6b529a35bc4af8a141c5 --- templates/overcloud_online_data_migration.sh.j2 | 4 ++-- templates/overcloud_prepare_containers.sh.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/overcloud_online_data_migration.sh.j2 b/templates/overcloud_online_data_migration.sh.j2 index a39125de..692fd456 100644 --- a/templates/overcloud_online_data_migration.sh.j2 +++ b/templates/overcloud_online_data_migration.sh.j2 @@ -2,9 +2,9 @@ # # Run online data migration for OpenStack services # -{% if overcloud_update|bool -%} +{% if overcloud_update|bool or update_noop|bool -%} {% set operation_type = 'update' -%} -{% elif overcloud_upgrade|bool -%} +{% elif overcloud_upgrade|bool or upgrade_noop|bool -%} {% set operation_type = 'upgrade' -%} {% endif -%} set -euo pipefail diff --git a/templates/overcloud_prepare_containers.sh.j2 b/templates/overcloud_prepare_containers.sh.j2 index 559c8475..edb3d8d2 100644 --- a/templates/overcloud_prepare_containers.sh.j2 +++ b/templates/overcloud_prepare_containers.sh.j2 @@ -2,9 +2,9 @@ # # Prepare conatainer images for overcloud update/upgrade # -{% if overcloud_update|bool -%} +{% if overcloud_update|bool or update_noop|bool -%} {% set operation_type = 'update' -%} -{% elif overcloud_upgrade|bool -%} +{% elif overcloud_upgrade|bool or upgrade_noop|bool -%} {% set operation_type = 'upgrade' -%} {% endif -%} set -euo pipefail