From 6814b685856d5bfbd99b9964a698da1951533aa0 Mon Sep 17 00:00:00 2001
From: Daniel Bengtsson <dbengt@redhat.com>
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.

(cherry picked from commit bf32b828d67dac6f01ff84f1651e921193f17e47)

Change-Id: I25e47c987ff796171f40fffedd89b855eab18265
(cherry picked from commit 1719ee4f41071ba0e2d1fa8e5b9cd64d2b87841e)
---
 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