From 2998c2119171f92aad6f2768ee3ea526f1527128 Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Tue, 14 Aug 2018 13:05:30 -0230
Subject: [PATCH] Remove NeutronServicePlugins from octavia environment files

There are no additional octavia specific neutron service plugins for
octavia required so this parameter should be removed from the
environment files.

Change-Id: I3da329db28701c7e9798083982953c5c9c861c50
---
 environments/services-baremetal/octavia.yaml | 1 -
 environments/services/octavia.yaml           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/environments/services-baremetal/octavia.yaml b/environments/services-baremetal/octavia.yaml
index 46c2944e56..b592bf8e43 100644
--- a/environments/services-baremetal/octavia.yaml
+++ b/environments/services-baremetal/octavia.yaml
@@ -6,7 +6,6 @@ resource_registry:
   OS::TripleO::Services::OctaviaDeploymentConfig: ../../puppet/services/octavia/octavia-deployment-config.yaml
 
 parameter_defaults:
-    NeutronServicePlugins: "qos,router,trunk"
     NeutronEnableForceMetadata: true
 
     # This flag enables internal generation of certificates for communication
diff --git a/environments/services/octavia.yaml b/environments/services/octavia.yaml
index fb4ad60ab4..96372dd90d 100644
--- a/environments/services/octavia.yaml
+++ b/environments/services/octavia.yaml
@@ -6,7 +6,6 @@ resource_registry:
   OS::TripleO::Services::OctaviaDeploymentConfig: ../../docker/services/octavia/octavia-deployment-config.yaml
 
 parameter_defaults:
-    NeutronServicePlugins: "qos,router,trunk"
     NeutronEnableForceMetadata: true
 
     # This flag enables internal generation of certificates for communication