summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-05-11 09:37:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-11 09:37:33 +0000
commitd36aa803ab5b4a141b5487cd782949fecdd5382b (patch)
treecdf1edea6d7f8d79c60004f89d4be034b406b083
parente53cbf7585e9098e1e6eaad5101b5f60f704a50f (diff)
parent13c452caa0fd28ade49263984c3cb68923086d32 (diff)
Merge "fix k8 aio flavor undefined variable"
-rw-r--r--xci/installer/kubespray/playbooks/configure-kubenet.yml1
-rw-r--r--xci/installer/kubespray/playbooks/configure-opnfvhost.yml2
2 files changed, 2 insertions, 1 deletions
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'