openstack/puppet-ceph
Code Issues Proposed changes

Remove workaround for old p-o-i manifest

Browse Source 
Now p-o-i uses the native class parameters thus we can define
the parameter resources even when the parametes are not set.

Change-Id: Iefc8126f5ffff55e623dfdaa8e791ba4aafb7831
This commit is contained in:
Takashi Kajinami
2022-05-10 13:29:39 +09:00
parent 1fa388f5c3
commit 81a137e29e
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/init.pp
View File

@@ -193,6 +193,8 @@ this module to assign values and will be removed in a future release.')
ceph_config {
'global/fsid': value => $fsid;
'global/keyring': value => $keyring;
'global/osd_max_object_name_len': value => $osd_max_object_name_len;
'global/osd_max_object_namespace_len': value => $osd_max_object_namespace_len;
'global/osd_pool_default_pg_num': value => $osd_pool_default_pg_num;
'global/osd_pool_default_pgp_num': value => $osd_pool_default_pgp_num;
'global/osd_pool_default_size': value => $osd_pool_default_size;
@@ -215,21 +217,6 @@ this module to assign values and will be removed in a future release.')
'client/rbd_default_features': value => $rbd_default_features;
}
# NOTE(aschultz): for backwards compatibility in p-o-i & elsewhere we only
# define these here if they are set. Once this patch lands, we can update
# p-o-i to leverage these parameters and ditch these if clauses.
if $osd_max_object_name_len {
ceph_config {
'global/osd_max_object_name_len': value => $osd_max_object_name_len;
}
}
if $osd_max_object_namespace_len {
ceph_config {
'global/osd_max_object_namespace_len': value => $osd_max_object_namespace_len;
}
}
if $authentication_type == 'cephx' {
ceph_config {
'global/auth_cluster_required': value => 'cephx';