From 65f25ea134491c5e268973fc9c02d9a7bf23cad0 Mon Sep 17 00:00:00 2001
From: sairamp <peesapatisairam@gmail.com>
Date: Thu, 9 Nov 2017 21:29:00 -0500
Subject: [PATCH] Allows Configuration of Additional of Lbaas and Neutron

Using this, users can assign already available parameters
such as ovs_use_veth in lbaas_agent.ini and
ovs_integration_bridge in neutron.conf

Depends-On: I023e0476e574d5a4c13d66da390aa13016566058
Change-Id: I899fe9217cccbbf80113c74a77cc70961fe40f42
Closes-Bug: 1752918
(cherry picked from commit bbf0e9b1a0cd7c3865e87e48f89a7a0e0def5251)
---
 environments/services/neutron-lbaasv2.yaml |  2 +-
 puppet/services/neutron-api.yaml           | 11 ++++++++++-
 puppet/services/neutron-lbaas.yaml         |  5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)

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 459a968ab9..389cbd2fb9 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:
 
@@ -202,6 +206,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 a2c1a2aee3..c7aa62e573 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: