XCI: k8s: Add support for CentOS distro

Kubespray already supports the CentOS distribution so make the
necessary changes to allow it to work in XCI.

Change-Id: I3cf1db055a5fd563b107b46456bc3e18eeafb3ab
Co-authored-by: Markos Chandras <mchandras@suse.de>
Signed-off-by: wutianwei <wutianwei1@huawei.com>

diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index 23f9385..9fb4da1 100644 (file)
--- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
@@ -56,11 +56,11 @@
     - name: copy k8s_cluster.yml
       shell: "cp -rf {{ remote_xci_path }}/xci/installer/kubespray/files/k8s-cluster.yml \
                      {{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars"
-    - name: install dbus and ptyhon-netaddr
-      apt:
-        name: "{{item}}"
-        update_cache: yes
-      with_items: "{{ kube_require_packages }}"
+    - name: Install required packages
+      package:
+        name: "{{ kube_require_packages[ansible_pkg_mgr] }}"
+        state: present
+        update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
       when: XCI_FLAVOR == 'aio'
     - name: pip install ansible
       pip:

diff --git a/xci/installer/kubespray/playbooks/configure-targethosts.yml b/xci/installer/kubespray/playbooks/configure-targethosts.yml
index 7e29025..08c735b 100644 (file)
--- a/xci/installer/kubespray/playbooks/configure-targethosts.yml
+++ b/xci/installer/kubespray/playbooks/configure-targethosts.yml
@@ -6,11 +6,11 @@
       copy:
         src: "{{ XCI_PATH }}/xci/files/authorized_keys"
         dest: /root/.ssh/authorized_keys
-    - name: install dbus and ptyhon-netaddr
-      apt:
-        name: "{{item}}"
-        update_cache: yes
-      with_items: "{{ kube_require_packages }}"
+    - name: Install required packages
+      package:
+        name: "{{ kube_require_packages[ansible_pkg_mgr] }}"
+        state: present
+        update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
 
 - hosts: kube-master
   remote_user: root

diff --git a/xci/installer/kubespray/playbooks/group_vars/all b/xci/installer/kubespray/playbooks/group_vars/all
index d2c36bf..87ed63b 100644 (file)
--- a/xci/installer/kubespray/playbooks/group_vars/all
+++ b/xci/installer/kubespray/playbooks/group_vars/all
@@ -1,6 +1,13 @@
 kube_require_packages:
-  - "python-netaddr"
-  - "dbus"
+  apt:
+    - python-netaddr
+    - dbus
+  yum:
+    - python-netaddr
+    - dbus
+  zypper:
+    - python-netaddr
+    - dbus-1
 
 keepalived_ubuntu_src: "uca"
 keepalived_uca_apt_repo_url: "{{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }}"

diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index ece4cae..36415d3 100644 (file)
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -71,3 +71,4 @@
         - noha
       distros:
         - ubuntu
+        - centos