Merge "Map Horizon, Redis, Rabbit, memcached to isolated nets"
This commit is contained in:
commit
a2e6eb9f06
|
@ -82,3 +82,7 @@ parameter_defaults:
|
||||||
NovaMetadataNetwork: internal_api
|
NovaMetadataNetwork: internal_api
|
||||||
SwiftMgmtNetwork: storage_mgmt
|
SwiftMgmtNetwork: storage_mgmt
|
||||||
SwiftProxyNetwork: storage
|
SwiftProxyNetwork: storage
|
||||||
|
HorizonNetwork: external
|
||||||
|
MemcachedNetwork: internal_api
|
||||||
|
RabbitMqNetwork: internal_api
|
||||||
|
RedisNetwork: internal_api
|
||||||
|
|
|
@ -894,16 +894,16 @@ resources:
|
||||||
# Horizon
|
# Horizon
|
||||||
horizon::django_debug: {get_input: debug}
|
horizon::django_debug: {get_input: debug}
|
||||||
horizon::secret_key: {get_input: horizon_secret}
|
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}
|
horizon::keystone_url: {get_input: keystone_auth_uri}
|
||||||
|
|
||||||
# Rabbit
|
# 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}
|
rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
|
||||||
# Redis
|
# Redis
|
||||||
redis::bind: {get_input: controller_host}
|
redis::bind: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
|
||||||
# Misc
|
# 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}
|
neutron_public_interface_ip: {get_input: neutron_public_interface_ip}
|
||||||
ntp::servers: {get_input: ntp_servers}
|
ntp::servers: {get_input: ntp_servers}
|
||||||
control_virtual_interface: {get_input: control_virtual_interface}
|
control_virtual_interface: {get_input: control_virtual_interface}
|
||||||
|
|
Loading…
Reference in New Issue