]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph-disk: s|/dev/fd/0|-|
authorKefu Chai <kchai@redhat.com>
Wed, 19 Jul 2017 05:02:40 +0000 (13:02 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 24 Jul 2017 16:21:05 +0000 (00:21 +0800)
3a4931b allows ceph cli to use '-' to denote stdin/stdout, so use it
instead of /dev/fd/0.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/ceph-disk/ceph_disk/main.py

index cca4eff8f168cdf8864fa9508df87b95cea6b59c..a1549eb6e21cd879b308c0a1df3001bed4c1722d 100755 (executable)
@@ -1088,7 +1088,7 @@ def allocate_osd_id(
                 '--cluster', cluster,
                 '--name', 'client.bootstrap-osd',
                 '--keyring', keyring,
-                '-i', '/dev/fd/0',
+                '-i', '-',
                 'osd', 'new',
                 fsid,
             ] + id_arg,
@@ -2743,7 +2743,7 @@ class Lockbox(object):
                 '--cluster', cluster,
                 '--name', 'client.bootstrap-osd',
                 '--keyring', bootstrap,
-                '-i', '/dev/fd/0',
+                '-i', '-',
                 'osd', 'new', self.args.osd_uuid,
             ] + id_arg,
             secrets.get_json()