aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-19 00:47:14 +0000
committerGerrit Code Review <review@openstack.org>2015-07-19 00:47:14 +0000
commit04e1f75910fde44d07465ade327e61ce6238e1a9 (patch)
treea6ceaf71299e8a6a56ebd7ed0222ca70c41a41c4 /puppet
parentff84b2480074a99fae6ece55f7a4c722d293d59b (diff)
parente91d3b1d03c8b964641031f8d59ed8e6de563e8f (diff)
Merge "Ensure CinderStorage nodes use internalURL as catalog_info"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/volume.yaml6
-rw-r--r--puppet/manifests/overcloud_volume.pp1
2 files changed, 7 insertions, 0 deletions
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