From df42eb1057219aba86076adc8fa8f5f5daa8b246 Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Wed, 6 Dec 2017 11:29:14 -0330 Subject: [PATCH] Remove Octavia LBaaS service plugin from neutron config Neutron no longer accesses Octavia using a service plugin so this configuration can be removed. Change-Id: I39db11a74a48afc99e716a31ad564c055d7f67d0 --- environments/services-docker/octavia.yaml | 2 +- environments/services/octavia.yaml | 2 +- puppet/services/octavia-api.yaml | 2 -- ...a-service-plugin-from-neutron-config-b923cca547d9dd52.yaml | 4 ++++ 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/remove-octavia-service-plugin-from-neutron-config-b923cca547d9dd52.yaml diff --git a/environments/services-docker/octavia.yaml b/environments/services-docker/octavia.yaml index 3af17478b8..35e9ef285f 100644 --- a/environments/services-docker/octavia.yaml +++ b/environments/services-docker/octavia.yaml @@ -5,7 +5,7 @@ resource_registry: OS::TripleO::Services::OctaviaWorker: ../../docker/services/octavia-worker.yaml parameter_defaults: - NeutronServicePlugins: "qos,router,trunk,lbaasv2" + NeutronServicePlugins: "qos,router,trunk" NeutronEnableForceMetadata: true OctaviaCaCertFile: '/etc/octavia/certs/ca_01.pem' OctaviaCaKeyFile: '/etc/octavia/certs/private/cakey.pem' diff --git a/environments/services/octavia.yaml b/environments/services/octavia.yaml index 24c57b8c3c..720154acad 100644 --- a/environments/services/octavia.yaml +++ b/environments/services/octavia.yaml @@ -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 diff --git a/puppet/services/octavia-api.yaml b/puppet/services/octavia-api.yaml index 0a5b1206d7..ad59566e20 100644 --- a/puppet/services/octavia-api.yaml +++ b/puppet/services/octavia-api.yaml @@ -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'] diff --git a/releasenotes/notes/remove-octavia-service-plugin-from-neutron-config-b923cca547d9dd52.yaml b/releasenotes/notes/remove-octavia-service-plugin-from-neutron-config-b923cca547d9dd52.yaml new file mode 100644 index 0000000000..cec69adfcb --- /dev/null +++ b/releasenotes/notes/remove-octavia-service-plugin-from-neutron-config-b923cca547d9dd52.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Neutron no longer accesses octavia through a neutron service plugin.