From 269a3bbede2a6299d7fb7f1276e6645803cb4232 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Sat, 15 Oct 2016 16:38:13 -0400 Subject: 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 --- puppet/services/ceph-external.yaml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'puppet') diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml index b898d0bf..aaa9b039 100644 --- a/puppet/services/ceph-external.yaml +++ b/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: "{ -- cgit 1.2.3-korg