Remove UCA/RDO in role

Now that the external repository management is done in pip-install
role, we don't need this wiring anymore.

Everything will be consistent across all the roles that include
pip-install.

Change-Id: I553cd41fb758f50d8112986abfbd7f08c647bcb1
Signed-off-by: Jean-Philippe Evrard <jean-philippe@evrard.me>
This commit is contained in:
Jean-Philippe Evrard 2017-02-13 14:28:22 +00:00
parent 192a21368f
commit 6ad5f1a7e6
4 changed files with 0 additions and 50 deletions

View File

@ -561,13 +561,6 @@ neutron_local_ip: 127.0.0.1
# Currently only used in Dragonflow
neutron_management_ip: 127.0.0.1
# Toggle the use of Ubuntu Cloud Archive
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
# the neutron metadata service. This is necessary because in an AIO

View File

@ -20,44 +20,6 @@
when:
- ansible_pkg_mgr == 'apt'
- name: Add Ubuntu Cloud Archive key package
package:
name: ubuntu-cloud-keyring
state: "{{ neutron_package_state }}"
when:
- neutron_uca_enable
- ansible_pkg_mgr == 'apt'
register: neutron_uca_add_keys
tags:
- add-apt-keys
- name: Add Ubuntu Cloud Archive apt repository
apt_repository:
repo: "{{ uca_repo }}"
state: present
update_cache: yes
filename: "{{ uca_apt_source_list_filename | default(omit) }}"
register: neutron_uca_add_repo
when:
- neutron_uca_enable
- ansible_pkg_mgr == 'apt'
until: add_repo|success
retries: 5
delay: 2
tags:
- add-uca-repo
- name: Install RDO package
package:
name: "{{ rdo_package }}"
state: "present"
register: install_cloud_rdo_package
until: install_cloud_rdo_package | success
retries: 5
delay: 2
when:
- ansible_pkg_mgr == 'yum'
- name: Install neutron distro packages
package:
name: "{{ item }}"

View File

@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
rdo_package: "https://rdoproject.org/repos/rdo-release.rpm"
neutron_checksum_script: /etc/sysconfig/network-scripts/ifup-post-metadata-checksum
neutron_ovs_distro_packages:

View File

@ -13,10 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Ubuntu Cloud Archive variables
uca_openstack_release: ocata
uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
neutron_checksum_script: /etc/network/if-up.d/post-up-metadata-checksum
neutron_ovs_distro_packages: