Remove extra compute deploy and add registry_distro_lower var
This patch wires up the single deployment mixed rhel CI workflow by setting the registry_distro_lower var that is consumed by [1][2] to enable per role container image prep. The extra deployment for the compute node is no longer required so we remove that play from the base job. [1] https://review.opendev.org/c/openstack/tripleo-quickstart-extras/+/868210 [2] https://review.opendev.org/c/openstack/tripleo-quickstart/+/868208 Change-Id: I2b4db3879b0fbb28484d77a033257fb4d25be231
This commit is contained in:
parent
d45b5fdd06
commit
7c2eeee1c0
@ -102,10 +102,9 @@ if is_featureset mixed_os "{{ job_featureset_file }}"; then
|
|||||||
eight_release=$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-8/$QUICKSTART_RELEASE.yml
|
eight_release=$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-8/$QUICKSTART_RELEASE.yml
|
||||||
RELEASE_ARGS=(
|
RELEASE_ARGS=(
|
||||||
["multinode-overcloud-mixed-os-repos-compute.yml"]=" --extra-vars @$eight_release --extra-vars registry_distro=8 "
|
["multinode-overcloud-mixed-os-repos-compute.yml"]=" --extra-vars @$eight_release --extra-vars registry_distro=8 "
|
||||||
["multinode-undercloud-mixed-os.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 "
|
["multinode-undercloud-mixed-os.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 --extra-vars registry_distro_lower=8 "
|
||||||
["multinode-overcloud-prep.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 "
|
["multinode-overcloud-prep.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 "
|
||||||
["multinode-overcloud-mixed-os-deploy-control.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 "
|
["multinode-overcloud-mixed-os-deploy-control.yml"]=" $QUICKSTART_DEFAULT_RELEASE_ARG --extra-vars registry_distro=9 --extra-vars registry_distro_lower=8 "
|
||||||
["multinode-overcloud-mixed-os-deploy-compute.yml"]=" --extra-vars @$eight_release --extra-vars registry_distro=8 "
|
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -152,7 +152,6 @@
|
|||||||
- multinode-undercloud-mixed-os.yml
|
- multinode-undercloud-mixed-os.yml
|
||||||
- multinode-overcloud-prep.yml
|
- multinode-overcloud-prep.yml
|
||||||
- multinode-overcloud-mixed-os-deploy-control.yml
|
- multinode-overcloud-mixed-os-deploy-control.yml
|
||||||
- multinode-overcloud-mixed-os-deploy-compute.yml
|
|
||||||
- multinode-validate.yml
|
- multinode-validate.yml
|
||||||
tags: *multinode_tags
|
tags: *multinode_tags
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user