Use $::os_service_default for all cinder::volume::rbd parameters

The volume_tmp_dir and rbd_secret_uuid parameters have a default
value of false, instead of using $::os_service_default.  This causes
a broken cinder config if this class is included and non-default
values are not specified for these parameters.

This patch changes the default values to use $::os_service_default

Change-Id: I3ccb5f98348416a6e95849df1d1fe44f79b89be5
Closes-bug: 1530168
This commit is contained in:
Mike Dorman 2015-12-30 09:35:19 -07:00
parent bab8cb706a
commit 218c08580f

@ -20,12 +20,12 @@
#
# [*rbd_secret_uuid*]
# (optional) A required parameter to use cephx.
# Defaults to false
# Defaults to $::os_service_default
#
# [*volume_tmp_dir*]
# (optional) Location to store temporary image files if the volume
# driver does not write them directly to the volume
# Defaults to false
# Defaults to $::os_service_default
#
# [*rbd_max_clone_depth*]
# (optional) Maximum number of nested clones that can be taken of a
@ -62,8 +62,8 @@ class cinder::volume::rbd (
$rbd_user,
$rbd_ceph_conf = '/etc/ceph/ceph.conf',
$rbd_flatten_volume_from_snapshot = $::os_service_default,
$rbd_secret_uuid = false,
$volume_tmp_dir = false,
$rbd_secret_uuid = $::os_service_default,
$volume_tmp_dir = $::os_service_default,
$rbd_max_clone_depth = $::os_service_default,
$rados_connect_timeout = $::os_service_default,
$rados_connection_interval = $::os_service_default,