Correctly pass environment file to quickstart.sh in full-deploy.sh
The quickstart jenkins builder relies on the OPT_ENVIRONMENT correctly reaching the ansible-playbook call. This patch explicitly passes --environment to quickstart.sh to make sure the correct environment is set. Also ensures the whole_disk_images var isn't overwritten for libvirt deploys on centosci. Change-Id: I7c5d6bac6894437d8066482e8a29861f81d9a781
This commit is contained in:
parent
1af9fb863a
commit
3f3f93da95
|
@ -9,6 +9,7 @@ set -eux
|
|||
: ${WORKSPACE:=$HOME/.quickstart}
|
||||
: ${VIRTHOST:=127.0.0.1}
|
||||
: ${DISTRO_PATH:=""}
|
||||
: ${OPT_ENVIRONMENT:=/$WORKSPACE/config/environments/default_libvirt.yml}
|
||||
|
||||
RELEASE=${1:-master-tripleo-ci}
|
||||
# unused variable in script, kept for consistency
|
||||
|
@ -148,6 +149,7 @@ case "$JOB_TYPE" in
|
|||
--bootstrap \
|
||||
--tags all \
|
||||
--config $WORKSPACE/config/general_config/$CONFIG.yml \
|
||||
--environment $OPT_ENVIRONMENT \
|
||||
--working-dir $WORKSPACE/ \
|
||||
--no-clone \
|
||||
--release ${CI_ENV:+$CI_ENV/}${DISTRO_PATH:+$DISTRO_PATH/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
environment_type: libvirt
|
||||
|
||||
# Libvirt environments do not yet support whole-disk images, for example
|
||||
# https://bugs.launchpad.net/tripleo/+bug/1950383
|
||||
whole_disk_images: false
|
||||
|
||||
# This allows one to browse to the tripleo-ui on the undercloud
|
||||
# This is only required in libvirt based deployments
|
||||
enable_port_forward_for_tripleo_ui: true
|
||||
|
|
|
@ -37,6 +37,9 @@ images:
|
|||
- name: "{{ overcloud_image }}"
|
||||
url: "{{ overcloud_image_url }}"
|
||||
type: "{{ overcloud_image_type }}"
|
||||
- name: "{{ undercloud_base_image }}"
|
||||
url: "{{ undercloud_base_image_url }}"
|
||||
type: "{{ undercloud_base_image_type }}"
|
||||
- name: ipa_images
|
||||
url: "{{ ipa_image_url }}"
|
||||
type: tar
|
||||
|
|
Loading…
Reference in New Issue