openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Keep setting backend_host to 'hostgroup' for rbd backends 

There are backwards incompatible patches [1][2] in puppet-cinder which break
upgrade scenarios, but at this point they made it to liberty and mitaka,
so workaround in t-h-t is easier than revert

[1] https://review.openstack.org/#/c/209412/
[2] https://review.openstack.org/#/c/231068/

Change-Id: Ic82258bf0893ebd4e595e5df73ffbc4c6443f9e8
Closes-Bug: #1570265
(cherry picked from commit 2b15978ba0)
This commit is contained in:
Jiri Stransky 2016-04-14 12:09:34 +02:00
parent c3a8bc581e
commit 220d378ade
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/manifests/overcloud_controller.pp
View File

@ -453,6 +453,7 @@ if hiera('step') >= 3 {
$cinder_rbd_backend = 'tripleo_ceph'
cinder::backend::rbd { $cinder_rbd_backend :
backend_host => hiera('cinder::host'),
rbd_pool => hiera('cinder_rbd_pool_name'),
rbd_user => hiera('ceph_client_user_name'),
rbd_secret_uuid => hiera('ceph::profile::params::fsid'),

1
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -897,6 +897,7 @@ if hiera('step') >= 3 {
$cinder_rbd_backend = 'tripleo_ceph'
cinder::backend::rbd { $cinder_rbd_backend :
backend_host => hiera('cinder::host'),
rbd_pool => hiera('cinder_rbd_pool_name'),
rbd_user => hiera('ceph_client_user_name'),
rbd_secret_uuid => hiera('ceph::profile::params::fsid'),