openstack
/
fuel-library
Code Issues Proposed changes

Fix successful deployment with all non-working monitors 

*Disable timeout for command "ceph-deploy osd activate".
 Command "ceph-deploy osd activate" has its own timeout and if cluster
 is not accessible for this time, it exits with error.
*Decrease try number for "ceph-deploy osd activate", 6 is too many
 but 3 - enough.
*Fix messages "WARN: Unrecognised escape sequence"

Change-Id: I806aa3fd7a7420f02ba69470642e2bc3eb88fbd4
Partial-bug: #1457487
Closes-bug: #1442214
This commit is contained in:
Stanislav Makar 2015-05-22 13:00:31 +00:00
parent d2997066fe
commit dc80559408
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/puppet/ceph/manifests/osds/osd.pp
View File

@ -21,9 +21,10 @@ define ceph::osds::osd () {
exec { "ceph-deploy osd activate ${deploy_device_name}":
command => "ceph-deploy osd activate ${deploy_device_name}",
try_sleep => 10,
tries => 6,
tries => 3,
logoutput => true,
unless => "ceph osd dump | grep -q \"osd.$(sed -nEe 's|${name}\ .*ceph-([0-9]+).*$|\1|p' /proc/mounts)\ up\ .*\ in\ \"",
timeout => 0,
unless => "ceph osd dump | grep -q \"osd.$(sed -nEe 's|${name}\\ .*ceph-([0-9]+).*$|\\1|p' /proc/mounts)\\ up\\ .*\\ in\\ \"",
}
}