summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-10-04 15:52:19 +0100
committerSteven Hardy <shardy@redhat.com>2016-10-05 08:54:08 +0100
commitff86a856a61ef2d177e05cb5a26d87f7d5741c78 (patch)
treeeafa29b7ad860255e7748b22e2f971d509c8d1e1
parent0e842bb82cbff42b9f3c8cefbeb152a5d15f29de (diff)
j2 template per-role ServiceNetMapDefaults
The *HostnameResolveNetwork should default to a sane value for all roles, including those specified by the user. We choose internal_api by default (maintaining the existing special-case for the CephStorage role which uses the storage network), but users can of course override the default with a network of their choice. Change-Id: Ib240f56c1db5842b953fa510316e75fd53f24735 Closes-Bug: #1629827
-rw-r--r--network/service_net_map.j2.yaml (renamed from network/service_net_map.yaml)11
1 files changed, 6 insertions, 5 deletions
diff --git a/network/service_net_map.yaml b/network/service_net_map.j2.yaml
index 6e5c2449..2f78133b 100644
--- a/network/service_net_map.yaml
+++ b/network/service_net_map.j2.yaml
@@ -46,13 +46,14 @@ parameters:
CephClusterNetwork: storage_mgmt
CephMonNetwork: storage
CephRgwNetwork: storage
- ControllerHostnameResolveNetwork: internal_api
- ComputeHostnameResolveNetwork: internal_api
- BlockStorageHostnameResolveNetwork: internal_api
- ObjectStorageHostnameResolveNetwork: internal_api
- CephStorageHostnameResolveNetwork: storage
PublicNetwork: external
OpenDaylightApiNetwork: internal_api
+ # We special-case the default ResolveNetwork for the CephStorage role
+ # for backwards compatibility, all other roles default to internal_api
+ CephStorageHostnameResolveNetwork: storage
+{% for role in roles if role.name != 'CephStorage' %}
+ {{role.name}}HostnameResolveNetwork: internal_api
+{% endfor %}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry.
type: json