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
---
 puppet/compute.yaml | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'puppet/compute.yaml')

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index b7f7f4a5..d3b17784 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -144,12 +144,6 @@ parameters:
         of VXLAN VNI IDs that are available for tenant network allocation
     default: ["1:4094", ]
     type: comma_delimited_list
-  NeutronPublicInterfaceRawDevice:
-    default: ''
-    type: string
-  NeutronDVR:
-    default: 'False'
-    type: string
   NeutronMetadataProxySharedSecret:
     description: Shared secret to prevent spoofing
     type: string
@@ -191,10 +185,6 @@ parameters:
     default: 'False'
     description: Whether to enable l3-agent HA
     type: string
-  NeutronAgentMode:
-    default: 'dvr_snat'
-    description: Agent mode for the neutron-l3-agent on the controller hosts
-    type: string
   NodeIndex:
     type: number
     default: 0
@@ -582,14 +572,11 @@ resources:
                 nova::network::neutron::neutron_password: {get_input: neutron_password}
                 nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
                 nova::network::neutron::neutron_auth_url: {get_input: neutron_auth_url}
-                neutron_router_distributed: {get_input: neutron_router_distributed}
-                neutron_agent_mode: {get_input: neutron_agent_mode}
                 neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
                 neutron::core_plugin: {get_input: neutron_core_plugin}
                 neutron::service_plugins: {get_input: neutron_service_plugins}
                 neutron::plugins::ml2::type_drivers: {get_input: neutron_type_drivers}
                 neutron::plugins::ml2::mechanism_drivers: {get_input: neutron_mechanism_drivers}
-                neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
                 keystone_public_api_virtual_ip: {get_input: keystone_vip}
                 admin_password: {get_input: admin_password}
                 ntp::servers: {get_input: ntp_servers}
@@ -680,8 +667,6 @@ resources:
         neutron_physical_bridge: {get_param: NeutronPhysicalBridge}
         neutron_public_interface: {get_param: NeutronPublicInterface}
         neutron_password: {get_param: NeutronPassword}
-        neutron_agent_mode: {get_param: NeutronAgentMode}
-        neutron_router_distributed: {get_param: NeutronDVR}
         neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
         neutron_core_plugin: {get_param: NeutronCorePlugin}
         neutron_service_plugins:
@@ -704,7 +689,6 @@ resources:
             template: AGENT_EXTENSIONS
             params:
               AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
-        neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
         neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]}
         neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]}
         keystone_vip: {get_param: KeystonePublicApiVirtualIP}
-- 
cgit 1.2.3-korg