summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-13 03:22:55 +0000
committerGerrit Code Review <review@openstack.org>2016-10-13 03:22:55 +0000
commit20eef1b501da3e14885ed801d740442ed9b381ab (patch)
tree463d93f084d4a313ffc9aac564c3db4fd626f4bf
parent75d90579973fabe8b773b4c4f4278dbf1d88a829 (diff)
parenta80d13b6e168c59d9860898063cf2c7067a65532 (diff)
Merge "Remove duplicate metadata keys from nova-api.yaml"
-rw-r--r--puppet/services/nova-api.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 51488491..e1e1856d 100644
--- 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}