diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2015-07-17 00:01:33 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2015-07-17 00:39:46 +0200 |
| commit | e91d3b1d03c8b964641031f8d59ed8e6de563e8f (patch) | |
| tree | f8e762db1c1f7590878a79f8ad3649c45638e445 | |
| parent | b9a1f31df3d4a33b1d317ad0f970b88adff17f5a (diff) | |
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
| -rw-r--r-- | puppet/hieradata/volume.yaml | 6 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_volume.pp | 1 |
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 |