summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-22 20:22:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-22 20:22:27 +0000
commit9578c33b0eef82154f7a5867d5c7661c67a025bc (patch)
tree01a68be73191dd3858472ebea86acb9133b1ff06
parentd729e58ed182923414456569ba68aa4868fed885 (diff)
parent6330a4602276c9b0db678957cd7022397495e339 (diff)
Merge "xci: kubespray: Add experimental support for openSUSE"
-rwxr-xr-xxci/installer/kubespray/deploy.sh9
-rw-r--r--xci/opnfv-scenario-requirements.yml1
2 files changed, 10 insertions, 0 deletions
diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh
index 7695894b..364ee2b6 100755
--- a/xci/installer/kubespray/deploy.sh
+++ b/xci/installer/kubespray/deploy.sh
@@ -14,6 +14,13 @@ set -o pipefail
K8_XCI_PLAYBOOKS="$(dirname $(realpath ${BASH_SOURCE[0]}))/playbooks"
export ANSIBLE_ROLES_PATH=$HOME/.ansible/roles:/etc/ansible/roles:${XCI_PATH}/xci/playbooks/roles
+# NOTE(hwoarang): This is a workaround for SUSE until upstream PR is accepted
+# https://github.com/kubernetes-incubator/kubespray/pull/2380
+if [[ ${XCI_DISTRO} == opensuse ]]; then
+ export KUBESPRAY_GIT_URL=https://github.com/hwoarang/kubespray.git
+ export KUBESPRAY_VERSION=add-opensuse-support
+fi
+
#-------------------------------------------------------------------------------
# Configure localhost
#-------------------------------------------------------------------------------
@@ -112,3 +119,5 @@ USERNAME=$(echo $USER_CSV |awk -F ',' '{print $2}')
PASSWORD=$(echo $USER_CSV |awk -F ',' '{print $1}')
echo "Info: Dashboard username: ${USERNAME}"
echo "Info: Dashboard password: ${PASSWORD}"
+
+# vim: set ts=4 sw=4 expandtab:
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index 29b5c775..a8361535 100644
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -72,6 +72,7 @@
distros:
- ubuntu
- centos
+ - opensuse
- scenario: os-odl-bgpvpn
scm: git