From e00cb9c5636dff40c1e964dd6158919ddc4d8e72 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 2 Dec 2020 15:46:33 +0200 Subject: [PATCH] Drop octavia v1 api options Octavia v1 options have been dropped from upstream on Train. They have no effect nowadays so no reason to futher carry it's codebase Change-Id: I1c8f9723ca2ac2b468725c2954adcdaff54dbdf0 --- defaults/main.yml | 6 ------ doc/source/configure-octavia.rst | 31 ------------------------------- templates/octavia.conf.j2 | 13 +------------ tests/os_octavia-overrides.yml | 2 -- 4 files changed, 1 insertion(+), 51 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a6a1dd80..16a3004f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -26,12 +26,6 @@ octavia_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_ octavia_install_method: "source" octavia_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}" -## Octavia standalone (v2) -octavia_v2: True - -## Activate Octavia V1 API (deprecated) -octavia_v1: False - ## Allow TLS listener octavia_tls_listener_enabled: True diff --git a/doc/source/configure-octavia.rst b/doc/source/configure-octavia.rst index 7f1088e4..75657647 100644 --- a/doc/source/configure-octavia.rst +++ b/doc/source/configure-octavia.rst @@ -212,36 +212,6 @@ enable access. /etc/openstack-deploy -Optional: Enable Octavia V1 API -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Beginning with the Queens release, neutron lbaas has started it's -deprecation cycle and therefore Octavia stand alone is the default -configuration beginning Rocky. If the neutron lbaas endpoint is still -needed consider deploying the neutron lbaas proxy plugin. - -If for legacy reasons neutron lbaas still needs the internal Octavia V1 -API endpoint add the following parameters to ``openstack_user_config.yml``: - -.. code-block:: yaml - - # Enable Octavia support in Neutron - neutron_lbaas_octavia: True - # Enable LBaaS V2 - neutron_lbaasv2: True - # Disable Octavia V2 API/standalone - octavia_v2: False - # Enable Octavia V1 API - octavia_v1: True - # event_streamer - set to True if you are using neutron lbaas with Octavia - # (Octavia will stream events to the neutron DB) - octavia_event_streamer: True - # Enable provisioning status sync with neutron db - octavia_sync_provisioning_status: True - -Please note that in some settings the LBaaS plugin is directly enabled in the -``neutron_plugin_base`` so adjust this as necessary. - Optional: Tuning Octavia for production use ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -258,4 +228,3 @@ The variable ``octavia_spare_amphora_pool_size`` controls the size of the pool. The system will try to prebuild this number so using too big a number will consumes a lot of unnecessary resources. - diff --git a/templates/octavia.conf.j2 b/templates/octavia.conf.j2 index 642ea3a6..30bd117d 100644 --- a/templates/octavia.conf.j2 +++ b/templates/octavia.conf.j2 @@ -3,15 +3,6 @@ debug = {{ debug }} use_journal = True -{% if not octavia_v2|bool %} -bind_host = 0.0.0.0 -bind_port = {{ octavia_service_port }} -# api_handler = queue_producer -# -# How should authentication be handled (keystone, noauth) -auth_strategy = {{ octavia_auth_strategy }} -# -{% endif %} # Plugin options are hot_plug_plugin (Hot-pluggable controller plugin) # # octavia_plugins = hot_plug_plugin @@ -39,9 +30,7 @@ bind_port = {{ octavia_service_port }} # How should authentication be handled (keystone, noauth) # Note: remove "noauth" once LP bug is fixed auth_strategy = {{ octavia_auth_strategy }} -# -api_v1_enabled = {{ octavia_v1 }} -api_v2_enabled = {{ octavia_v2 }} + # Allow users to create TLS Terminated listeners? allow_tls_terminated_listeners = {{ octavia_tls_listener_enabled }} diff --git a/tests/os_octavia-overrides.yml b/tests/os_octavia-overrides.yml index 62e5d2b1..5a7f8ea3 100644 --- a/tests/os_octavia-overrides.yml +++ b/tests/os_octavia-overrides.yml @@ -12,8 +12,6 @@ # limitations under the License. test_octavia_amphora: True -octavia_v2: True -octavia_v1: False octavia_legacy_policy: True octavia_amp_active_retries: 20