openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Fix manila-share with ceph-nfs backend" into stable/ussuri

This commit is contained in:
Zuul 2021-01-20 04:34:55 +00:00 committed by Gerrit Code Review
parent f699997e06 6d335056a3
commit b704071b64
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/profile/pacemaker/ceph_nfs.pp
View File

@ -91,7 +91,10 @@ class tripleo::profile::pacemaker::ceph_nfs (
}
}
if $step >= 5 and $pacemaker_master {
# When we create manila-share resource at step 5 we need the ceph-nfs pcmk resource up
# and running. But since we moved to pcs commands invoked on host, manila-share at step5
# gets created *before* ceph-nfs (as it is invoked via step_config vs docker_config)
if $step >= 4 and $pacemaker_master {
pacemaker::resource::service { 'ceph-nfs' :
service_name => 'ceph-nfs@pacemaker',
op_params => 'start timeout=200s stop timeout=200s',