Enable dns_domain_ports extension by default
'dns_domain_ports' extension allows dns_domain to be set for ports and ML2 OVN supports it since wallaby[1] and ML2 OVS long before that. This patch replaces 'dns' with 'dns_domain_ports' for NeutronPluginExtensions in ml2 plugin heat template and all environment files. 'dns' extension not equired to be enabled explicitly with 'dns_domain_ports' as it inherits all the capabilities of 'dns' extension. [1] https://review.opendev.org/q/Ic269902ef7a16893c4ea624b04347d04db4f52d9 Related-Bug: #1990480 Change-Id: I25f75d7bd8864ea132246cea79e073232d664d76
This commit is contained in:
parent
09e8ccac77
commit
7efe0063b9
|
@ -24,7 +24,7 @@ parameter_defaults:
|
||||||
KeystoneTokenProvider: 'fernet'
|
KeystoneTokenProvider: 'fernet'
|
||||||
SwiftCeilometerPipelineEnabled: false
|
SwiftCeilometerPipelineEnabled: false
|
||||||
NotificationDriver: 'noop'
|
NotificationDriver: 'noop'
|
||||||
NeutronPluginExtensions: qos,port_security,dns
|
NeutronPluginExtensions: qos,port_security,dns_domain_ports
|
||||||
RpcPort: 31459
|
RpcPort: 31459
|
||||||
NotifyPort: 5672
|
NotifyPort: 5672
|
||||||
ContainerCli: podman
|
ContainerCli: podman
|
||||||
|
|
|
@ -42,7 +42,7 @@ parameters:
|
||||||
default: 'datacentre'
|
default: 'datacentre'
|
||||||
description: If set, flat networks to configure in neutron plugins.
|
description: If set, flat networks to configure in neutron plugins.
|
||||||
NeutronPluginExtensions:
|
NeutronPluginExtensions:
|
||||||
default: "qos,port_security,dns"
|
default: "qos,port_security,dns_domain_ports"
|
||||||
description: |
|
description: |
|
||||||
Comma-separated list of extensions enabled for the Neutron plugin.
|
Comma-separated list of extensions enabled for the Neutron plugin.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
|
|
|
@ -11,7 +11,7 @@ parameter_defaults:
|
||||||
|
|
||||||
# Comma-separated list of extensions enabled for the Neutron plugin.
|
# Comma-separated list of extensions enabled for the Neutron plugin.
|
||||||
# Type: comma_delimited_list
|
# Type: comma_delimited_list
|
||||||
NeutronPluginExtensions: qos,port_security,dns
|
NeutronPluginExtensions: qos,port_security,dns_domain_ports
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::DesignateApi: ../deployment/designate/designate-api-container-puppet.yaml
|
OS::TripleO::Services::DesignateApi: ../deployment/designate/designate-api-container-puppet.yaml
|
||||||
|
|
|
@ -21,7 +21,7 @@ parameter_defaults:
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
NeutronEnableDVR: true
|
NeutronEnableDVR: true
|
||||||
NeutronPluginExtensions: "qos,port_security,dns"
|
NeutronPluginExtensions: "qos,port_security,dns_domain_ports"
|
||||||
ControllerParameters:
|
ControllerParameters:
|
||||||
OVNCMSOptions: "enable-chassis-as-gw"
|
OVNCMSOptions: "enable-chassis-as-gw"
|
||||||
ControllerSriovParameters:
|
ControllerSriovParameters:
|
||||||
|
|
|
@ -20,7 +20,7 @@ parameter_defaults:
|
||||||
NeutronNetworkType: 'geneve'
|
NeutronNetworkType: 'geneve'
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
NeutronPluginExtensions: "qos,port_security,dns"
|
NeutronPluginExtensions: "qos,port_security,dns_domain_ports"
|
||||||
ComputeParameters:
|
ComputeParameters:
|
||||||
NeutronBridgeMappings: ""
|
NeutronBridgeMappings: ""
|
||||||
ControllerParameters:
|
ControllerParameters:
|
||||||
|
|
|
@ -7,7 +7,7 @@ parameter_defaults:
|
||||||
|
|
||||||
# Comma-separated list of extensions enabled for the Neutron plugin.
|
# Comma-separated list of extensions enabled for the Neutron plugin.
|
||||||
# Type: comma_delimited_list
|
# Type: comma_delimited_list
|
||||||
NeutronPluginExtensions: qos,port_security,dns
|
NeutronPluginExtensions: qos,port_security,dns_domain_ports
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml
|
OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml
|
||||||
|
|
|
@ -23,7 +23,7 @@ parameter_defaults:
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
NeutronRpcWorkers: 1
|
NeutronRpcWorkers: 1
|
||||||
NeutronEnableDVR: true
|
NeutronEnableDVR: true
|
||||||
NeutronPluginExtensions: "qos,port_security,dns"
|
NeutronPluginExtensions: "qos,port_security,dns_domain_ports"
|
||||||
ControllerParameters:
|
ControllerParameters:
|
||||||
OVNCMSOptions: "enable-chassis-as-gw"
|
OVNCMSOptions: "enable-chassis-as-gw"
|
||||||
OVNDnsServers: []
|
OVNDnsServers: []
|
||||||
|
|
|
@ -20,7 +20,7 @@ parameter_defaults:
|
||||||
NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
|
NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
NeutronPluginExtensions: "qos,port_security,dns"
|
NeutronPluginExtensions: "qos,port_security,dns_domain_ports"
|
||||||
NeutronRpcWorkers: 1
|
NeutronRpcWorkers: 1
|
||||||
ComputeParameters:
|
ComputeParameters:
|
||||||
NeutronBridgeMappings: ""
|
NeutronBridgeMappings: ""
|
||||||
|
|
|
@ -23,7 +23,7 @@ parameter_defaults:
|
||||||
NeutronVniRanges: ['1:65536', ]
|
NeutronVniRanges: ['1:65536', ]
|
||||||
NeutronRpcWorkers: 1
|
NeutronRpcWorkers: 1
|
||||||
NeutronEnableDVR: true
|
NeutronEnableDVR: true
|
||||||
NeutronPluginExtensions: "qos,port_security,dns"
|
NeutronPluginExtensions: "qos,port_security,dns_domain_ports"
|
||||||
ControllerParameters:
|
ControllerParameters:
|
||||||
OVNCMSOptions: "enable-chassis-as-gw"
|
OVNCMSOptions: "enable-chassis-as-gw"
|
||||||
ControllerSriovParameters:
|
ControllerSriovParameters:
|
||||||
|
|
|
@ -26,6 +26,6 @@ parameter_defaults:
|
||||||
DhcpAgentNotification: false
|
DhcpAgentNotification: false
|
||||||
NeutronServicePlugins: 'ovn-router,segments'
|
NeutronServicePlugins: 'ovn-router,segments'
|
||||||
NeutronMechanismDrivers: ['ovn', 'baremetal']
|
NeutronMechanismDrivers: ['ovn', 'baremetal']
|
||||||
NeutronPluginExtensions: "port_security,dns"
|
NeutronPluginExtensions: "port_security,dns_domain_ports"
|
||||||
NeutronNetworkType: ['geneve', 'vxlan', 'vlan', 'flat']
|
NeutronNetworkType: ['geneve', 'vxlan', 'vlan', 'flat']
|
||||||
NeutronTypeDrivers: ['geneve', 'vxlan', 'vlan', 'flat']
|
NeutronTypeDrivers: ['geneve', 'vxlan', 'vlan', 'flat']
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
'dns_domain_ports' extension driver is now enabled by
|
||||||
|
default and this allows 'dns_domain' to be set for ports.
|
Loading…
Reference in New Issue