diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml index 7f2e28e015..91b049529a 100644 --- a/puppet/services/neutron-dhcp.yaml +++ b/puppet/services/neutron-dhcp.yaml @@ -77,10 +77,15 @@ parameters: type: string description: Specifies the default CA cert to use if TLS is used for services in the internal network. + NeutronDhcpOvsIntegrationBridge: + default: '' + type: string + description: Name of Open vSwitch bridge to use conditions: service_debug_unset: {equals: [{get_param: NeutronDhcpAgentDebug}, '']} internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} + dhcp_ovs_intergation_bridge_unset: {equals: [{get_param: NeutronDhcpOvsIntegrationBridge}, '']} 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_ca_file: {get_param: InternalTLSCAFile} - {} + - if: + - dhcp_ovs_intergation_bridge_unset + - {} + - neutron::agents::dhcp::ovs_integration_bridge: {get_param: NeutronDhcpOvsIntegrationBridge} service_config_settings: fluentd: tripleo_fluentd_groups_neutron_dhcp: