From dc63eb1fd73d13ea5caa41ab7e71dc2f63e490d8 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Sat, 4 Jun 2016 22:43:23 -0400
Subject: Remove unused Neutron parameters from roles

This patch removes a variety of unused Neutron parameters.
Most of these parameters stem from the old days of
tripleo-image-elements and are either no longer used
with or were never completely implemented to begin with.

Partially-implements: blueprint composable-services-within-roles

Change-Id: I478d282640affa89e38004e465458e79bd2d153b
---
 overcloud.yaml | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

(limited to 'overcloud.yaml')

diff --git a/overcloud.yaml b/overcloud.yaml
index 8bf59534..5ec67675 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -158,28 +158,6 @@ parameters:
     default: nic1
     description: What interface to bridge onto br-ex for network nodes.
     type: string
-  NeutronPublicInterfaceTag:
-    default: ''
-    description: >
-      VLAN tag for creating a public VLAN. The tag will be used to
-      create an access port on the exterior bridge for each control plane node,
-      and that port will be given the IP address returned by neutron from the
-      public network. Set CONTROLEXTRA=overcloud-vlan-port.yaml when compiling
-      overcloud.yaml to include the deployment of VLAN ports to the control
-      plane.
-    type: string
-  NeutronComputeAgentMode:
-    default: 'dvr'
-    description: Agent mode for the neutron-l3-agent on the compute hosts
-    type: string
-  NeutronAgentMode:
-    default: 'dvr_snat'
-    description: Agent mode for the neutron-l3-agent on the controller hosts
-    type: string
-  NeutronDVR:
-    default: 'False'
-    description: Whether to configure Neutron Distributed Virtual Routers
-    type: string
   NeutronMetadataProxySharedSecret:
     description: Shared secret to prevent spoofing
     type: string
@@ -459,18 +437,6 @@ parameters:
     description: Configures MySQL max_connections config setting
     type: number
     default: 4096
-  NeutronPublicInterfaceDefaultRoute:
-    default: ''
-    description: A custom default route for the NeutronPublicInterface.
-    type: string
-  NeutronPublicInterfaceIP:
-    default: ''
-    description: A custom IP address to put onto the NeutronPublicInterface.
-    type: string
-  NeutronPublicInterfaceRawDevice:
-    default: ''
-    description: If set, the public interface is a vlan with this device as the raw device.
-    type: string
   PublicVirtualInterface:
     default: 'br-ex'
     description: >
@@ -897,15 +863,10 @@ resources:
           MysqlInnodbBufferPoolSize: {get_param: MysqlInnodbBufferPoolSize}
           MysqlMaxConnections: {get_param: MysqlMaxConnections}
           MysqlRootPassword: {get_attr: [MysqlRootPassword, value]}
-          NeutronPublicInterfaceIP: {get_param: NeutronPublicInterfaceIP}
           NeutronTenantMtu: {get_param: NeutronTenantMtu}
           NeutronPublicInterface: {get_param: NeutronPublicInterface}
-          NeutronPublicInterfaceDefaultRoute: {get_param: NeutronPublicInterfaceDefaultRoute}
-          NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice}
           NeutronPassword: {get_param: NeutronPassword}
-          NeutronDVR: {get_param: NeutronDVR}
           NeutronMetadataProxySharedSecret: {get_param: NeutronMetadataProxySharedSecret}
-          NeutronAgentMode: {get_param: NeutronAgentMode}
           NeutronCorePlugin: {get_param: NeutronCorePlugin}
           NeutronServicePlugins: {get_param: NeutronServicePlugins}
           NovaIPv6: {get_param: NovaIPv6}
@@ -1000,10 +961,7 @@ resources:
           NeutronPassword: {get_param: NeutronPassword}
           NeutronPhysicalBridge: {get_param: HypervisorNeutronPhysicalBridge}
           NeutronPublicInterface: {get_param: HypervisorNeutronPublicInterface}
-          NeutronDVR: {get_param: NeutronDVR}
           NeutronMetadataProxySharedSecret: {get_param: NeutronMetadataProxySharedSecret}
-          NeutronAgentMode: {get_param: NeutronComputeAgentMode}
-          NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice}
           NeutronCorePlugin: {get_param: NeutronCorePlugin}
           NeutronServicePlugins: {get_param: NeutronServicePlugins}
           NeutronTypeDrivers: {get_param: NeutronTypeDrivers}
-- 
cgit 1.2.3-korg