diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-04-13 09:30:21 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-04-13 10:56:23 +0100 |
| commit | e9781712480c8168b5000fb795422034095f184c (patch) | |
| tree | cd2aabbd2cb16b0cccd11e511821f1934e9c1b69 /xci | |
| parent | 24580de790cd3658f560ddc8baaee58eb65d16b6 (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')
| -rwxr-xr-x | xci/config/pinned-versions | 2 | ||||
| -rwxr-xr-x | xci/installer/kubespray/deploy.sh | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 6b20374a..72a0ff61 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -45,4 +45,4 @@ export HAPROXY_VERSION=$(grep -E '.*name: haproxy_server' -A 3 \ | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p') # HEAD of kubspray "master" as of 27.02.2018 # kubespray's bug Reference: https://github.com/kubernetes-incubator/kubespray/issues/2400 -export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"810c10a0e9b65b0ef8ae8f7c302f7553a165631c"} +export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"5d9bb300d716880610c34dd680c167d2d728984d"} 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 #------------------------------------------------------------------------------- |