aboutsummaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-06 09:26:29 +0000
committerGerrit Code Review <review@openstack.org>2016-10-06 09:26:29 +0000
commit54a297fdc9e5258c65e05375ac72fb149a8586e9 (patch)
treedcb844e668a8592afd9f17fb4876699812dfc8f2 /network
parentc3611e0f701a2b104d52125861b27da44a6c7763 (diff)
parenteaa385f3b0460497d04845a71ad0a16be4c435fe (diff)
Merge "Fix OpendaylightApiNetwork key naming"
Diffstat (limited to 'network')
-rw-r--r--network/service_net_map.j2.yaml10
1 files changed, 9 insertions, 1 deletions
diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index 2f78133b..c4d86fb9 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -8,9 +8,17 @@ parameters:
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
+ Note that the key in this map must match the service_name
+ in the service template, e.g if the service_name is heat_api
+ the key must be either heat_api_network, or optionally
+ HeatApiNetwork (which will be internally converted to
+ transform captalization to underscores).
default: {}
type: json
+ # Note that the key in this map must match the service_name
+ # see the description above about conversion from CamelCase to
+ # snake_case - the names must still match when converted
ServiceNetMapDefaults:
default:
ApacheNetwork: internal_api
@@ -47,7 +55,7 @@ parameters:
CephMonNetwork: storage
CephRgwNetwork: storage
PublicNetwork: external
- OpenDaylightApiNetwork: internal_api
+ 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