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:
parent
4aa4383ed0
commit
6aa4681137
|
@ -146,19 +146,7 @@ class tripleo::profile::base::gnocchi::api (
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'file': { include gnocchi::storage::file }
|
'file': { include gnocchi::storage::file }
|
||||||
'rbd': {
|
'rbd': { include gnocchi::storage::ceph }
|
||||||
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",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
's3': { include gnocchi::storage::s3 }
|
's3': { include gnocchi::storage::s3 }
|
||||||
default: { fail('Unrecognized gnocchi_backend parameter.') }
|
default: { fail('Unrecognized gnocchi_backend parameter.') }
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,8 +135,6 @@ eos
|
||||||
:redis_url => 'redis://:gnocchi@127.0.0.1:6379/'
|
:redis_url => 'redis://:gnocchi@127.0.0.1:6379/'
|
||||||
)
|
)
|
||||||
is_expected.to contain_class('gnocchi::storage::ceph')
|
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
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue