Remove duplicate metadata keys from nova-api.yaml

These keys are already specified in nova-metadata.yaml
where they get set correctly per the network management
local IP (based on 'service_name' list).

Depends-On: I94f985e719a3bf7408655fbbb5ab1aeaf15e994e

Change-Id: I5d57561b732783118efd2a637aa137f5f7bcddbc
Partial-bug: #1631133

diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 5148849..e1e1856 100644 (file)
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -81,7 +81,6 @@ outputs:
           - get_attr: [NovaBase, role_data, config_settings]
           - get_attr: [ApacheServiceBase, role_data, config_settings]
           - nova::api::osapi_compute_workers: {get_param: NovaWorkers}
-            nova::api::metadata_workers: {get_param: NovaWorkers}
             nova::cron::archive_deleted_rows::hour: '"*/12"'
             nova::cron::archive_deleted_rows::destination: '"/dev/null"'
             tripleo.nova_api.firewall_rules:
@@ -118,7 +117,6 @@ outputs:
                   $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
             nova::wsgi::apache::workers: {get_param: NovaWorkers}
             nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]}
-            nova::api::metadata_listen: {get_param: [ServiceNetMap, NovaMetadataNetwork]}
             nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
             nova::api::instance_name_template: {get_param: InstanceNameTemplate}
             nova_enable_db_purge: {get_param: NovaEnableDBPurge}