aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorDan Sneddon <dsneddon@redhat.com>2015-05-26 18:57:49 -0700
committerDan Sneddon <dsneddon@redhat.com>2015-05-27 07:46:14 +0000
commitd358351f4af4bd962b5c2b83afdc70838949b6ff (patch)
tree5ba85266d3927fc4268a32c69b44d4dde6905ef2 /puppet
parent41f0b76907416b8e6ea0f7a7b9de9985b77e79e7 (diff)
Map Nova services to isolated networks
This change adds parameters to specify which networks the Nova API and metadata services will use. If the internal_api network exists, it will be used for the bind IP for Nova API and metadata servers, otherwise the Undercloud 'ctlplane' IP will be used by default. Change-Id: Ie420274c7fba80abf9cf2b599431acc47e28fc7a
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller-puppet.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 169280f2..2a1731dc 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -870,8 +870,8 @@ resources:
nova::debug: {get_input: debug}
nova::api::auth_uri: {get_input: keystone_auth_uri}
nova::api::identity_uri: {get_input: keystone_identity_uri}
- nova::api::api_bind_address: {get_input: controller_host}
- nova::api::metadata_listen: {get_input: controller_host}
+ nova::api::api_bind_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
+ nova::api::metadata_listen: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]}
nova::api::admin_password: {get_input: nova_password}
nova::database_connection: {get_input: nova_dsn}
nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}