From 0246dd456dec619a2e5f3b6e91a057ba3f216d23 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 18 May 2020 10:48:02 +0100 Subject: [PATCH] networking-ovn is now integrated into neutron This is no longer a standalone repo [1] and the code used before is now removed causing jobs to fail. Stop trying to install the old code. [1] https://review.opendev.org/#/c/715174/ Change-Id: I3814051395e6b99f68dca5a2afc80e7b719a09d9 --- defaults/main.yml | 3 --- tests/neutron-overrides-ovn.yml | 2 +- vars/main.yml | 9 --------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 865f263b..b2800752 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -69,8 +69,6 @@ networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn networking_bgpvpn_git_install_branch: master openstack_ceilometer_git_repo: https://opendev.org/openstack/ceilometer openstack_ceilometer_git_install_branch: master -networking_ovn_git_repo: https://opendev.org/openstack/networking-ovn -networking_ovn_git_install_branch: master networking_generic_switch_git_repo: https://opendev.org/openstack/networking-generic-switch networking_generic_switch_git_install_branch: master @@ -85,7 +83,6 @@ neutron_git_constraints: - "git+{{ networking_sfc_git_repo }}@{{ networking_sfc_git_install_branch }}#egg=networking-sfc" - "git+{{ networking_bgpvpn_git_repo }}@{{ networking_bgpvpn_git_install_branch }}#egg=networking-bgpvpn" - "git+{{ openstack_ceilometer_git_repo }}@{{ openstack_ceilometer_git_install_branch }}#egg=ceilometer" - - "git+{{ networking_ovn_git_repo }}@{{ networking_ovn_git_install_branch }}#egg=networking-ovn" - "git+{{ networking_generic_switch_git_repo }}@{{ networking_generic_switch_git_install_branch }}#egg=networking-generic-switch" - "--constraint {{ neutron_upper_constraints_url }}" diff --git a/tests/neutron-overrides-ovn.yml b/tests/neutron-overrides-ovn.yml index 2f1de7a7..fb78fee4 100644 --- a/tests/neutron-overrides-ovn.yml +++ b/tests/neutron-overrides-ovn.yml @@ -24,7 +24,7 @@ neutron_plugin_type: ml2.ovn neutron_local_ip: "{{ ansible_host }}" neutron_plugin_base: - - networking_ovn.l3.l3_ovn.OVNL3RouterPlugin + - neutron.services.ovn_l3.plugin.OVNL3RouterPlugin neutron_ml2_drivers_type: "geneve,vlan,flat,local" diff --git a/vars/main.yml b/vars/main.yml index 1fafbeab..d992901a 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -69,9 +69,6 @@ neutron_proprietary_nuage_pip_packages: - nuage-openstack-neutronclient - nuagenetlib -neutron_optional_ovn_pip_packages: - - networking-ovn - neutron_optional_ngs_pip_packages: - networking-generic-switch @@ -108,12 +105,6 @@ neutron_venv_packages: >- {%- set _ = pkg_list.extend(neutron_optional_sfc_pip_packages) %} {%- endif %} {%- endif %} - {%- if (neutron_plugin_type.split('.')[-1] == 'ovn') and - ((neutron_services['neutron-server']['group'] in group_names) or - (neutron_services['neutron-ovn-northd']['group'] in group_names) or - (neutron_services['neutron-ovn-controller']['group'] in group_names)) %} - {%- set _ = pkg_list.extend(neutron_optional_ovn_pip_packages) %} - {%- endif %} {%- if ('ml2.genericswitch' in neutron_plugin_types) and (neutron_services['neutron-server']['group'] in group_names) %} {%- set _ = pkg_list.extend(neutron_optional_ngs_pip_packages) %}