diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-08-10 13:00:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-10 13:00:42 +0000 |
| commit | 4002c126504df3da4dc79ca9669546277e926889 (patch) | |
| tree | bdf4eaaf06dd6843abacb2f145f6af8d964cf1c3 | |
| parent | 21d793a1af489d8e68ad933adf7dfe10988344a4 (diff) | |
| parent | fb1e2a6368f1f8e7e6a999ea714d76f97c38fb22 (diff) | |
Merge "xci-lib: Allow more openSUSE IDs"
| -rwxr-xr-x | xci/config/user-vars | 2 | ||||
| -rw-r--r-- | xci/files/xci-lib.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars index 1f30ec38..2625de24 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -21,7 +21,7 @@ # export XCI_FLAVOR="ha" #------------------------------------------------------------------------------- export XCI_FLAVOR=${XCI_FLAVOR:-mini} -export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})} +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} #------------------------------------------------------------------------------- diff --git a/xci/files/xci-lib.sh b/xci/files/xci-lib.sh index 060dc267..064b9f68 100644 --- a/xci/files/xci-lib.sh +++ b/xci/files/xci-lib.sh @@ -55,7 +55,7 @@ function install_ansible() { source /etc/os-release || source /usr/lib/os-release case ${ID,,} in - *suse) + *suse*) OS_FAMILY="Suse" INSTALLER_CMD="sudo -H -E zypper -q install -y --no-recommends" CHECK_CMD="zypper search --match-exact --installed" |