diff options
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/pinned-versions | 1 | ||||
| -rwxr-xr-x | xci/config/user-vars | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index f58ce964..e40cf442 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -37,6 +37,7 @@ export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"0b3 export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"81ae133bd570ea7359b4797ee5699d2d4233b445"} # HEAD of osa "stable/rocky" as of 04.01.2019 export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"2087cd98f28b35f655ca398d25d2a6c71e38328e"} +export OPENSTACK_OSH_VERSION="rocky" # HEAD of osh "master" as of 17.07.2019 export OSH_VERSION=${OSH_VERSION:-"dadf9946e076df2b09556f4a18107dc487788cdd"} # HEAD of osh-infra "master" as of 16.07.2019 diff --git a/xci/config/user-vars b/xci/config/user-vars index 951688af..d3d7b2f1 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -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 #------------------------------------------------------------------------------- |