openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Allow user to configure Ceph rbd_default_features"

Browse Source
This commit is contained in:
Jenkins 2017-01-17 18:06:01 +00:00 committed by Gerrit Code Review
commit cf5e77cbef
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
environments/puppet-ceph-external.yaml
View File

@ -30,5 +30,8 @@ parameter_defaults:
# finally we disable the Cinder LVM backend # finally we disable the Cinder LVM backend
CinderEnableIscsiBackend: false 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 # Backward compatibility setting, will be removed in the future
CephAdminKey: '' CephAdminKey: ''

7
puppet/services/ceph-external.yaml
View File

@ -61,6 +61,12 @@ parameters:
MonitoringSubscriptionCephExternal: MonitoringSubscriptionCephExternal:
default: 'overcloud-ceph-external' default: 'overcloud-ceph-external'
type: string 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: conditions:
glance_multiple_locations: glance_multiple_locations:
@ -81,6 +87,7 @@ outputs:
config_settings: config_settings:
tripleo::profile::base::ceph::ceph_mon_host: {get_param: CephExternalMonHost} tripleo::profile::base::ceph::ceph_mon_host: {get_param: CephExternalMonHost}
ceph::profile::params::fsid: {get_param: CephClusterFSID} ceph::profile::params::fsid: {get_param: CephClusterFSID}
ceph::profile::params::rbd_default_features: {get_param: RbdDefaultFeatures}
ceph::profile::params::client_keys: ceph::profile::params::client_keys:
str_replace: str_replace:
template: "{ template: "{