openstack
/
puppet-tripleo
Code Issues Proposed changes

Gnocchi: Do not manage facl of ceph keyring 

... because this logic is never enabled and blocking usage of the exec
resource now.

Change-Id: I65842685b026eca1eb18f458c1b81096d9bd51bf
Related-Bug: #1922282
This commit is contained in:
Takashi Kajinami 2021-04-07 08:39:13 +09:00
parent 4aa4383ed0
commit 6aa4681137
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/profile/base/gnocchi/api.pp
View File

@ -146,19 +146,7 @@ class tripleo::profile::base::gnocchi::api (
}
}
'file': { include gnocchi::storage::file }
'rbd': {
include gnocchi::storage::ceph
exec{ "exec-setfacl-${gnocchi_rbd_client_name}-gnocchi":
path => ['/bin', '/usr/bin'],
command => "setfacl -m u:gnocchi:r-- ${gnocchi_rbd_ceph_conf_path}/ceph.client.${gnocchi_rbd_client_name}.keyring",
unless => "getfacl ${gnocchi_rbd_ceph_conf_path}/ceph.client.${gnocchi_rbd_client_name}.keyring | grep -q user:gnocchi:r--",
}
-> exec{ "exec-setfacl-${gnocchi_rbd_client_name}-gnocchi-mask":
path => ['/bin', '/usr/bin'],
command => "setfacl -m m::r ${gnocchi_rbd_ceph_conf_path}/ceph.client.${gnocchi_rbd_client_name}.keyring",
unless => "getfacl ${gnocchi_rbd_ceph_conf_path}/ceph.client.${gnocchi_rbd_client_name}.keyring | grep -q mask::r",
}
}
'rbd': { include gnocchi::storage::ceph }
's3': { include gnocchi::storage::s3 }
default: { fail('Unrecognized gnocchi_backend parameter.') }
}

2
spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
View File

@ -135,8 +135,6 @@ eos
:redis_url => 'redis://:gnocchi@127.0.0.1:6379/'
)
is_expected.to contain_class('gnocchi::storage::ceph')
is_expected.to contain_exec('exec-setfacl-openstack-gnocchi')
is_expected.to contain_exec('exec-setfacl-openstack-gnocchi-mask')
}
end