Merge "Enable upstream Cinder volume backup/restore capabilities"

puppet-manifests/src/modules/openstack/manifests/cinder.pp

@@ -474,6 +474,16 @@ define openstack::cinder::backend::ceph(
       rbd_user => $rbd_user,
       rbd_ceph_conf => $rbd_ceph_conf,
     }
+
+    # To workaround an upstream bug in rbd code, we need to create
+    # an empty file /etc/ceph/ceph.client.None.keyring in order to
+    # do cinder backup and restore.
+    file { "/etc/ceph/ceph.client.None.keyring":
+      ensure => file,
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0644',
+    }
   } else {
     cinder_config {
       "${backend_name}/volume_backend_name": ensure => absent;