From 4980171e089c39a3fbd75ca7786b9081b5d2f7ff Mon Sep 17 00:00:00 2001
From: Jose Luis Franco Arza <jfrancoa@redhat.com>
Date: Mon, 15 Jun 2020 18:42:41 +0200
Subject: [PATCH] [TRAIN ONLY] Add FFU parameters in lifecycle env files.

The upgrade workflow has a set of environment files which are
used to set and unset parameters needed for the upgrade procedure.
This patch leverages this mechanism to minimize the amount of
parameters the user needs to add to be able to upgrade. This way
we reduce the possibilities of forgetting some of them by the user
but at the same time, allow the user to overwrite them if needed.

Change-Id: I8b02d4bb9d99d52b8fdf06dd43345814eba3272b
---
 environments/lifecycle/upgrade-converge.yaml | 19 +++++++++++++++++++
 environments/lifecycle/upgrade-prepare.yaml  |  8 ++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/environments/lifecycle/upgrade-converge.yaml b/environments/lifecycle/upgrade-converge.yaml
index 8a5035ed3c..0616473341 100644
--- a/environments/lifecycle/upgrade-converge.yaml
+++ b/environments/lifecycle/upgrade-converge.yaml
@@ -6,3 +6,22 @@ parameter_defaults:
   UpgradeLevelNovaCompute: ''
   UpgradeInitCommonCommand: ''
   UpgradeInitCommand: ''
+  # FFU params
+  # Stein db migration images
+  # being set in tripleo-common
+  ContainerCinderApiImageStein: ''
+  ContainerGlanceApiImageStein: ''
+  ContainerHeatEngineImageStein: ''
+  ContainerIronicApiImageStein: ''
+  ContainerIronicInspectorImageStein: ''
+  ContainerKeystoneImageStein: ''
+  ContainerMistralApiImageStein: ''
+  ContainerNeutronApiImageStein: ''
+  ContainerNovaApiImageStein: ''
+  ContainerNovaConductorImageStein: ''
+  # Ceph 3 image set in tripleo-common
+  ContainerCeph3DaemonImage: ''
+  # Unset operating system upgrade
+  UpgradeLeappEnabled: false
+  UpgradeLeappToInstall: []
+  UpgradeLeappToRemove: []
diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml
index 7ba5694147..82baad5aa4 100644
--- a/environments/lifecycle/upgrade-prepare.yaml
+++ b/environments/lifecycle/upgrade-prepare.yaml
@@ -10,8 +10,12 @@ resource_registry:
 parameter_defaults:
   EnablePackageInstall: true
   UpgradeLevelNovaCompute: auto
-  UpgradeLeappToRemove: ['openvswitch2.11','ovn2.11']
-  UpgradeLeappToInstall: ['openvswitch2.13','ovn2.13']
   UpgradeInitCommonCommand: |
     #!/bin/bash
     set -eu
+  # FFU parameters
+  # Set operating system upgrade
+  UpgradeLeappEnabled: true
+  # OpenStack packages to upgrade with the OS upgrade.
+  UpgradeLeappToRemove: ['openvswitch2.11','ovn2.11']
+  UpgradeLeappToInstall: ['openvswitch2.13','ovn2.13']