From 1ebe79c9978a4dc6a1f5e480642536dcd0ec63c4 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 17 Jun 2016 19:49:55 +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: Ic47e775a53b3890db035bc9366c51bb5c4fb7b07 --- tests/test-prepare-host.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/test-prepare-host.yml b/tests/test-prepare-host.yml index e7949e2..c66337d 100644 --- a/tests/test-prepare-host.yml +++ b/tests/test-prepare-host.yml @@ -32,16 +32,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 }}" roles: - role: "lxc_hosts" lxc_net_address: 10.100.100.1 @@ -49,8 +40,3 @@ lxc_net_bridge: lxcbr0 lxc_kernel_options: - { key: 'fs.inotify.max_user_instances', value: 1024 } - lxc_container_caches: - - url: "https://rpc-repo.rackspace.com/container_images/rpc-trusty-container.tgz" - name: "trusty.tgz" - sha256sum: "56c6a6e132ea7d10be2f3e8104f47136ccf408b30e362133f0dc4a0a9adb4d0c" - chroot_path: trusty/rootfs-amd64 \ No newline at end of file