diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-17 18:06:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-17 18:06:01 +0000 |
| commit | cf5e77cbefa46650dc8ddc9493a2ea4c8925076b (patch) | |
| tree | c2f2d2bd2b52545cf966f4a2ec86ef31cf2d4775 | |
| parent | 7916abc0d083938a1c40ef75e24cb0a9a6b9a9e4 (diff) | |
| parent | 269a3bbede2a6299d7fb7f1276e6645803cb4232 (diff) | |
Merge "Allow user to configure Ceph rbd_default_features"
| -rw-r--r-- | environments/puppet-ceph-external.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/ceph-external.yaml | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/environments/puppet-ceph-external.yaml b/environments/puppet-ceph-external.yaml index 06e4f7aa..5f8b02ad 100644 --- a/environments/puppet-ceph-external.yaml +++ b/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: '' 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: "{ |