summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-27 20:01:46 +0000
committerGerrit Code Review <review@openstack.org>2015-05-27 20:01:46 +0000
commit4c82514a4d91eeebf4aecd2520d89b3f64d4074b (patch)
treeb77da9ec1fe6f0dfa344af5ee1338d6e06402bfb /puppet
parent4c274512635686439bb5566fe86901a9269fbd3e (diff)
parentd358351f4af4bd962b5c2b83afdc70838949b6ff (diff)
Merge "Map Nova services to isolated networks"
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 f7ed3b5d..e3f6bbce 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -882,8 +882,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}