openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Don't use the undercloud containers during mixed upgrade. 

When doing mixed upgrade we don't want to use the container definition
file generated during undercloud deployment.

The problem is that at that time (undercloud deployment) the build_id
and docker_registry_namespace_used are (rightly) pointing to master.
But then during mixed upgrade overcloud deployment we need the N-1
version docker's images.

Change-Id: Ice13dceba7417e1ef827f4ab44fd08d2d13922fd
Closes-Bug: #1786488
This commit is contained in:
Sofer Athlan-Guyot 2018-08-10 18:41:50 +02:00
parent 8c09ea3914
commit 07d14c4f68
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
View File

@ -30,7 +30,7 @@ PREPARE_ARGS=${PREPARE_ARGS:-"{{ prepare_service_env_args }}"}
## populate the docker registry. This is done automatically.
## ::
{% if release not in ['ocata', 'pike', 'queens'] %}
{% if release not in ['ocata', 'pike', 'queens'] and not mixed_upgrade|default(false)|bool %}
openstack tripleo container image prepare --verbose \
--output-env-file {{ working_dir }}/containers-default-parameters.yaml \
${PREPARE_ARGS} \