diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-04-17 10:39:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-17 10:39:10 +0000 |
| commit | 164e43f7e8f3b2c7767445969414457fb58030fe (patch) | |
| tree | c468c1dc093078c9d1d8b07af6c91a63481f75a3 /xci/installer | |
| parent | c02dddca973bbd3dd160c41000d4036363e94db0 (diff) | |
| parent | e99fb1e677516c2951542d1eee62166246244ca8 (diff) | |
Merge "xci: kubespray: Fix inventory when configuring keys on targethosts"
Diffstat (limited to 'xci/installer')
3 files changed, 10 insertions, 17 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml index 697d44c2..ac8988da 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -57,10 +57,13 @@ insertafter: 'targetPort' line: " type: NodePort" - - name: pip install ansible + - name: pip install required packages pip: - name: ansible - version: "{{ xci_kube_ansible_pip_version }}" + name: "{{ item.name }}" + version: "{{ item.version | default(omit) }}" + with_items: + - { name: 'ansible', version: "{{ xci_kube_ansible_pip_version }}" } + - { name: 'netaddr' } - name: Configure SSL certificates include_tasks: "{{ xci_path }}/xci/playbooks/manage-ssl-certs.yml" diff --git a/xci/installer/kubespray/playbooks/configure-targethosts.yml b/xci/installer/kubespray/playbooks/configure-targethosts.yml index dd7024fb..c744eae6 100644 --- a/xci/installer/kubespray/playbooks/configure-targethosts.yml +++ b/xci/installer/kubespray/playbooks/configure-targethosts.yml @@ -1,12 +1,13 @@ --- -- hosts: all +- hosts: k8s-cluster remote_user: root tasks: - name: Manage SSH keys include_tasks: "{{ xci_path }}/xci/playbooks/manage-ssh-keys.yml" - - name: Install required packages + + - name: Install dbus 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) }}" diff --git a/xci/installer/kubespray/playbooks/group_vars/all b/xci/installer/kubespray/playbooks/group_vars/all index 87ed63bd..328f8dba 100644 --- a/xci/installer/kubespray/playbooks/group_vars/all +++ b/xci/installer/kubespray/playbooks/group_vars/all @@ -1,14 +1,3 @@ -kube_require_packages: - 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') }}" |