From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 15 Aug 2016 15:09:44 +0000 (+0000)
Subject: Merge "Convert ServiceNetMap to a nested template"
X-Git-Tag: opnfv-6.0.0~1763
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9a1590fc0622a6b565c06f98558dfff91d83fb9c;p=apex-tripleo-heat-templates.git

Merge "Convert ServiceNetMap to a nested template"
---

9a1590fc0622a6b565c06f98558dfff91d83fb9c
diff --cc puppet/controller.yaml
index d13a6c6f,59256e9f..4591edf2
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -553,8 -557,9 +553,8 @@@ resources
          heat_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
          keystone_public_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
          keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
 -        keystone_region: {get_param: KeystoneRegion}
          manila_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ManilaApiNetwork]}]}
-         mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
+         mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongodbNetwork]}]}
          neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
          neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
          ceilometer_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}