Merge "Add OVNAvailabilityZone to improve UX" into stable/train
This commit is contained in:
commit
f65a506b08
|
@ -80,6 +80,13 @@ parameters:
|
||||||
description: Whether Metadata Service has to be enabled
|
description: Whether Metadata Service has to be enabled
|
||||||
type: boolean
|
type: boolean
|
||||||
default: true
|
default: true
|
||||||
|
OVNAvailabilityZone:
|
||||||
|
description: The az options to configure in ovs db.
|
||||||
|
eg. ['az-0', 'az-1', 'az-2']
|
||||||
|
type: comma_delimited_list
|
||||||
|
default: []
|
||||||
|
tags:
|
||||||
|
- role_specific
|
||||||
OVNCMSOptions:
|
OVNCMSOptions:
|
||||||
description: The CMS options to configure in ovs db
|
description: The CMS options to configure in ovs db
|
||||||
type: string
|
type: string
|
||||||
|
@ -134,6 +141,8 @@ conditions:
|
||||||
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
|
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
|
||||||
key_size_override_unset: {equals: [{get_param: ContainerOvnCertificateKeySize}, '']}
|
key_size_override_unset: {equals: [{get_param: ContainerOvnCertificateKeySize}, '']}
|
||||||
enable_vlan_transparency: {equals: [{get_param: EnableVLANTransparency}, true]}
|
enable_vlan_transparency: {equals: [{get_param: EnableVLANTransparency}, true]}
|
||||||
|
az_ovn_unset: {equals: [{get_param: OVNAvailabilityZone}, []]}
|
||||||
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
|
@ -150,8 +159,16 @@ resources:
|
||||||
map_replace:
|
map_replace:
|
||||||
- map_replace:
|
- map_replace:
|
||||||
- ovn::controller::ovn_bridge_mappings: NeutronBridgeMappings
|
- ovn::controller::ovn_bridge_mappings: NeutronBridgeMappings
|
||||||
ovn::controller::ovn_cms_options: OVNCMSOptions
|
|
||||||
ovn::controller::enable_hw_offload: OvsHwOffload
|
ovn::controller::enable_hw_offload: OvsHwOffload
|
||||||
|
ovn::controller::ovn_cms_options:
|
||||||
|
if:
|
||||||
|
- az_ovn_unset
|
||||||
|
- OVNCMSOptions
|
||||||
|
- list_join:
|
||||||
|
- ''
|
||||||
|
- - OVNCMSOptions
|
||||||
|
- ",availability-zones="
|
||||||
|
- {get_param: OVNAvailabilityZone}
|
||||||
- values: {get_param: [RoleParameters]}
|
- values: {get_param: [RoleParameters]}
|
||||||
- values:
|
- values:
|
||||||
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
|
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Added new heat role specific param OVNAvailabilityZone to set availability-zones
|
||||||
|
for ovn. This param replace seting availability-zones throught OVNCMSOptions
|
Loading…
Reference in New Issue