From d413eb63f3d317c56b24282223f12dfacc0f9ae3 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 2 Jun 2015 10:33:01 -0400 Subject: Wire ServiceNetMap as a top level parameter This patch makes ServiceNetMap a top level parameter. This is helpful to tools like Tuskar which don't support Heat environments that contain both a resource_registry and default_parameters. ServiceNetMap will in fact be utilized at the top level in some of the VIP related patches that follow. Change-Id: I375063dacf5f3fc68e6df93e11c3e88f48aa3c3a --- overcloud-resource-registry-puppet.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'overcloud-resource-registry-puppet.yaml') diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 42391762..e2a54088 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -63,27 +63,3 @@ resource_registry: parameter_defaults: EnablePackageInstall: false - # Mapping of service_name -> network name. - ServiceNetMap: - NeutronLocalIp: tenant - CeilometerApiNetwork: internal_api - MongoDbNetwork: internal_api - CinderApiNetwork: internal_api - CinderIscsiNetwork: storage - GlanceApiNetwork: storage - GlanceRegistryNetwork: internal_api - KeystoneAdminApiNetwork: internal_api - KeystonePublicApiNetwork: external - NeutronApiNetwork: internal_api - HeatApiNetwork: internal_api - HeatApiCfnNetwork: internal_api - HeatApiCloudwatchNetwork: internal_api - NovaApiNetwork: internal_api - NovaMetadataNetwork: internal_api - SwiftMgmtNetwork: storage_mgmt - SwiftProxyNetwork: storage - HorizonNetwork: external - MemcachedNetwork: internal_api - RabbitMqNetwork: internal_api - RedisNetwork: internal_api - MysqlNetwork: internal_api -- cgit 1.2.3-korg