Merge "Remove usage of ineffective parameter in nova::api class"

deployment/nova/nova-api-container-puppet.yaml

@@ -70,10 +70,6 @@ parameters:
     type: string
     default: 'regionOne'
     description: Keystone region for endpoint
-  NeutronMetadataProxySharedSecret:
-    description: Shared secret to prevent spoofing
-    type: string
-    hidden: true
   InstanceNameTemplate:
     default: 'instance-%08x'
     description: Template string to be used to generate instance names
@@ -122,7 +118,6 @@ conditions:
     - {equals: [{get_param: EnableInternalTLS}, false]}
 
   nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
-  is_neutron_shared_metadata_notempty: {not: {equals: [{get_param: NeutronMetadataProxySharedSecret}, '']}}
 
 
 resources:
@@ -233,11 +228,6 @@ outputs:
             - {}
             - nova::api::osapi_compute_workers: {get_param: NovaWorkers}
               nova::wsgi::apache_api::workers: {get_param: NovaWorkers}
-          -
-            if:
-            - is_neutron_shared_metadata_notempty
-            - nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
-            - {}
 
       service_config_settings:
         rsyslog: