diff --git a/doc/source/admin/archives/adv-features.rst b/doc/source/admin/archives/adv-features.rst index 1f6e1a2bffe..447b528d877 100644 --- a/doc/source/admin/archives/adv-features.rst +++ b/doc/source/admin/archives/adv-features.rst @@ -398,60 +398,6 @@ basic security group operations: $ openstack port set --no-security-group PORT_ID -Basic Load-Balancer-as-a-Service operations -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -.. note:: - - The Load-Balancer-as-a-Service (LBaaS) API provisions and configures - load balancers. The reference implementation is based on the HAProxy - software load balancer. - -This list shows example neutron commands that enable you to complete -basic LBaaS operations: - -- Creates a load balancer pool by using specific provider. - - ``--provider`` is an optional argument. If not used, the pool is - created with default provider for LBaaS service. You should configure - the default provider in the ``[service_providers]`` section of the - ``neutron.conf`` file. If no default provider is specified for LBaaS, - the ``--provider`` parameter is required for pool creation. - - .. code-block:: console - - $ neutron lb-pool-create --lb-method ROUND_ROBIN --name mypool \ - --protocol HTTP --subnet-id SUBNET_UUID --provider PROVIDER_NAME - -- Associates two web servers with pool. - - .. code-block:: console - - $ neutron lb-member-create --address WEBSERVER1_IP --protocol-port 80 mypool - $ neutron lb-member-create --address WEBSERVER2_IP --protocol-port 80 mypool - -- Creates a health monitor that checks to make sure our instances are - still running on the specified protocol-port. - - .. code-block:: console - - $ neutron lb-healthmonitor-create --delay 3 --type HTTP --max-retries 3 \ - --timeout 3 - -- Associates a health monitor with pool. - - .. code-block:: console - - $ neutron lb-healthmonitor-associate HEALTHMONITOR_UUID mypool - -- Creates a virtual IP (VIP) address that, when accessed through the - load balancer, directs the requests to one of the pool members. - - .. code-block:: console - - $ neutron lb-vip-create --name myvip --protocol-port 80 --protocol \ - HTTP --subnet-id SUBNET_UUID mypool - Plug-in specific extensions ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/admin/archives/config-agents.rst b/doc/source/admin/archives/config-agents.rst index 2e5777721fb..925547cb84b 100644 --- a/doc/source/admin/archives/config-agents.rst +++ b/doc/source/admin/archives/config-agents.rst @@ -351,6 +351,12 @@ The Neutron Metering agent resides beside neutron-l3-agent. Configure Load-Balancer-as-a-Service (LBaaS v2) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.. warning:: + Neutron-lbaas is deprecated as of Queens. Load-Balancer-as-a-Service + (LBaaS v2) is now provided by the `Octavia project + `_. Please see the FAQ: + https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation + For the back end, use either ``Octavia`` or ``HAProxy``. This example uses Octavia. diff --git a/doc/source/admin/archives/introduction.rst b/doc/source/admin/archives/introduction.rst index 94249bcf314..92ae318edf0 100644 --- a/doc/source/admin/archives/introduction.rst +++ b/doc/source/admin/archives/introduction.rst @@ -108,6 +108,12 @@ Set these options to configure SSL: Load-Balancer-as-a-Service (LBaaS) overview ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.. warning:: + Neutron-lbaas is deprecated as of Queens. Load-Balancer-as-a-Service + (LBaaS v2) is now provided by the `Octavia project + `_. Please see the FAQ: + https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation + Load-Balancer-as-a-Service (LBaaS) enables Networking to distribute incoming requests evenly among designated instances. This distribution ensures that the workload is shared predictably among instances and diff --git a/doc/source/admin/config-ipv6.rst b/doc/source/admin/config-ipv6.rst index 1a81620ac4b..fa25057e1cd 100644 --- a/doc/source/admin/config-ipv6.rst +++ b/doc/source/admin/config-ipv6.rst @@ -399,12 +399,6 @@ configuration. Either or both the ``peer_address`` and the addressing modes and router modes described above should not impact support. - -LBaaS ------ - -TODO - FWaaS ----- diff --git a/doc/source/admin/config-lbaas.rst b/doc/source/admin/config-lbaas.rst index 0a95e9808aa..b29c31a1166 100644 --- a/doc/source/admin/config-lbaas.rst +++ b/doc/source/admin/config-lbaas.rst @@ -4,6 +4,12 @@ Load Balancer as a Service (LBaaS) ================================== +.. warning:: + Neutron-lbaas is deprecated as of Queens. Load-Balancer-as-a-Service + (LBaaS v2) is now provided by the `Octavia project + `_. Please see the FAQ: + https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation + The Networking service offers a load balancer feature called "LBaaS v2" through the ``neutron-lbaas`` service plug-in. diff --git a/doc/source/admin/intro-os-networking.rst b/doc/source/admin/intro-os-networking.rst index 341935fe306..69135e9cf32 100644 --- a/doc/source/admin/intro-os-networking.rst +++ b/doc/source/admin/intro-os-networking.rst @@ -368,7 +368,8 @@ LBaaS The Load-Balancer-as-a-Service (LBaaS) API provisions and configures load balancers. The reference implementation is based on the HAProxy -software load balancer. +software load balancer. See the `Octavia project +`_ for more information. FWaaS ^^^^^ diff --git a/doc/source/contributor/internals/service_extensions.rst b/doc/source/contributor/internals/service_extensions.rst index e23ada1018d..c2b09696bdb 100644 --- a/doc/source/contributor/internals/service_extensions.rst +++ b/doc/source/contributor/internals/service_extensions.rst @@ -28,7 +28,8 @@ Historically, Neutron supported the following advanced services: #. **FWaaS** (*Firewall-as-a-Service*): runs as part of the L3 agent. #. **LBaaS** (*Load-Balancer-as-a-Service*): implemented purely inside - neutron-server, does not interact directly with agents. + neutron-server, does not interact directly with agents. **Deprecated as of + Queens**. #. **VPNaaS** (*VPN-as-a-Service*): derives from L3 agent to add VPNaaS functionality. diff --git a/doc/source/contributor/policies/bugs.rst b/doc/source/contributor/policies/bugs.rst index e84ffdf71d5..35e28fab255 100644 --- a/doc/source/contributor/policies/bugs.rst +++ b/doc/source/contributor/policies/bugs.rst @@ -1,7 +1,7 @@ Neutron Bugs ============ -Neutron (client, core, FwaaS, LBaaS, VPNaaS) maintains all of its bugs in the following +Neutron (client, core, FwaaS, VPNaaS) maintains all of its bugs in the following Launchpad projects: * `Launchpad Neutron `_ @@ -604,14 +604,6 @@ L3 IPAM DHCP * `L3 IPAM DHCP - All bugs `_ * `L3 IPAM DHCP - In progress `_ -.. _lbaas: - -LBAAS -+++++ - -* `LBaaS - All bugs `_ -* `LBaaS - In progress `_ - .. _lib: Lib diff --git a/doc/source/contributor/policies/contributor-onboarding.rst b/doc/source/contributor/policies/contributor-onboarding.rst index ff210cafce5..ccd655d4d06 100644 --- a/doc/source/contributor/policies/contributor-onboarding.rst +++ b/doc/source/contributor/policies/contributor-onboarding.rst @@ -26,5 +26,4 @@ Here is a list of tagged documentation and API reference bugs: IRC Information and Etiquette ----------------------------- -The main IRC channel for Neutron is #openstack-neutron. We also utilize #openstack-lbaas -for LBaaS specific discussions. The weekly meeting is documented in the `list of meetings `_ wiki page. +The main IRC channel for Neutron is #openstack-neutron.