aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-15 15:09:44 +0000
committerGerrit Code Review <review@openstack.org>2016-08-15 15:09:44 +0000
commit9a1590fc0622a6b565c06f98558dfff91d83fb9c (patch)
tree2fb15a24c3aa9f33a3c54f64d16b7d8f396d5384 /puppet
parent6e59141e64ce862c831cbf253f2e8eb81b491461 (diff)
parentac8d5919d86027aa9e0f523f77e3071b36b8a7d0 (diff)
Merge "Convert ServiceNetMap to a nested template"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index d13a6c6f..4591edf2 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -554,7 +554,7 @@ resources:
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]}]}
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]}]}
@@ -568,7 +568,7 @@ resources:
template: "['SUBNET']"
params:
SUBNET: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
- rabbitmq_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
+ rabbitmq_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitmqNetwork]}]}
redis_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
redis_vip: {get_param: RedisVirtualIP}
sahara_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SaharaApiNetwork]}]}