diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-10-05 15:53:16 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-10-05 16:59:13 +0100 |
| commit | eaa385f3b0460497d04845a71ad0a16be4c435fe (patch) | |
| tree | 225c03e153a2bd383dbee1011eb629a0e74b91f8 /network | |
| parent | ef8bf6379e94ce24cfdb69d51f61bf808b555600 (diff) | |
Fix OpendaylightApiNetwork key naming
This captialization won't work with the CamelCase to snake_case
conversion we do, as the required name is opendaylight_api_network
Adds some clarification to the ServiceNetMap description to hopefully
avoid future confusion.
Change-Id: Ife04ee2185e81009ebef55ad521aef799251e002
Closes-Bug: #1629408
Diffstat (limited to 'network')
| -rw-r--r-- | network/service_net_map.j2.yaml | 10 |
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 |