From cd785ec68bf686075b472a07116a05d41315f76a Mon Sep 17 00:00:00 2001 From: Andrew Toth Date: Thu, 13 Jul 2017 14:17:37 -0400 Subject: [PATCH] Enable Neutron LBaaS Integration Allows the configuration of the Neutron LBaaS agent. Change-Id: I4c29ece765ec9147cef9b4d74d30e3c4483c48ab Implements: blueprint lbaasv2-service-integration (cherry picked from commit e1f7c0f30dc9710369bf915a40b657f81bcb348c) --- environments/services/neutron-lbaasv2.yaml | 5 +++-- .../enable-neutron-lbaas-integration-fa999ccd548ee6b6.yaml | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/enable-neutron-lbaas-integration-fa999ccd548ee6b6.yaml diff --git a/environments/services/neutron-lbaasv2.yaml b/environments/services/neutron-lbaasv2.yaml index 1466b01734..15e3a29082 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" NeutronLbaasOvsUseVeth: false 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 0000000000..7d6b1ecc04 --- /dev/null +++ b/releasenotes/notes/enable-neutron-lbaas-integration-fa999ccd548ee6b6.yaml @@ -0,0 +1,4 @@ +--- +features: + - Allows the configuration of the Neutron LBaaS + agent.