diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-18 06:29:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-18 06:29:58 +0000 |
| commit | e57a7cdd733c5edd974749cd21e0563c8c6ca9fa (patch) | |
| tree | 5afada97f9e7c25b6e0750e306915615dba1eaf4 | |
| parent | 84b8bd269f63f4b3cf86f0e8981b61db72c3c0dd (diff) | |
| parent | e1f7c0f30dc9710369bf915a40b657f81bcb348c (diff) | |
Merge "Enable Neutron LBaaS Integration"
| -rw-r--r-- | environments/services/neutron-lbaasv2.yaml | 5 | ||||
| -rw-r--r-- | releasenotes/notes/enable-neutron-lbaas-integration-fa999ccd548ee6b6.yaml | 4 |
2 files changed, 7 insertions, 2 deletions
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. |