Merge "Remove Octavia LBaaS service plugin from neutron config"

This commit is contained in:
Zuul 2018-02-05 04:23:28 +00:00 committed by Gerrit Code Review
commit 23922cee4e
4 changed files with 6 additions and 4 deletions

View File

@ -6,7 +6,7 @@ resource_registry:
OS::TripleO::Services::OctaviaDeploymentConfig: ../../docker/services/octavia/octavia-deployment-config.yaml
parameter_defaults:
NeutronServicePlugins: "qos,router,trunk,lbaasv2"
NeutronServicePlugins: "qos,router,trunk"
NeutronEnableForceMetadata: true
# This flag enables internal generation of certificates for communication

View File

@ -5,5 +5,5 @@ resource_registry:
OS::TripleO::Services::OctaviaWorker: ../../puppet/services/octavia-worker.yaml
parameter_defaults:
NeutronServicePlugins: "qos,router,trunk,lbaasv2"
NeutronServicePlugins: "qos,router,trunk"
NeutronEnableForceMetadata: true

View File

@ -117,5 +117,3 @@ outputs:
octavia::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
neutron_api:
neutron::server::service_providers: ['LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default']

View File

@ -0,0 +1,4 @@
---
features:
- |
Neutron no longer accesses octavia through a neutron service plugin.