aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-06-01 10:26:38 -0400
committerDan Prince <dprince@redhat.com>2015-06-04 13:28:00 -0400
commitf601ab7b58577d92583018fb3f244f7e9a804b45 (patch)
tree1b081c98242b27382105e4145818b3a84def17b1 /puppet/controller-puppet.yaml
parent26dee879c015572bd440875cd0ddb2496357ac03 (diff)
Set glance_api_servers for cinder
This patch updates the hiera configuration for the Cinder API so that we set glance_api_servers. By default Cinder constructs a glance URL based on $my_ip (the local IP of the machine) which may not be correct if you are running Glance on a non-default internal network. By setting glance_api_servers to the same thing we already use for Nova we make Cinder contact the correct Glance URL regardless of the network settings. Change-Id: I1c56eb585ddfdc9989a8b55bc1bac819802f7794
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r--puppet/controller-puppet.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index aa33cbfc..2160bfa2 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -794,6 +794,7 @@ resources:
cinder::rabbit_port: {get_input: rabbit_client_port}
cinder::debug: {get_input: debug}
cinder_enable_iscsi_backend: {get_input: cinder_enable_iscsi_backend}
+ cinder::glance::glance_api_servers: {get_input: glance_api_servers}
# Glance
glance::api::bind_port: {get_input: glance_port}