Merge "Make ServiceNetMap support custom network names"

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

diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index 8ed44ec..36342cb 100644 (file)
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -45,6 +45,7 @@ parameters:
       HeatApiCfnNetwork: internal_api
       HeatApiCloudwatchNetwork: internal_api
       NovaApiNetwork: internal_api
+      NovaPlacementNetwork: internal_api
       NovaMetadataNetwork: internal_api
       NovaVncProxyNetwork: internal_api
       SwiftStorageNetwork: storage_mgmt
@@ -66,6 +67,7 @@ parameters:
       # We special-case the default ResolveNetwork for the CephStorage role
       # for backwards compatibility, all other roles default to internal_api
       CephStorageHostnameResolveNetwork: storage
+      EtcdNetwork: internal_api
 {% for role in roles if role.name != 'CephStorage' %}
       {{role.name}}HostnameResolveNetwork: internal_api
 {% endfor %}