Skip to content

Commit 37f2126

Browse files
committed
Remove mentions of use-octavia
openshift/cluster-cloud-controller-manager-operator#262 and openshift/openstack-test#115 are removing enforcement and testing of `use-octavia` option. The parameter is no longer used by the cloud-provider-openstack. This commit removes the mentions of it from the docs.
1 parent e703354 commit 37f2126

File tree

3 files changed

+14
-21
lines changed

3 files changed

+14
-21
lines changed

modules/cluster-cloud-controller-config-osp.adoc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ data:
3030
secret-namespace = kube-system
3131
region = regionOne
3232
[LoadBalancer]
33-
use-octavia = True
33+
enabled = True
3434
kind: ConfigMap
3535
metadata:
3636
creationTimestamp: "2022-12-20T17:01:08Z"
@@ -125,10 +125,6 @@ Neutron-LBaaS support is deprecated.
125125
| `enabled`
126126
| Whether or not to enable the `LoadBalancer` type of services integration. The default value is `true`.
127127

128-
// Always enforced.
129-
// | `use-octavia`
130-
// | Whether or not to use Octavia for the `LoadBalancer` type of service implementation rather than Neutron-LBaaS. The default value is `true`.
131-
132128
| `floating-network-id`
133129
| Optional. The external network used to create floating IP addresses for load balancer virtual IP addresses (VIPs). If there are multiple external networks in the cloud, this option must be set or the user must specify `loadbalancer.openstack.org/floating-network-id` in the service annotation.
134130

@@ -195,7 +191,7 @@ This option is unsupported if you use {rh-openstack} earlier than version 17 wit
195191
// | The id of the loadbalancer flavor to use. Uses octavia default if not set.
196192

197193
// | `availability-zone`
198-
// | The name of the loadbalancer availability zone to use. It is applicable if use-octavia is set to True and requires Octavia API version 2.14 or later (Ussuri release). The Octavia availability zone capabilities will not be used if it is not set. The parameter will be ignored if the Octavia version doesn't support availability zones yet.
194+
// | The name of the loadbalancer availability zone to use. The Octavia availability zone capabilities will not be used if it is not set. The parameter will be ignored if the Octavia version doesn't support availability zones yet.
199195

200196
| `LoadBalancerClass "ClassName"`
201197
a| This is a config section that comprises a set of options:

modules/installation-osp-setting-cloud-provider-options.adoc

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,20 @@ Configuring Octavia for load balancing is a common case for clusters that do not
3737
----
3838
#...
3939
[LoadBalancer]
40-
use-octavia=true <1>
41-
lb-provider = "amphora" <2>
42-
floating-network-id="d3deb660-4190-40a3-91f1-37326fe6ec4a" <3>
43-
create-monitor = True <4>
44-
monitor-delay = 10s <5>
45-
monitor-timeout = 10s <6>
46-
monitor-max-retries = 1 <7>
40+
lb-provider = "amphora" <1>
41+
floating-network-id="d3deb660-4190-40a3-91f1-37326fe6ec4a" <2>
42+
create-monitor = True <3>
43+
monitor-delay = 10s <4>
44+
monitor-timeout = 10s <5>
45+
monitor-max-retries = 1 <6>
4746
#...
4847
----
49-
<1> This property enables Octavia integration.
50-
<2> This property sets the Octavia provider that your load balancer uses. It accepts `"ovn"` or `"amphora"` as values. If you choose to use OVN, you must also set `lb-method` to `SOURCE_IP_PORT`.
51-
<3> This property is required if you want to use multiple external networks with your cluster. The cloud provider creates floating IP addresses on the network that is specified here.
52-
<4> This property controls whether the cloud provider creates health monitors for Octavia load balancers. Set the value to `True` to create health monitors. As of {rh-openstack} 16.1 and 16.2, this feature is only available for the Amphora provider.
53-
<5> This property sets the frequency with which endpoints are monitored. The value must be in the `time.ParseDuration()` format. This property is required if the value of the `create-monitor` property is `True`.
54-
<6> This property sets the time that monitoring requests are open before timing out. The value must be in the `time.ParseDuration()` format. This property is required if the value of the `create-monitor` property is `True`.
55-
<7> This property defines how many successful monitoring requests are required before a load balancer is marked as online. The value must be an integer. This property is required if the value of the `create-monitor` property is `True`.
48+
<1> This property sets the Octavia provider that your load balancer uses. It accepts `"ovn"` or `"amphora"` as values. If you choose to use OVN, you must also set `lb-method` to `SOURCE_IP_PORT`.
49+
<2> This property is required if you want to use multiple external networks with your cluster. The cloud provider creates floating IP addresses on the network that is specified here.
50+
<3> This property controls whether the cloud provider creates health monitors for Octavia load balancers. Set the value to `True` to create health monitors. As of {rh-openstack} 16.1 and 16.2, this feature is only available for the Amphora provider.
51+
<4> This property sets the frequency with which endpoints are monitored. The value must be in the `time.ParseDuration()` format. This property is required if the value of the `create-monitor` property is `True`.
52+
<5> This property sets the time that monitoring requests are open before timing out. The value must be in the `time.ParseDuration()` format. This property is required if the value of the `create-monitor` property is `True`.
53+
<6> This property defines how many successful monitoring requests are required before a load balancer is marked as online. The value must be an integer. This property is required if the value of the `create-monitor` property is `True`.
5654

5755
+
5856
[IMPORTANT]

modules/nw-openstack-external-ccm.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ cloud = openstack
3636
...
3737
3838
[LoadBalancer]
39-
use-octavia = true
4039
enabled = true <1>
4140
----
4241
<1> If the network is configured to use Kuryr, this value is `false`.

0 commit comments

Comments
 (0)