From 0e7c17a3382fb52d7ff994b753867dec05fc1929 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 17 Jun 2016 18:21:00 +0100 Subject: [PATCH] Clean up container cache prep in tests This patch cleans up the container cache preparation in the tests due to the following patches: - https://review.openstack.org/315114 (new apt config process) - https://review.openstack.org/322188 (new resolver config process) Change-Id: Iba0b842e7d757e6ac1068f1a9290a081edcb0f55 --- tests/test-prepare-host.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/tests/test-prepare-host.yml b/tests/test-prepare-host.yml index 036c9d3..19df9e7 100644 --- a/tests/test-prepare-host.yml +++ b/tests/test-prepare-host.yml @@ -39,30 +39,6 @@ - { src: '/etc/pip.conf', dest: '/etc/pip.conf' } when: - nodepool.stat.exists | bool - - name: Set a fact for file to disable GPG signature checking of apt sources for OpenStack-CI instances - set_fact: - apt_disable_gpg_checking: - - { src: '/etc/apt/apt.conf.d/99unauthenticated', dest: '/etc/apt/apt.conf.d/99unauthenticated' } - when: - - nodepool.stat.exists | bool - - ansible_pkg_mgr == 'apt' - - name: Update the files to copy into the container cache for OpenStack-CI instances - set_fact: - lxc_container_cache_files: - "{{ lxc_container_cache_files + apt_disable_gpg_checking }}" - when: - - nodepool.stat.exists | bool - - ansible_pkg_mgr == 'apt' - - name: Determine the existing Ubuntu repo configuration - shell: 'awk "/^deb .*ubuntu\/? {{ ansible_distribution_release }} main/ {print \$2; exit}" /etc/apt/sources.list' - register: ubuntu_repo - changed_when: false - when: ansible_os_family == 'Debian' - - name: Set apt repo facts based on discovered information - set_fact: - lxc_container_template_main_apt_repo: "{{ ubuntu_repo.stdout }}" - lxc_container_template_security_apt_rep: "{{ ubuntu_repo.stdout }}" - when: ansible_os_family == 'Debian' roles: - role: "lxc_hosts" lxc_net_address: 10.100.100.1