starlingx/config
Code Issues Proposed changes

Merge "Enable upstream Cinder volume backup/restore capabilities"

Browse Source
This commit is contained in:
Zuul 2018-10-01 21:16:00 +00:00 committed by Gerrit Code Review
commit 0ffdae6953
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet-manifests/src/modules/openstack/manifests/cinder.pp
View File

@ -474,6 +474,16 @@ define openstack::cinder::backend::ceph(
rbd_user => $rbd_user, rbd_user => $rbd_user,
rbd_ceph_conf => $rbd_ceph_conf, 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 { } else {
cinder_config { cinder_config {
"${backend_name}/volume_backend_name": ensure => absent; "${backend_name}/volume_backend_name": ensure => absent;