Switch to centos-release-openstack-queens for ovs

Drop the dependency on RDO infra in favor of latest OVS releases in
centos-7. This means we'll be bumping to 2.9.0.

This still isn't the best, as we are pinning to a specific release of
openstack. However, until there is the OVS SIG in centos, this is the
best we can do.

Change-Id: Ic8a7ee26ebe0ef4f8c2dcecf9bcfce03b55422e5
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-07-05 18:36:06 -04:00
parent d7a171cfae
commit e24fd6b7c0
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 8 additions and 10 deletions

View File

@ -5,18 +5,17 @@
- "{{ ansible_os_family }}.yaml"
- "default.yaml"
# RHEL and CentOS requires repositories provided by RDO in order to install
# CentOS requires repositories provided by centos in order to install
# openvswitch, set them up.
- name: Set-up RDO repositories
- name: Enable centos-release-openstack-queens
become: yes
package:
name: "{{ rdo_repository }}"
name: centos-release-openstack-queens
state: installed
when:
- rdo_repository is defined
- ansible_os_family == "RedHat"
- ansible_distribution != "Fedora"
register: rdo_repos
register: centos_ovs
- name: Install openvswitch
become: yes
@ -31,13 +30,13 @@
state: started
enabled: yes
# If we've installed RDO repositories for openvswitch earlier, remove them
- name: Ensure RDO repositories are removed
# If we've installed repositories for openvswitch earlier, remove them
- name: Ensure centos-release-openstack-queens is removed
become: yes
package:
name: "rdo-release"
name: "centos-release-openstack-queens"
state: absent
when: rdo_repos | changed
when: centos_ovs | changed
- name: Authorize the multi-node-bridge network
become: yes

View File

@ -1,4 +1,3 @@
---
ovs_package: "openvswitch"
ovs_service: "openvswitch"
rdo_repository: "https://rdoproject.org/repos/openstack-ocata/rdo-release-ocata.rpm"