From 6330a4602276c9b0db678957cd7022397495e339 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 20 Mar 2018 11:28:08 +0000 Subject: xci: kubespray: Add experimental support for openSUSE Add experimental support for openSUSE until the upstream PR is accepted installer-type:kubespray deploy-scenario:k8-nosdn-nofeature Change-Id: Icd3698d882d249a18be77560ba0ba52159893816 Link: https://github.com/kubernetes-incubator/kubespray/pull/2380 Signed-off-by: Markos Chandras --- xci/installer/kubespray/deploy.sh | 9 +++++++++ xci/opnfv-scenario-requirements.yml | 1 + 2 files changed, 10 insertions(+) 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 -- cgit 1.2.3-korg