summaryrefslogtreecommitdiffstats
path: root/xci/installer/kubespray/playbooks
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2018-02-03 16:53:28 +0800
committerwutianwei <wutianwei1@huawei.com>2018-02-23 02:09:48 +0000
commit24c9f93e9434efbbee9bf9a7a399a527ac2dcb7c (patch)
tree72021f888dcadca959d5a90d78eb76faf2a76652 /xci/installer/kubespray/playbooks
parente92f64a24a04b08387af618a9bc398d0315bb7ce (diff)
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>
Diffstat (limited to 'xci/installer/kubespray/playbooks')
-rw-r--r--xci/installer/kubespray/playbooks/configure-opnfvhost.yml10
-rw-r--r--xci/installer/kubespray/playbooks/configure-targethosts.yml10
-rw-r--r--xci/installer/kubespray/playbooks/group_vars/all11
3 files changed, 19 insertions, 12 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index 23f93852..9fb4da19 100644
--- 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 7e29025b..08c735b4 100644
--- 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 d2c36bfc..87ed63bd 100644
--- 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') }}"