From c8d4429e9f0fdd0f5546f7f6f357d84cadbda62d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 30 Jun 2020 23:28:02 +0900
Subject: [PATCH] Remove usage of ineffective parameter in nova::api class

The nova::api::neutron_metadata_proxy_shared_secret parameter was
already removed from puppet-nova[1], so we should remove that parameter
from t-h-t as well.

[1] 66f2e8e509941391c172b56f5b9e4310e5fa72dd

Change-Id: I588c7c1cf44dc0c1794371d6ed4b0958071a8e2c
---
 deployment/nova/nova-api-container-puppet.yaml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index 46eb118cb9..be2ed9136e 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/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: