From: Dan Prince <dprince@redhat.com>
Date: Mon, 1 Jun 2015 14:26:38 +0000 (-0400)
Subject: Set glance_api_servers for cinder
X-Git-Tag: opnfv-6.0.0~2509
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f601ab7b58577d92583018fb3f244f7e9a804b45;p=apex-tripleo-heat-templates.git

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
---

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}