summaryrefslogtreecommitdiffstats
path: root/xci/installer
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-04-13 09:30:21 +0100
committerMarkos Chandras <mchandras@suse.de>2018-04-13 10:56:23 +0100
commite9781712480c8168b5000fb795422034095f184c (patch)
treecd2aabbd2cb16b0cccd11e511821f1934e9c1b69 /xci/installer
parent24580de790cd3658f560ddc8baaee58eb65d16b6 (diff)
xci: kubespray: Bump SHA to include openSUSE support
The upstream PR to include openSUSE support has been merged so we need to bump the SHA to make it available in XCI. Change-Id: Ida5bd05ce8b0c883b6d7582a495ca934ecc4b1f1 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/installer')
-rwxr-xr-xxci/installer/kubespray/deploy.sh7
1 files changed, 0 insertions, 7 deletions
diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh
index 5136f5a8..59d11055 100755
--- a/xci/installer/kubespray/deploy.sh
+++ b/xci/installer/kubespray/deploy.sh
@@ -14,13 +14,6 @@ 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
#-------------------------------------------------------------------------------