summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-27 20:01:59 +0000
committerGerrit Code Review <review@openstack.org>2015-05-27 20:01:59 +0000
commita2e6eb9f06c03f1150bfe9cfbb978cca60b75c5c (patch)
tree54e823f1714363d2da8c98765fda264235feeba0 /puppet
parenta58431e4c7a94ae9fa9320e628fbf8aff882b183 (diff)
parent2dfa94657e2970a373d63e082fb439558e97e6f5 (diff)
Merge "Map Horizon, Redis, Rabbit, memcached to isolated nets"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller-puppet.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index df733027..c7cc4b66 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -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}