summaryrefslogtreecommitdiffstats
path: root/xci/installer/kubespray
diff options
context:
space:
mode:
Diffstat (limited to 'xci/installer/kubespray')
-rwxr-xr-xxci/installer/kubespray/deploy.sh4
-rw-r--r--xci/installer/kubespray/playbooks/configure-kubenet.yml1
-rw-r--r--xci/installer/kubespray/playbooks/configure-opnfvhost.yml2
3 files changed, 4 insertions, 3 deletions
diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh
index 1a0b34bc..02a9d430 100755
--- a/xci/installer/kubespray/deploy.sh
+++ b/xci/installer/kubespray/deploy.sh
@@ -75,13 +75,13 @@ fi
echo "Info: Using kubespray to deploy the kubernetes cluster"
echo "-----------------------------------------------------------------------"
ssh root@$OPNFV_HOST_IP "set -o pipefail; cd releng-xci/.cache/repos/kubespray;\
- ansible-playbook ${XCI_ANSIBLE_PARAMS} \
+ ansible-playbook \
-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}" \
+ansible-playbook ${XCI_ANSIBLE_PARAMS} \
-i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \
configure-kubenet.yml
echo
diff --git a/xci/installer/kubespray/playbooks/configure-kubenet.yml b/xci/installer/kubespray/playbooks/configure-kubenet.yml
index 1c3740b2..3b1cb013 100644
--- a/xci/installer/kubespray/playbooks/configure-kubenet.yml
+++ b/xci/installer/kubespray/playbooks/configure-kubenet.yml
@@ -13,6 +13,7 @@
# so cbr0 interfaces can talk to each other.
- name: Prepare networking for kubenet
hosts: k8s-cluster
+ remote_user: root
gather_facts: True
become: yes
vars_files:
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index 7626b949..01904ba3 100644
--- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
@@ -56,7 +56,7 @@
- name: Install required packages
package:
- name: "{{ kube_require_packages[ansible_pkg_mgr] }}"
+ name: "{{ (ansible_pkg_mgr == 'zypper') | ternary('dbus-1', 'dbus') }}"
state: present
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
when: xci_flavor == 'aio'