ceph-disk-prepare: Avoid triggering activate before prepare is done.

Earlier testing never saw this, but now a mount of a disk triggers a
udev blockdev-added event, causing ceph-disk-activate to run even
before ceph-disk-prepare has had a chance to write the files and
unmount the disk.

Avoid this by using a temporary partition type uuid ("ceph 2 be"), and
only setting it to the permanent ("ceph osd"). The hotplug event won't
match the type uuid, and thus won't trigger ceph-disk-activate.

Signed-off-by: Tommi Virtanen <tv@inktank.com>

diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare
index 59022078592fe2eceb2ce6a5438a264426d7c51c..74b07155ffeada3083fe7fbb282ac150b00eb7da 100755 (executable)
--- a/src/ceph-disk-prepare
+++ b/src/ceph-disk-prepare
@@ -188,7 +188,7 @@ def prepare(
                 '--mbrtogpt',
                 '--largest-new=1',
                 '--change-name=1:ceph data',
-                '--typecode=1:4fbd7e29-9d25-41b8-afd0-062c0ceff05d',
+                '--typecode=1:89c57f98-2fe5-4dc0-89c1-f3ad0ceff2be',
                 '--',
                 disk,
                 ],
@@ -223,6 +223,18 @@ def prepare(
     finally:
         unmount(path)
 
+    try:
+        subprocess.check_call(
+            args=[
+                'sgdisk',
+               '--typecode=1:4fbd7e29-9d25-41b8-afd0-062c0ceff05d',
+                '--',
+                disk,
+                ],
+            )
+    except subprocess.CalledProcessError as e:
+        raise PrepareError(e)
+
 
 def parse_args():
     parser = argparse.ArgumentParser(