summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-27 08:42:36 +0000
committerGerrit Code Review <review@openstack.org>2015-05-27 08:42:36 +0000
commitb47fb9be0658933c7e1764902389a88f247421af (patch)
tree9b25d6daa3f0f1084ace98f1d6835a637a793ec0 /puppet
parent00eb3b3089de1b5b61261f018068fd5daeb631e0 (diff)
parent04a0133e559edbe283370804313822b205df1d94 (diff)
Merge "Map Ceilometer services to isolated networks"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller-puppet.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 3e522df9..0e5ab116 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -802,7 +802,7 @@ resources:
keystone::admin_bind_host: {get_input: controller_host}
keystone::debug: {get_input: debug}
# MongoDB
- mongodb::server::bind_ip: {get_input: controller_host}
+ mongodb::server::bind_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
# MySQL
admin_password: {get_input: admin_password}
enable_galera: {get_input: enable_galera}
@@ -854,7 +854,7 @@ resources:
ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
ceilometer::rabbit_port: {get_input: rabbit_client_port}
ceilometer::debug: {get_input: debug}
- ceilometer::api::host: {get_input: controller_host}
+ ceilometer::api::host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
ceilometer::api::keystone_password: {get_input: ceilometer_password}
ceilometer::api::keystone_auth_uri: {get_input: keystone_auth_uri}
ceilometer::api::keystone_identity_uri: {get_input: keystone_identity_uri}