openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Update default Cinder RBD backend_host value"

This commit is contained in:
Zuul 2018-03-08 10:27:52 +00:00 committed by Gerrit Code Review
parent cf4f71ae9d 1ec7756676
commit 7335cfb9dc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/cinder/volume/rbd.pp
View File

@ -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,