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/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: I7df8637e8d63e839148dc86e68102cc96bef3bfd
This commit is contained in:
parent
6ebc7b4f6d
commit
f249d7e6a0
|
@ -55,16 +55,7 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
lxc_container_cache_files:
|
lxc_container_cache_files:
|
||||||
- { src: '/etc/pip.conf', dest: '/etc/pip.conf' }
|
- { 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
|
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:
|
roles:
|
||||||
- role: "lxc_hosts"
|
- role: "lxc_hosts"
|
||||||
lxc_net_address: 10.100.100.1
|
lxc_net_address: 10.100.100.1
|
||||||
|
@ -72,11 +63,6 @@
|
||||||
lxc_net_bridge: lxcbr0
|
lxc_net_bridge: lxcbr0
|
||||||
lxc_kernel_options:
|
lxc_kernel_options:
|
||||||
- { key: 'fs.inotify.max_user_instances', value: 1024 }
|
- { 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
|
|
||||||
post_tasks:
|
post_tasks:
|
||||||
# Inventory is being pre-loaded using a post tasks instead of through a dynamic
|
# Inventory is being pre-loaded using a post tasks instead of through a dynamic
|
||||||
# inventory system. While this is not a usual method for deployment it's being
|
# inventory system. While this is not a usual method for deployment it's being
|
||||||
|
|
Loading…
Reference in New Issue