diff options
Diffstat (limited to 'xci/xci-deploy.sh')
| -rwxr-xr-x | xci/xci-deploy.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index fa03ef8d..e0b31ab9 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -99,24 +99,22 @@ echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- echo "Info: Installing Ansible from pip" echo "-------------------------------------------------------------------------" -source files/install-ansible.sh +bash files/install-ansible.sh echo "-------------------------------------------------------------------------" -# Make the VMs match the host. If we need to make this configurable -# then this logic has to be moved outside this file -case ${OS_FAMILY,,} in +case ${XCI_DISTRO,,} in # These should ideally match the CI jobs - debian) + ubuntu) export DIB_OS_RELEASE="${DIB_OS_RELEASE:-xenial}" export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-ubuntu-minimal}" export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl,iptables}" ;; - redhat) + centos) export DIB_OS_RELEASE="${DIB_OS_RELEASE:-7}" export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-centos-minimal}" export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables}" ;; - suse) + opensuse) export DIB_OS_RELEASE="${DIB_OS_RELEASE:-42.3}" export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-opensuse-minimal}" export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables}" @@ -124,7 +122,7 @@ case ${OS_FAMILY,,} in esac # There is no CentOS support at all -if [[ $OS_FAMILY == RedHat ]]; then +if [[ ${XCI_DISTRO,,} == centos ]]; then echo "" echo "Error: Sorry, only Ubuntu and SUSE hosts are supported for now!" echo "Error: CentOS 7 support is still work in progress." |