summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Sneddon <dsneddon@redhat.com>2015-05-26 12:17:52 -0700
committerDan Sneddon <dsneddon@redhat.com>2015-05-26 12:17:52 -0700
commit04a0133e559edbe283370804313822b205df1d94 (patch)
tree921508888f0f06b2b0a5a91d2d9efceb2a0814be
parentfb1e41921400e7d47f802bea68c813ce0c52e507 (diff)
Map Ceilometer services to isolated networks
This change adds the parameters to specify which networks the Ceilometer and MongoDB servers listen on. It is set to the internal_api network if present, and reverts to the default Undercloud 'ctlplane' network if not. Change-Id: Ib646e4a34496966f9b1d454f04d07bf95543517f
-rw-r--r--overcloud-resource-registry-puppet.yaml2
-rw-r--r--puppet/controller-puppet.yaml4
2 files changed, 4 insertions, 2 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 7b35c2fd..9c5ed1bc 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -66,3 +66,5 @@ parameter_defaults:
# Mapping of service_name -> network name.
ServiceNetMap:
NeutronLocalIp: tenant
+ CeilometerApiNetwork: internal_api
+ MongoDbNetwork: internal_api
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}