fix k8 aio flavor undefined variable

1. fix error that kube_require_packages is undefined
2. add "remote_user: root" in configure-kubenet.yml
   if don't add this, it will have issue to connect host.
   fatal: [opnfv]:UNREACHABLE! => {"changed": false, "msg":
   "Failed to connect to thehost via ssh: Permission denied (publickey,password).\r\n",
   "unreachable": true"}

installer-type:kubespray
deploy-scenario:k8-nosdn-nofeature

Change-Id: Ia8d1980ad18375c0cff3a97b284b0f53d7539e23
Signed-off-by: wutianwei <wutianwei1@huawei.com>

diff --git a/xci/installer/kubespray/playbooks/configure-kubenet.yml b/xci/installer/kubespray/playbooks/configure-kubenet.yml
index 1c3740b..3b1cb01 100644 (file)
--- 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 7626b94..01904ba 100644 (file)
--- 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'