Browse Source

Merge "Gnocchi: Do not manage facl of ceph keyring"

changes/74/785574/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
5800359cd6
2 changed files with 1 additions and 15 deletions
  1. +1
    -13
      manifests/profile/base/gnocchi/api.pp
  2. +0
    -2
      spec/classes/tripleo_profile_base_gnocchi_api_spec.rb

+ 1
- 13
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.') }
}


+ 0
- 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


Loading…
Cancel
Save