diff options
Diffstat (limited to 'xci/installer/kubespray/deploy.sh')
-rwxr-xr-x | xci/installer/kubespray/deploy.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh index 5136f5a8..1a0b34bc 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 #------------------------------------------------------------------------------- @@ -86,6 +79,11 @@ ssh root@$OPNFV_HOST_IP "set -o pipefail; cd releng-xci/.cache/repos/kubespray;\ -i opnfv_inventory/inventory.cfg cluster.yml -b | tee setup-kubernetes.log" scp root@$OPNFV_HOST_IP:~/releng-xci/.cache/repos/kubespray/setup-kubernetes.log \ $LOG_PATH/setup-kubernetes.log + +cd $K8_XCI_PLAYBOOKS +ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" \ + -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \ + configure-kubenet.yml echo echo "-----------------------------------------------------------------------" echo "Info: Kubernetes installation is successfully completed!" |