From 66afbaf4a5a24a323ac619099824cfaac0454da3 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 28 Sep 2018 16:26:20 -0400 Subject: [PATCH] Enable upstream Cinder volume backup/restore capabilities 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. This file is created in cinder manifest when ceph backend is enabled. Story: 2003115 Task: 26797 Change-Id: I43388d5e1be2e37e32e88cce718034dbf58f53fc Signed-off-by: Wei Zhou --- .../src/modules/openstack/manifests/cinder.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/puppet-manifests/src/modules/openstack/manifests/cinder.pp b/puppet-manifests/src/modules/openstack/manifests/cinder.pp index 83315a9942..5ca6672a9d 100644 --- a/puppet-manifests/src/modules/openstack/manifests/cinder.pp +++ b/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;