From 012d69bcdc17a67490edfecaeb62f5d4284ed87f Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Wed, 25 Apr 2018 15:46:12 +0200 Subject: [PATCH] Remove use_tripleo_upgrade and add var into fs037. As part of the upgrades/updates playbook refactor it has been removed the existence of a 'legacy' and 'new' upgrades playbook, which was being controlled by the 'use_tripleo_upgrade' variable Iaf30244187d27909ab803175843056e0827d0b24. Also, it's been moved the parameter container_registry_file from the overcloud update's playbook into its corresponding fs. Related-Bug: #1749740 Depends-On: Iaf30244187d27909ab803175843056e0827d0b24 Depends-On: Iec42b574d697f3acfd668636e3dd11217a3ea25e Change-Id: I27f13b164bb78619f8830b875ec9f04445ce1e26 --- config/general_config/featureset011.yml | 1 - config/general_config/featureset036.yml | 1 - config/general_config/featureset037.yml | 7 +++++++ config/general_config/featureset040.yml | 1 - config/general_config/featureset051.yml | 1 - 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/general_config/featureset011.yml b/config/general_config/featureset011.yml index 4cbf504af..5bc39e294 100644 --- a/config/general_config/featureset011.yml +++ b/config/general_config/featureset011.yml @@ -36,7 +36,6 @@ upgrade_composable_scenario: multinode-containers.yaml deployed_server: true # Tripleo_upgrade role parameters -use_tripleo_upgrade: true undercloud_upgrade: false overcloud_upgrade: true tht_directory: "/usr/share/openstack-tripleo-heat-templates" diff --git a/config/general_config/featureset036.yml b/config/general_config/featureset036.yml index bd4984765..c2f2bc2f9 100644 --- a/config/general_config/featureset036.yml +++ b/config/general_config/featureset036.yml @@ -38,7 +38,6 @@ overcloud_roles: mixed_upgrade: true # Tripleo-upgrade link -use_tripleo_upgrade: true ffu_overcloud_upgrade: true # disable tripleo-upgrade container manipulation. diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml index 2c36bea70..844d9f8bb 100644 --- a/config/general_config/featureset037.yml +++ b/config/general_config/featureset037.yml @@ -5,6 +5,13 @@ composable_scenario: scenario000-multinode-containers.yaml # tripleo-upgrade role variables overcloud_update: true +# NOTE: right now the container images stay the same before and +# after update. This makes the job run fast while still testing +# the update workflow itself. For the future we may consider +# updating the container images too. (This might have to be paired +# with some work on the image building side to get meaningful +# from-to combination of images. +container_registry_file: containers-default-parameters.yaml tripleo_upgrade_validations_non_fatal: true tripleo_upgrade_debug: true tripleo_ci: true diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml index 2ed6db961..9a5214b18 100644 --- a/config/general_config/featureset040.yml +++ b/config/general_config/featureset040.yml @@ -32,7 +32,6 @@ step_upgrade_undercloud: false mixed_upgrade: true # Tripleo-upgrade link -use_tripleo_upgrade: true overcloud_upgrade: true # disable tripleo-upgrade container manipulation. diff --git a/config/general_config/featureset051.yml b/config/general_config/featureset051.yml index 12267c403..9c1eca64e 100644 --- a/config/general_config/featureset051.yml +++ b/config/general_config/featureset051.yml @@ -33,7 +33,6 @@ step_upgrade_undercloud: false mixed_upgrade: true # Tripleo-upgrade link -use_tripleo_upgrade: true overcloud_upgrade: true # disable tripleo-upgrade container manipulation.