openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Map Horizon, Redis, Rabbit, memcached to isolated nets"

This commit is contained in:
Jenkins 2015-05-27 20:01:59 +00:00 committed by Gerrit Code Review
parent a58431e4c7 2dfa94657e
commit a2e6eb9f06
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,3 +82,7 @@ parameter_defaults:
NovaMetadataNetwork: internal_api
SwiftMgmtNetwork: storage_mgmt
SwiftProxyNetwork: storage
HorizonNetwork: external
MemcachedNetwork: internal_api
RabbitMqNetwork: internal_api
RedisNetwork: internal_api

8
puppet/controller-puppet.yaml
View File

@ -894,16 +894,16 @@ resources:
# Horizon
horizon::django_debug: {get_input: debug}
horizon::secret_key: {get_input: horizon_secret}
horizon::bind_address: {get_input: controller_host}
horizon::bind_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
horizon::keystone_url: {get_input: keystone_auth_uri}
# Rabbit
rabbitmq::node_ip_address: {get_input: controller_host}
rabbitmq::node_ip_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
# Redis
redis::bind: {get_input: controller_host}
redis::bind: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
# Misc
memcached::listen_ip: {get_input: controller_host}
memcached::listen_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
neutron_public_interface_ip: {get_input: neutron_public_interface_ip}
ntp::servers: {get_input: ntp_servers}
control_virtual_interface: {get_input: control_virtual_interface}