From 5a39413607d1a7338bbf830e7a8610098533491b Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 17 Jun 2016 19:36:29 +0100 Subject: [PATCH] Clean up container cache prep in tasks This patch cleans up the container cache preparation in the tests due to the following patches: - https://review.openstack.org/307856 (new image build process) - https://review.openstack.org/315114 (new apt config process) - https://review.openstack.org/322188 (new resolver config process) Change-Id: Iacc759b8bac213afc6cf8925036ad3d88feefc0e --- tests/test-prepare-host.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/test-prepare-host.yml b/tests/test-prepare-host.yml index a1fb8581..84867167 100644 --- a/tests/test-prepare-host.yml +++ b/tests/test-prepare-host.yml @@ -35,16 +35,7 @@ set_fact: lxc_container_cache_files: - { src: '/etc/pip.conf', dest: '/etc/pip.conf' } - - { src: '/etc/apt/apt.conf.d/99unauthenticated', dest: '/etc/apt/apt.conf.d/99unauthenticated' } when: nodepool.stat.exists | bool - - 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 - - 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 }}" post_tasks: - name: Create br-storage bridge shell: /sbin/brctl addbr br-storage || true