Merge "Keep the N behavior optionally"

This commit is contained in:
Jenkins 2017-01-10 16:24:10 +00:00 committed by Gerrit Code Review
commit 4cae1f817a
2 changed files with 2 additions and 2 deletions

View File

@ -483,7 +483,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"
#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

View File

@ -36,7 +36,7 @@
repo: "{{ uca_repo }}"
state: present
update_cache: yes
filename: "{{ uca_apt_source_list_filename }}"
filename: "{{ uca_apt_source_list_filename | default(omit) }}"
register: neutron_uca_add_repo
when:
- neutron_uca_enable