From a6214a237d73f837e696115ae085f919775f30c5 Mon Sep 17 00:00:00 2001
From: Giulio <gfidente@redhat.com>
Date: Thu, 31 Jul 2014 22:17:00 -0400
Subject: [PATCH] Ensure Cinder uses the VIP when contacting Glance

Updates cinder.conf so that it will set glance_host and glance_port
with data from heat template.

Change-Id: I2b6aebf782b0825b4a980b22763e04dc79593efa
Closes-Bug: 1351110
---
 elements/cinder/os-apply-config/etc/cinder/cinder.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/elements/cinder/os-apply-config/etc/cinder/cinder.conf b/elements/cinder/os-apply-config/etc/cinder/cinder.conf
index d48006030..f3c2f1beb 100644
--- a/elements/cinder/os-apply-config/etc/cinder/cinder.conf
+++ b/elements/cinder/os-apply-config/etc/cinder/cinder.conf
@@ -42,6 +42,9 @@ image_conversion_dir={{cinder.image_conversion_dir}}
 iscsi_helper={{.}}
 {{/cinder.iscsi-helper}}
 
+glance_host = {{glance.host}}
+glance_port = {{glance.port}}
+
 {{#rabbit}}
 rpc_backend=cinder.openstack.common.rpc.impl_kombu
 rabbit_password = {{password}}