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
This commit is contained in:
Jesse Pretorius 2016-06-17 18:21:00 +01:00
parent 7abd947a61
commit 0e7c17a338

View File

@ -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