From f5c5e11581e17919602fcc08a022ca190be2e18e Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 1 Nov 2018 09:55:48 +0000 Subject: xci: Add missing update_cache statements When we install packages from the distro repos we need to make sure that the database is updated. This also takes SUSE's zypper pkg manager into consideration which can benefit from the same Ansible option. Change-Id: I7a2206bfc5827b9ccb448278759711c560bb4679 Signed-off-by: Markos Chandras --- xci/installer/kubespray/playbooks/configure-opnfvhost.yml | 2 +- xci/installer/kubespray/playbooks/configure-targethosts.yml | 2 +- xci/playbooks/roles/create-nodes/tasks/main.yml | 2 ++ xci/playbooks/roles/prepare-tests/tasks/main.yml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml index 82ece961..54e32149 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -82,7 +82,7 @@ package: name: "{{ (ansible_pkg_mgr == 'zypper') | ternary('dbus-1', 'dbus') }}" state: present - update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" + update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}" when: xci_flavor == 'aio' - name: change dashboard server type to NodePort diff --git a/xci/installer/kubespray/playbooks/configure-targethosts.yml b/xci/installer/kubespray/playbooks/configure-targethosts.yml index 859460c6..2fde9877 100644 --- a/xci/installer/kubespray/playbooks/configure-targethosts.yml +++ b/xci/installer/kubespray/playbooks/configure-targethosts.yml @@ -22,7 +22,7 @@ package: name: "{{ (ansible_pkg_mgr == 'zypper') | ternary('dbus-1', 'dbus') }}" state: present - update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" + update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}" - hosts: kube-master remote_user: root diff --git a/xci/playbooks/roles/create-nodes/tasks/main.yml b/xci/playbooks/roles/create-nodes/tasks/main.yml index 0e51b411..8e54fcd1 100644 --- a/xci/playbooks/roles/create-nodes/tasks/main.yml +++ b/xci/playbooks/roles/create-nodes/tasks/main.yml @@ -8,6 +8,8 @@ - name: "Install required packages" package: name: "{{ required_packages }}" + update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}" + state: present - include_tasks: prepare_libvirt.yml with_items: "{{ libvirt_networks }}" diff --git a/xci/playbooks/roles/prepare-tests/tasks/main.yml b/xci/playbooks/roles/prepare-tests/tasks/main.yml index b4e566c2..a543ac1f 100644 --- a/xci/playbooks/roles/prepare-tests/tasks/main.yml +++ b/xci/playbooks/roles/prepare-tests/tasks/main.yml @@ -11,6 +11,7 @@ - name: install required packages package: name: "{{ required_packages[ansible_pkg_mgr] }}" + update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}" state: present # Docker is needed for test frameworks -- cgit 1.2.3-korg