Update default Cinder RBD backend_host value
The Cinder RBD driver's backend_host should use 'cinder::backend_host'
hiera data first, and only use 'cinder::host' if the preferred hiera
value isn't defined.
Partial-Bug: #1753596
Depends-On: I11a55571f4bed630967242c797e08e11c47eab11
Change-Id: I78a88725d297794efd854fbfb14df0611e0e0738
(cherry picked from commit 1ec7756676
)
This commit is contained in:
parent
b25e2fbed0
commit
e4ad49f55c
|
@ -24,7 +24,7 @@
|
|||
#
|
||||
# [*cinder_rbd_backend_host*]
|
||||
# (Optional) String to use as backend_host in the backend stanza
|
||||
# Defaults to 'cinder::host'
|
||||
# Defaults to hiera('cinder::backend_host', hiera('cinder::host', 'hostgroup'))
|
||||
#
|
||||
# [*cinder_rbd_ceph_conf*]
|
||||
# (Optional) The path to the Ceph cluster config file
|
||||
|
@ -54,7 +54,7 @@
|
|||
#
|
||||
class tripleo::profile::base::cinder::volume::rbd (
|
||||
$backend_name = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph'),
|
||||
$cinder_rbd_backend_host = hiera('cinder::host', 'hostgroup'),
|
||||
$cinder_rbd_backend_host = hiera('cinder::backend_host', hiera('cinder::host', 'hostgroup')),
|
||||
$cinder_rbd_ceph_conf = hiera('cinder::backend::rbd::rbd_ceph_conf', '/etc/ceph/ceph.conf'),
|
||||
$cinder_rbd_pool_name = 'volumes',
|
||||
$cinder_rbd_extra_pools = undef,
|
||||
|
|
Loading…
Reference in New Issue