Faidon has submitted this change and it was merged.
Change subject: ceph-add-disk: update for dumpling
......................................................................
ceph-add-disk: update for dumpling
Remove a couple of our hacks now that our requests have been fixed
properly. Also, migrate to the unified ceph-disk tool.
(this is still all untested until a disk fails :)
Change-Id: I6b0d96ceaffb305fdef2f08dc2b775c679f17551
---
M modules/ceph/files/ceph-add-disk
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ceph/files/ceph-add-disk b/modules/ceph/files/ceph-add-disk
index e638633..4b8f171 100644
--- a/modules/ceph/files/ceph-add-disk
+++ b/modules/ceph/files/ceph-add-disk
@@ -93,12 +93,10 @@
# cleanup possibly old journal
rm -f ${journal}
-# disable ceph-disk-activate, or it is spawned prematurely by prepare
-# http://tracker.ceph.com/issues/3255
-mv /usr/sbin/ceph-disk-activate /usr/sbin/ceph-disk-activate.off
-ceph-disk-prepare ${disk} ${journal}
+ceph-disk suppress-activate
+ceph-disk prepare ${disk} ${journal}
udevadm settle
-mv /usr/sbin/ceph-disk-activate.off /usr/sbin/ceph-disk-activate
+ceph-disk unsuppress-activate
# explicitly set whoami
# WARNING: this can be dangerous if not previously cleaned up properly
@@ -111,4 +109,4 @@
rmdir ${mountpoint}
echo "I: activating the new OSD"
-ceph-disk-activate --mount ${disk}1
+ceph-disk activate --mount ${disk}1
--
To view, visit https://gerrit.wikimedia.org/r/75832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b0d96ceaffb305fdef2f08dc2b775c679f17551
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
