openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Clean up container cache prep in tasks

Browse Source 
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
This commit is contained in:
Jesse Pretorius 2016-06-17 19:36:29 +01:00 committed by Jesse Pretorius (odyssey4me)
parent d142d36bd5
commit 5a39413607
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test-prepare-host.yml
View File

@ -35,16 +35,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 }}"
post_tasks: post_tasks:
- name: Create br-storage bridge - name: Create br-storage bridge
shell: /sbin/brctl addbr br-storage || true shell: /sbin/brctl addbr br-storage || true