diff --git a/environments/services/neutron-lbaasv2.yaml b/environments/services/neutron-lbaasv2.yaml index ca42d20de7..ffd835ecd7 100644 --- a/environments/services/neutron-lbaasv2.yaml +++ b/environments/services/neutron-lbaasv2.yaml @@ -15,4 +15,4 @@ parameter_defaults: NeutronLbaasDeviceDriver: "neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver" NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default'] NeutronServicePlugins: "qos,router,trunk,lbaasv2" - + NeutronLbaasOvsUseVeth: false diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index f0e2d04f91..236a333b42 100644 --- a/puppet/services/neutron-api.yaml +++ b/puppet/services/neutron-api.yaml @@ -78,7 +78,10 @@ parameters: e.g. { neutron-context_is_admin: { key: context_is_admin, value: 'role:admin' } } default: {} type: json - + NeutronOvsIntegrationBridge: + default: '' + type: string + description: Name of Open vSwitch bridge to use # DEPRECATED: the following options are deprecated and are currently maintained # for backwards compatibility. They will be removed in the Ocata cycle. NeutronL3HA: @@ -105,6 +108,7 @@ parameter_groups: conditions: use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]} neutron_workers_unset: {equals : [{get_param: NeutronWorkers}, '']} + neutron_ovs_int_br_unset: {equals : [{get_param: NeutronOvsIntegrationBridge}, '']} resources: @@ -200,6 +204,11 @@ outputs: - {} - neutron::server::api_workers: {get_param: NeutronWorkers} neutron::server::rpc_workers: {get_param: NeutronWorkers} + - + if: + - neutron_ovs_int_br_unset + - {} + - neutron::server::ovs_integration_bridge: {get_param: NeutronOvsIntegrationBridge} step_config: | include tripleo::profile::base::neutron::server service_config_settings: diff --git a/puppet/services/neutron-lbaas.yaml b/puppet/services/neutron-lbaas.yaml index 4a51f52b3b..117d81c1f9 100644 --- a/puppet/services/neutron-lbaas.yaml +++ b/puppet/services/neutron-lbaas.yaml @@ -36,6 +36,10 @@ parameters: NeutronLbaasDeviceDriver: default: 'neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver' type: string + NeutronLbaasOvsUseVeth: + default: false + type: boolean + description: Uses veth for an interface or not NeutronServiceProviders: default: 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default' description: Global list of service providers used by neutron. This @@ -68,6 +72,7 @@ outputs: - get_attr: [NeutronBase, role_data, config_settings] - neutron::agents::lbaas::interface_driver: {get_param: NeutronLbaasInterfaceDriver} neutron::agents::lbaas::device_driver: {get_param: NeutronLbaasDeviceDriver} + neutron::agents::lbaas::ovs_use_veth: {get_param: NeutronLbaasOvsUseVeth} step_config: | include ::tripleo::profile::base::neutron::lbaas service_config_settings: