diff options
Diffstat (limited to 'xci/installer/kubespray')
| -rwxr-xr-x | xci/installer/kubespray/deploy.sh | 7 | ||||
| -rw-r--r-- | xci/installer/kubespray/playbooks/configure-opnfvhost.yml | 1 |
2 files changed, 1 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 #------------------------------------------------------------------------------- diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml index d9c5ae6d..0ac18b50 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -48,6 +48,7 @@ {{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars" args: creates: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars/k8s-cluster.yml" + - include: "{{ xci_path }}/xci/playbooks/bootstrap-scenarios.yml" - name: Install required packages package: name: "{{ kube_require_packages[ansible_pkg_mgr] }}" |