From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 16 Jul 2015 22:01:33 +0000 (+0200)
Subject: Ensure CinderStorage nodes use internalURL as catalog_info
X-Git-Tag: opnfv-6.0.0~2432^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e91d3b1d03c8b964641031f8d59ed8e6de563e8f;p=apex-tripleo-heat-templates.git

Ensure CinderStorage nodes use internalURL as catalog_info

By default Cinder will get the publicURL for Nova and Swift, which
is not reachable by the CinderStorage nodes.

Change-Id: I25b7900c9ab261e0f706257ffdf6844533b63b94
---

diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml
index 9f3907ef..f4cd78a9 100644
--- a/puppet/hieradata/volume.yaml
+++ b/puppet/hieradata/volume.yaml
@@ -3,4 +3,10 @@
 # cinder
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
 
+cinder::config::cinder_config:
+  DEFAULT/nova_catalog_info:
+    value: 'compute:Compute Service:internalURL'
+  DEFAULT/swift_catalog_info:
+    value: 'object-store:swift:internalURL'
+
 volume_classes: []
\ No newline at end of file
diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index 2ef0884b..f5c9ae5d 100644
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -31,6 +31,7 @@ if count(hiera('ntp::servers')) > 0 {
 }
 
 include ::cinder
+include ::cinder::config
 include ::cinder::glance
 include ::cinder::volume
 include ::cinder::setup_test_volume