From c8f4f275a1e9968b1f049c022639adadc4333b63 Mon Sep 17 00:00:00 2001
From: German Eichberger <German.eichberger@rackspace.com>
Date: Wed, 21 Mar 2018 15:30:47 -0700
Subject: [PATCH] Make Octavia V2 API default

With Queen the deprecation cycle for neutron lbaas started
so default to a stand alone Octavia installation.

Change-Id: I362508b21b39f3f096cc7ee8ee330f6eeab1648b
---
 defaults/main.yml                | 12 +++++-----
 doc/source/configure-octavia.rst | 38 ++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e21edc6e..82fad4b1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -17,10 +17,10 @@
 debug: False
 
 ## Octavia standalone (v2) experimental
-octavia_v2: false
+octavia_v2: True
 
 ## Activate Octavia V1 API
-octavia_v1: True
+octavia_v1: False
 
 ## Allow TLS listener
 octavia_tls_listener_enabled: True
@@ -280,12 +280,12 @@ octavia_spare_amphora_pool_size: 1
 # e.g. 3 hosts, 5 workers (this param) per host, results in 15 worker total
 octavia_task_flow_max_workers: 5
 
-# event_streamer - set to False if you don't need up to date lb information and/or
-# your queue is crashing (Octavia will stream events to the neutron DB)
-octavia_event_streamer: 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: False
 
 # Enable provisioning status sync with neutron db
-octavia_sync_provisioning_status: True
+octavia_sync_provisioning_status: False
 
 # OSA is architected to use vHosts for queues so we need to post events
 # into the Neutron queue for them to be picked up
diff --git a/doc/source/configure-octavia.rst b/doc/source/configure-octavia.rst
index 3cef99b3..ea7f45c0 100644
--- a/doc/source/configure-octavia.rst
+++ b/doc/source/configure-octavia.rst
@@ -192,32 +192,36 @@ enable access.
    /etc/openstack-deploy
 
 
-Optional: Enable Octavia V2 API
+Optional: Enable Octavia V1 API
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Beginning with the Pike release, Octavia can be deployed in a stand-alone
-version thus avoiding the Neutron integration. Currently, the following
-configuration should be added to ``openstack_user_config.yml``:
+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
 
-  # Disable Octavia support in Neutron
-  neutron_lbaas_octavia: False
-  # Disable LBaaS V2
-  neutron_lbaasv2: False
-  # Enable Octavia V2 API/standalone
-  octavia_v2: True
-  # Disable Octavia V1 API
-  octavia_v1: False
+  # 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.
 
-Please be aware that if you enable only the Octavia endpoint, only
-Octavia load balancers can be created because the integration with 3rd party
-load balancer vendors nor with the haproxy namespace driver is available
-in the Pike release.
-
 Optional: Tuning Octavia for production use
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~