diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index d8fefa8f2..d4347aa28 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -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.') }
     }
diff --git a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
index 6eed8d226..3ed47be60 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
@@ -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