openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Dan Sneddon 2015-05-26 12:17:52 -07:00
parent fb1e419214
commit 04a0133e55
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overcloud-resource-registry-puppet.yaml
View File

@ -66,3 +66,5 @@ parameter_defaults:
# Mapping of service_name -> network name.
ServiceNetMap:
NeutronLocalIp: tenant
CeilometerApiNetwork: internal_api
MongoDbNetwork: internal_api

4
puppet/controller-puppet.yaml
View File

@ -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}