From 66ce22d6ede34330f59cf4eb3f6bd4f76c68db9a Mon Sep 17 00:00:00 2001
From: Jose Luis Franco Arza <jfrancoa@redhat.com>
Date: Tue, 10 Dec 2019 13:04:07 +0100
Subject: [PATCH] Add containerized_undercloud_upgrade variable.

When upgrading from Queens to Rocky, we are jumping from a
non-containerized undercloud into a containerized one.
However, this scenario hasn't been considered yet. When
submitting [0] we add the logic to upgrade always to a
containerized undercloud, we need to have a variable that
allows us differentiate between the type (containerized or
non-containrized) of undercloud we deploy and upgrade to.

[0] - Ibcdfd71b9280615aedc4d59ef0c566c475f15d0b

Related-Bug: #1855856

Change-Id: I30b4789adcf348c636d3679523075b22f8956ff1
---
 playbooks/multinode-undercloud-upgrade.yml | 2 +-
 roles/extras-common/defaults/main.yml      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/playbooks/multinode-undercloud-upgrade.yml b/playbooks/multinode-undercloud-upgrade.yml
index 86a287c88..10851d378 100644
--- a/playbooks/multinode-undercloud-upgrade.yml
+++ b/playbooks/multinode-undercloud-upgrade.yml
@@ -26,7 +26,7 @@
     - undercloud-upgrade
   roles:
     - role: container-update
-      when: containerized_undercloud|default(false)|bool
+      when: containerized_undercloud_upgrade|default(false)|bool
 
 - name: Run tripleo-upgrade role to upgrade undercloud
   hosts: undercloud
diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml
index ca08c10ee..ea15157b0 100644
--- a/roles/extras-common/defaults/main.yml
+++ b/roles/extras-common/defaults/main.yml
@@ -13,6 +13,12 @@ containerized_undercloud: >-
   {%- else -%}
   false
   {%- endif -%}
+containerized_undercloud_upgrade: >-
+  {% if release not in ['newton','ocata','pike'] -%}
+  true
+  {%- else -%}
+  false
+  {%- endif -%}
 containerized_overcloud_upgrade: >-
   {% if release in ['newton', 'ocata'] -%}
   false