Merge "Allow disabling the octavia provider" into stable/train
This commit is contained in:
commit
e3261747fd
|
@ -86,17 +86,24 @@ parameters:
|
||||||
default: true
|
default: true
|
||||||
description: Configure the nova flavor for the amphora.
|
description: Configure the nova flavor for the amphora.
|
||||||
type: boolean
|
type: boolean
|
||||||
|
# We enable the driver agent and configure the OVN provider by default if OVN
|
||||||
|
# is enabled.
|
||||||
NeutronMechanismDrivers:
|
NeutronMechanismDrivers:
|
||||||
default: 'ovn'
|
default: 'ovn'
|
||||||
description: |
|
description: |
|
||||||
The mechanism drivers for the Neutron tenant network.
|
The mechanism drivers for the Neutron tenant network.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
|
OctaviaEnableDriverAgent:
|
||||||
|
default: true
|
||||||
|
description: Set to false if the driver agent needs to be disabled for some reason.
|
||||||
|
type: boolean
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
|
|
||||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
||||||
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
|
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
|
||||||
is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]}
|
is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]}
|
||||||
|
enable_driver_agent: {equals: [{get_param: OctaviaEnableDriverAgent}, true]}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
|
@ -192,11 +199,19 @@ outputs:
|
||||||
"%{hiera('$NETWORK')}"
|
"%{hiera('$NETWORK')}"
|
||||||
params:
|
params:
|
||||||
$NETWORK: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
|
$NETWORK: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
|
||||||
-
|
- octavia::api::provider_drivers:
|
||||||
if:
|
list_join:
|
||||||
- is_ovn_in_neutron_mechanism_driver
|
- ','
|
||||||
- octavia::api::provider_drivers: 'amphora: The Octavia Amphora driver.,octavia: Deprecated alias of the Octavia Amphora driver.,ovn: Octavia OVN driver.'
|
- list_concat:
|
||||||
- {}
|
- - 'amphora: The Octavia Amphora driver.'
|
||||||
|
- 'octavia: Deprecated alias of the Octavia Amphora driver.'
|
||||||
|
-
|
||||||
|
if:
|
||||||
|
- and:
|
||||||
|
- is_ovn_in_neutron_mechanism_driver
|
||||||
|
- enable_driver_agent
|
||||||
|
- ['ovn: Octavia OVN driver.']
|
||||||
|
- []
|
||||||
|
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
rsyslog:
|
rsyslog:
|
||||||
|
@ -324,7 +339,7 @@ outputs:
|
||||||
environment:
|
environment:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
- if:
|
- if:
|
||||||
- is_ovn_in_neutron_mechanism_driver
|
- enable_driver_agent
|
||||||
- octavia_driver_agent:
|
- octavia_driver_agent:
|
||||||
start_order: 2
|
start_order: 2
|
||||||
image: *octavia_api_image
|
image: *octavia_api_image
|
||||||
|
|
Loading…
Reference in New Issue