From 4245f268fb8fe249e89768d4109c1d453afefc7a Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 5 Oct 2023 16:37:31 +0200 Subject: [PATCH] Deprecate OpenDaylight support Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/897421 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_neutron/+/897461 Change-Id: I40ae5f158a7658cb2a6fa3b99cc64468281e5ad0 --- ansible-role-requirements.yml | 6 ---- doc/source/contributor/project-onboarding.rst | 1 - inventory/env.d/neutron.yml | 4 --- .../neutron_all/haproxy_service.yml | 34 ------------------- tests/test_inventory.py | 1 - 5 files changed, 46 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 4cb991d573..6cf1d22e49 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -293,12 +293,6 @@ version: stable-7.0 trackbranch: stable-7.0 shallow_since: '2022-06-14' -- name: opendaylight - scm: git - src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight - version: master - trackbranch: master - shallow_since: '2019-09-14' - name: pacemaker_corosync scm: git src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync diff --git a/doc/source/contributor/project-onboarding.rst b/doc/source/contributor/project-onboarding.rst index 65745e7ec7..9d95ff3f16 100644 --- a/doc/source/contributor/project-onboarding.rst +++ b/doc/source/contributor/project-onboarding.rst @@ -51,7 +51,6 @@ each of them with specific use cases, and different sets of practices. - * https://github.com/ceph/ceph-ansible * https://github.com/logan2211/ansible-resolvconf * https://github.com/willshersystems/ansible-sshd - * https://github.com/opendaylight/integration-packaging-ansible-opendaylight * https://github.com/evrardjp/ansible-keepalived * ... - OpenStack-Ansible is not re-inventing the wheel, and tries to diff --git a/inventory/env.d/neutron.yml b/inventory/env.d/neutron.yml index a3d99e70c2..b369193949 100644 --- a/inventory/env.d/neutron.yml +++ b/inventory/env.d/neutron.yml @@ -56,9 +56,6 @@ component_skel: neutron_ovn_northd: belongs_to: - neutron_all - opendaylight: - belongs_to: - - neutron_all container_skel: neutron_agents_container: @@ -84,7 +81,6 @@ container_skel: - network-infra_containers contains: - neutron_server - - opendaylight neutron_ovn_gateway_container: belongs_to: - network-gateway_containers diff --git a/inventory/group_vars/neutron_all/haproxy_service.yml b/inventory/group_vars/neutron_all/haproxy_service.yml index 03f0cec753..f2496b2580 100644 --- a/inventory/group_vars/neutron_all/haproxy_service.yml +++ b/inventory/group_vars/neutron_all/haproxy_service.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -haproxy_opendaylight_allowlist_networks: "{{ haproxy_allowlist_networks }}" - haproxy_neutron_server_service: haproxy_service_name: neutron_server haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}" @@ -29,37 +27,5 @@ haproxy_neutron_server_service: haproxy_accept_both_protocols: "{{ neutron_accept_both_protocols | default(openstack_service_accept_both_protocols) }}" haproxy_service_enabled: "{{ groups['neutron_server'] is defined and groups['neutron_server'] | length > 0 }}" -haproxy_opendaylight_neutron_service: - haproxy_service_name: opendaylight-neutron - haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}" - haproxy_bind: >- - {{ [{ - 'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address), - 'interface': haproxy_bind_internal_lb_vip_interface | default('') - }] }} - haproxy_port: 8180 - haproxy_balance_type: tcp - haproxy_timeout_client: 5000s - haproxy_timeout_server: 5000s - haproxy_allowlist_networks: "{{ haproxy_opendaylight_allowlist_networks }}" - haproxy_service_enabled: "{{ (neutron_plugin_type | default('ml2.ovn') == 'ml2.opendaylight') }}" - -haproxy_opendaylight_websocket_service: - haproxy_service_name: opendaylight-websocket - haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}" - haproxy_bind: >- - {{ [{ - 'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address), - 'interface': haproxy_bind_internal_lb_vip_interface | default('') - }] }} - haproxy_port: 8185 - haproxy_balance_type: tcp - haproxy_timeout_client: 5000s - haproxy_timeout_server: 5000s - haproxy_allowlist_networks: "{{ haproxy_opendaylight_allowlist_networks }}" - haproxy_service_enabled: "{{ (neutron_plugin_type | default('ml2.ovn') == 'ml2.opendaylight') }}" - neutron_haproxy_services: - "{{ haproxy_neutron_server_service | combine(haproxy_neutron_server_service_overrides | default({})) }}" - - "{{ haproxy_opendaylight_neutron_service | combine(haproxy_opendaylight_neutron_service_overrides | default({})) }}" - - "{{ haproxy_opendaylight_websocket_service | combine(haproxy_opendaylight_websocket_service_overrides | default({})) }}" diff --git a/tests/test_inventory.py b/tests/test_inventory.py index 4defa932ae..32ef52074d 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -411,7 +411,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'nova_conductor', 'nova_console', 'nova_scheduler', - 'opendaylight', 'operator_containers', 'operator_hosts', 'orchestration_all',