Merge "Exposing NeutronDhcpOvsIntegrationBridge" into stable/queens
This commit is contained in:
commit
9b421089bf
|
@ -77,10 +77,15 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
description: Specifies the default CA cert to use if TLS is used for
|
description: Specifies the default CA cert to use if TLS is used for
|
||||||
services in the internal network.
|
services in the internal network.
|
||||||
|
NeutronDhcpOvsIntegrationBridge:
|
||||||
|
default: ''
|
||||||
|
type: string
|
||||||
|
description: Name of Open vSwitch bridge to use
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
service_debug_unset: {equals: [{get_param: NeutronDhcpAgentDebug}, '']}
|
service_debug_unset: {equals: [{get_param: NeutronDhcpAgentDebug}, '']}
|
||||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
||||||
|
dhcp_ovs_intergation_bridge_unset: {equals: [{get_param: NeutronDhcpOvsIntegrationBridge}, '']}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
|
@ -127,6 +132,10 @@ outputs:
|
||||||
neutron::agents::dhcp::ovsdb_agent_ssl_cert_file: '/etc/pki/tls/certs/neutron.crt'
|
neutron::agents::dhcp::ovsdb_agent_ssl_cert_file: '/etc/pki/tls/certs/neutron.crt'
|
||||||
neutron::agents::dhcp::ovsdb_agent_ssl_ca_file: {get_param: InternalTLSCAFile}
|
neutron::agents::dhcp::ovsdb_agent_ssl_ca_file: {get_param: InternalTLSCAFile}
|
||||||
- {}
|
- {}
|
||||||
|
- if:
|
||||||
|
- dhcp_ovs_intergation_bridge_unset
|
||||||
|
- {}
|
||||||
|
- neutron::agents::dhcp::ovs_integration_bridge: {get_param: NeutronDhcpOvsIntegrationBridge}
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
fluentd:
|
fluentd:
|
||||||
tripleo_fluentd_groups_neutron_dhcp:
|
tripleo_fluentd_groups_neutron_dhcp:
|
||||||
|
|
Loading…
Reference in New Issue