Skip to content

Commit

Permalink
Allow override of the repo filename
Browse files Browse the repository at this point in the history
Apt cannot have 2 mirrors with the same content in 2 different files.
If a deployer has an apt mirror with uca, the deployer
still need to add a repository, but will also need to define the
filename used, in order to avoid clashes.

This commit makes possible to decide the filename for the repo.

Change-Id: I05c57fe1e43c15757797ff4ad6a2acf39441cb50
Signed-off-by: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
  • Loading branch information
Jean-Philippe Evrard committed Jan 3, 2017
1 parent bca925b commit 32207fc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions defaults/main.yml
Expand Up @@ -480,6 +480,7 @@ neutron_local_ip: 127.0.0.1
neutron_uca_enable: True
# Ubuntu Cloud Archive mirror URL
uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
uca_apt_source_list_filename: "ubuntu_cloud_archive_canonical_com_ubuntu"

# When running in an AIO, we need to implement an iptables rule in any
# neutron_agent containers to that ensure instances can communicate with
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/apt-source-filenamed-2cc698add82f5eea.yaml
@@ -0,0 +1,5 @@
---
features:
- The filename of the apt source for the ubuntu
cloud archive can now be defined with the
variable ``uca_apt_source_list_filename``.
1 change: 1 addition & 0 deletions tasks/neutron_install.yml
Expand Up @@ -36,6 +36,7 @@
repo: "{{ uca_repo }}"
state: present
update_cache: yes
filename: "{{ uca_apt_source_list_filename }}"
register: neutron_uca_add_repo
when:
- neutron_uca_enable
Expand Down

0 comments on commit 32207fc

Please sign in to comment.