From 3b4ef33f14e11de6868b683a3a42d99f62824993 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Wed, 1 Mar 2023 21:54:10 +0100 Subject: [PATCH] Merge amphorav2 provider doc into amphora doc Change-Id: Ica68aa13b7499bc752c9bbcff1fd713ca1081b05 --- doc/source/admin/providers/amphora.rst | 3 +++ doc/source/admin/providers/amphorav2.rst | 31 ------------------------ doc/source/admin/providers/index.rst | 2 -- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 doc/source/admin/providers/amphorav2.rst diff --git a/doc/source/admin/providers/amphora.rst b/doc/source/admin/providers/amphora.rst index e0233584c6..604af6c775 100644 --- a/doc/source/admin/providers/amphora.rst +++ b/doc/source/admin/providers/amphora.rst @@ -19,6 +19,9 @@ Amphora This is the reference driver for Octavia, meaning it is used for testing the Octavia code base. It is an open source, scalable, and highly available load balancing provider. +It adopts taskflow jobboard feature and saves task states into the persistence +backend, this allows to continue task execution if controller work was +interrupted. Default provider name: **amphora** diff --git a/doc/source/admin/providers/amphorav2.rst b/doc/source/admin/providers/amphorav2.rst deleted file mode 100644 index d6db68dea7..0000000000 --- a/doc/source/admin/providers/amphorav2.rst +++ /dev/null @@ -1,31 +0,0 @@ -.. - Copyright 2020 Mirantis Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); you may - not use this file except in compliance with the License. You may obtain - a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - License for the specific language governing permissions and limitations - under the License. - -Amphorav2 -========= - -This is extension of the reference driver for Octavia. It adopts taskflow -jobboard feature and saves task states into the persistence backend, this -allows to continue task execution if controller work was interrupted. - -Default provider name: **amphorav2** - -The driver package: https://pypi.org/project/octavia/ - -The driver source: https://opendev.org/openstack/octavia/ - -The documentation: https://docs.openstack.org/octavia/latest/ - -Where to report issues with the driver: https://storyboard.openstack.org/#!/project/openstack/octavia diff --git a/doc/source/admin/providers/index.rst b/doc/source/admin/providers/index.rst index 2eee086f46..8c60c3c761 100644 --- a/doc/source/admin/providers/index.rst +++ b/doc/source/admin/providers/index.rst @@ -45,8 +45,6 @@ your Octavia API instances. .. include:: amphora.rst -.. include:: amphorav2.rst - .. include:: f5.rst .. include:: ovn.rst