From: Andrew Toth <atoth@redhat.com>
Date: Thu, 13 Jul 2017 18:17:37 +0000 (-0400)
Subject: Enable Neutron LBaaS Integration
X-Git-Tag: opnfv-6.0.0~388^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e1f7c0f30dc9710369bf915a40b657f81bcb348c;p=apex-tripleo-heat-templates.git

Enable Neutron LBaaS Integration

Allows the configuration of the Neutron LBaaS agent.

Change-Id: I4c29ece765ec9147cef9b4d74d30e3c4483c48ab
Implements: blueprint lbaasv2-service-integration
---

diff --git a/environments/services/neutron-lbaasv2.yaml b/environments/services/neutron-lbaasv2.yaml
index 9dee74ea..385bb2fe 100644
--- a/environments/services/neutron-lbaasv2.yaml
+++ b/environments/services/neutron-lbaasv2.yaml
@@ -8,10 +8,11 @@
 # - OVS: neutron.agent.linux.interface.OVSInterfaceDriver
 # - LinuxBridges: neutron.agent.linux.interface.BridgeInterfaceDriver
 resource_registry:
-  OS::TripleO::Services::NeutronLbaas: ../puppet/services/neutron-lbaas.yaml
+  OS::TripleO::Services::NeutronLbaasv2Agent: ../puppet/services/neutron-lbaas.yaml
 
 parameter_defaults:
   NeutronLbaasInterfaceDriver: "neutron.agent.linux.interface.OVSInterfaceDriver"
-  NeutronLbaasDeviceDriver: "neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver"
+  NeutronLbaasDeviceDriver: "neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver"
   NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default']
+  NeutronServicePlugins: "qos,router,trunk,lbaasv2"
 
diff --git a/releasenotes/notes/enable-neutron-lbaas-integration-fa999ccd548ee6b6.yaml b/releasenotes/notes/enable-neutron-lbaas-integration-fa999ccd548ee6b6.yaml
new file mode 100644
index 00000000..7d6b1ecc
--- /dev/null
+++ b/releasenotes/notes/enable-neutron-lbaas-integration-fa999ccd548ee6b6.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Allows the configuration of the Neutron LBaaS
+    agent.