From 3b4acbfc38f01f9e600d7fb41f0dbd55ba2166e4 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 11 Jan 2019 15:26:20 -0500 Subject: [PATCH] /etc/ceph/ceph.client.None.keyring not created on standby controller This commit ensures that file /etc/ceph/ceph.client.None.keyring is created on both controllers after ceph backend is added. Change-Id: I49c7b540caca18bada7166c9e7fb2f4b3475a5d3 Closes-Bug: 1810440 Signed-off-by: Wei Zhou --- .../src/modules/openstack/manifests/cinder.pp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/puppet-manifests/src/modules/openstack/manifests/cinder.pp b/puppet-manifests/src/modules/openstack/manifests/cinder.pp index e3d942a0d1..a3873450e2 100644 --- a/puppet-manifests/src/modules/openstack/manifests/cinder.pp +++ b/puppet-manifests/src/modules/openstack/manifests/cinder.pp @@ -700,16 +700,16 @@ class openstack::cinder::post file { $initial_cinder_ceph_config_flag: ensure => present } + } - # 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', - } + # 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', } if $is_node_cinder_lvm {