Merge "Combine Heat API networks into single net"

[apex-tripleo-heat-templates.git] / overcloud-resource-registry-puppet.yaml

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 9fd6453..f2f1eee 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -34,6 +34,7 @@ resource_registry:
   OS::TripleO::Network::Tenant: network/noop.yaml
 
   OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml
+  OS::TripleO::Network::Ports::NetIpListMap: network/ports/net_ip_list_map.yaml
 
   # Port assignments for the controller role
   OS::TripleO::Controller::Ports::ExternalPort: network/ports/noop.yaml
@@ -63,26 +64,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