Pass cinder_iscsi_address without brackets

[apex-tripleo-heat-templates.git] / network / service_net_map.yaml

diff --git a/network/service_net_map.yaml b/network/service_net_map.yaml
index fea8987..4cfff40 100644 (file)
--- a/network/service_net_map.yaml
+++ b/network/service_net_map.yaml
@@ -13,6 +13,7 @@ parameters:
 
   ServiceNetMapDefaults:
     default:
+      ApacheNetwork: internal_api
       NeutronTenantNetwork: tenant
       CeilometerApiNetwork: internal_api
       AodhApiNetwork: internal_api
@@ -22,7 +23,8 @@ parameters:
       CinderIscsiNetwork: storage
       GlanceApiNetwork: storage
       GlanceRegistryNetwork: internal_api
-      IronicApiNetwork: internal_api
+      IronicApiNetwork: ctlplane
+      IronicNetwork: ctlplane
       KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints
       KeystonePublicApiNetwork: internal_api
       ManilaApiNetwork: internal_api
@@ -40,13 +42,14 @@ parameters:
       RedisNetwork: internal_api
       MysqlNetwork: internal_api
       CephClusterNetwork: storage_mgmt
-      CephPublicNetwork: storage
+      CephMonNetwork: storage
       ControllerHostnameResolveNetwork: internal_api
       ComputeHostnameResolveNetwork: internal_api
       BlockStorageHostnameResolveNetwork: internal_api
       ObjectStorageHostnameResolveNetwork: internal_api
       CephStorageHostnameResolveNetwork: storage
       PublicNetwork: external
+      OpenDaylightApiNetwork: internal_api
     description: Mapping of service_name -> network name. Typically set
                  via parameter_defaults in the resource registry.
     type: json
@@ -57,6 +60,7 @@ parameters:
     default:
       MongoDbNetwork: MongodbNetwork
       RabbitMqNetwork: RabbitmqNetwork
+      CephPublicNetwork: CephMonNetwork
     description: Mapping older deprecated service names, intended for
                  internal use only, this will be removed in future.
     type: json