starlingx
/
config
Code Issues Proposed changes

Merge "/etc/ceph/ceph.client.None.keyring not created on standby controller"

This commit is contained in:
Zuul 2019-01-15 19:36:24 +00:00 committed by Gerrit Code Review
parent 1b8a344edd 3b4acbfc38
commit c3f905276d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -700,6 +700,7 @@ class openstack::cinder::post
file { $initial_cinder_ceph_config_flag: file { $initial_cinder_ceph_config_flag:
ensure => present ensure => present
} }
}
# To workaround an upstream bug in rbd code, we need to create # To workaround an upstream bug in rbd code, we need to create
# an empty file /etc/ceph/ceph.client.None.keyring in order to # an empty file /etc/ceph/ceph.client.None.keyring in order to
@ -710,7 +711,6 @@ class openstack::cinder::post
group => 'root', group => 'root',
mode => '0644', mode => '0644',
} }
}
if $is_node_cinder_lvm { if $is_node_cinder_lvm {
file { $node_cinder_lvm_config_flag: file { $node_cinder_lvm_config_flag: