diff options
Diffstat (limited to 'xci/config/user-vars')
| -rwxr-xr-x | xci/config/user-vars | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars index 1554777d..d3d7b2f1 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -20,8 +20,8 @@ # or # export XCI_FLAVOR="ha" #------------------------------------------------------------------------------- -export XCI_FLAVOR=${XCI_FLAVOR:-aio} -export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})} +export XCI_FLAVOR=${XCI_FLAVOR:-mini} +export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; ID=${ID%%-*}; echo ${ID,,})} export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false} #------------------------------------------------------------------------------- @@ -34,6 +34,14 @@ export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false} # export INSTALLER_TYPE="kubespray" export INSTALLER_TYPE=${INSTALLER_TYPE:-osa} +#Wait upstream in openstack-helm (OSH) to support opensuse +if [ "$XCI_DISTRO" == "opensuse" ] && [ "$INSTALLER_TYPE" == "osh" ]; then + export XCI_DISTRO=ubuntu-bionic + export OSH_DISTRO=opensuse +elif [ "$XCI_DISTRO" == "ubuntu" ] && [ "$INSTALLER_TYPE" == "osh" ]; then + export OSH_DISTRO=ubuntu +fi + #------------------------------------------------------------------------------- # Set DEPLOYMENT #------------------------------------------------------------------------------- @@ -53,6 +61,6 @@ export INFRA_DEPLOYMENT=${INFRA_DEPLOYMENT:-bifrost} export XCI_ANSIBLE_PARAMS=${XCI_ANSIBLE_PARAMS:-""} export RUN_TEMPEST=${RUN_TEMPEST:-false} export CORE_OPENSTACK_INSTALL=${CORE_OPENSTACK_INSTALL:-false} -export BIFROST_USE_PREBUILT_IMAGES=${BIFROST_USE_PREBUILT_IMAGES:-false} +export BIFROST_CREATE_IMAGE_VIA_DIB=${BIFROST_CREATE_IMAGE_VIA_DIB:-true} # Set this to to true to force XCI to re-create the target OS images export CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false} |