Browse Source

Allow user to configure Ceph rbd_default_features

Allow user to configure rbd_default_features parameter in
ceph.conf / [client] section. Operators deploying newer
Ceph clients that must use older Ceph servers need to be
able to easily set this option for backwards compatibility.

Change-Id: I685c95c47282894bb6309168c537de877dbccc66
Depends-On: I477640c5db2cc84622da7734fb54cfe7740bd137
Related-Bug: 1633552
changes/72/386972/5
John Fulton 6 years ago
parent
commit
269a3bbede
  1. 3
      environments/puppet-ceph-external.yaml
  2. 7
      puppet/services/ceph-external.yaml

3
environments/puppet-ceph-external.yaml

@ -30,5 +30,8 @@ parameter_defaults:
# finally we disable the Cinder LVM backend
CinderEnableIscsiBackend: false
# Uncomment if connecting to a pre-Jewel or RHCS1.3 Ceph Cluster
# RbdDefaultFeatures: 1
# Backward compatibility setting, will be removed in the future
CephAdminKey: ''

7
puppet/services/ceph-external.yaml

@ -61,6 +61,12 @@ parameters:
MonitoringSubscriptionCephExternal:
default: 'overcloud-ceph-external'
type: string
RbdDefaultFeatures:
default: ''
description: The default features enabled when creating a block device
image. Only applies to format 2 images. Set to '1' for Jewel
clients using older Ceph servers.
type: string
conditions:
glance_multiple_locations:
@ -81,6 +87,7 @@ outputs:
config_settings:
tripleo::profile::base::ceph::ceph_mon_host: {get_param: CephExternalMonHost}
ceph::profile::params::fsid: {get_param: CephClusterFSID}
ceph::profile::params::rbd_default_features: {get_param: RbdDefaultFeatures}
ceph::profile::params::client_keys:
str_replace:
template: "{

Loading…
Cancel
Save