Merge pull request #12947 from smatzek/fix_18538

ceph-disk: use correct user in check_journal_req Reviewed-by: Alfredo Deza <adeza@redhat.com>
ceph · Jan 19, 2017 · 3e75c6b · 3e75c6b
2 parents 5db320c + bcf7514
commit 3e75c6b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
@@ -1425,16 +1425,22 @@ def check_journal_reqs(args):
         'ceph-osd', '--check-allows-journal',
         '-i', '0',
         '--cluster', args.cluster,
+        '--setuser', get_ceph_user(),
+        '--setgroup', get_ceph_group(),
     ])
     _, _, wants_journal = command([
         'ceph-osd', '--check-wants-journal',
         '-i', '0',
         '--cluster', args.cluster,
+        '--setuser', get_ceph_user(),
+        '--setgroup', get_ceph_group(),
     ])
     _, _, needs_journal = command([
         'ceph-osd', '--check-needs-journal',
         '-i', '0',
         '--cluster', args.cluster,
+        '--setuser', get_ceph_user(),
+        '--setgroup', get_ceph_group(),
     ])
     return (not allows_journal, not wants_journal, not needs_journal)