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
This commit is contained in:
parent
67eedfdee2
commit
012d69bcdc
|
@ -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"
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue