args.dev,
]
)
- elif parttype in (PTYPE['regular']['journal']['ready'],
- PTYPE['mpath']['journal']['ready']):
- command(
- [
- 'ceph-disk',
- 'activate-journal',
- args.dev,
- ]
- )
- # journals are easy: map, chown, activate-journal
- elif parttype == PTYPE['plain']['journal']['ready']:
+ elif parttype in (PTYPE['plain']['osd']['ready'],
+ PTYPE['luks']['osd']['ready']):
command(
[
- '/sbin/cryptsetup',
- '--key-file',
- '/etc/ceph/dmcrypt-keys/{partid}'.format(partid=partid),
- '--key-size',
- '256',
- 'create',
- partid,
+ '/usr/sbin/ceph-disk',
+ 'activate',
+ '--dmcrypt',
args.dev,
]
)
- newdev = '/dev/mapper/' + partid
- count = 0
- while not os.path.exists(newdev) and count <= 10:
- time.sleep(1)
- count += 1
- command(
- [
- '/bin/chown',
- 'ceph:ceph',
- newdev,
- ]
- )
+
+ elif parttype in (PTYPE['regular']['journal']['ready'],
+ PTYPE['mpath']['journal']['ready']):
command(
[
- '/usr/sbin/ceph-disk',
+ 'ceph-disk',
'activate-journal',
- newdev,
- ]
- )
- elif parttype == PTYPE['luks']['journal']['ready']:
- command(
- [
- '/sbin/cryptsetup',
- '--key-file',
- '/etc/ceph/dmcrypt-keys/{partid}.luks.key'.format(
- partid=partid),
- 'luksOpen',
args.dev,
- partid,
- ]
- )
- newdev = '/dev/mapper/' + partid
- count = 0
- while not os.path.exists(newdev) and count <= 10:
- time.sleep(1)
- count += 1
- command(
- [
- '/bin/chown',
- 'ceph:ceph',
- newdev,
]
)
+
+ elif parttype in (PTYPE['plain']['journal']['ready'],
+ PTYPE['luks']['journal']['ready']):
command(
[
'/usr/sbin/ceph-disk',
'activate-journal',
- newdev,
+ '--dmcrypt',
+ args.dev,
]
)
'dev',
help=('device'),
)
+ trigger_parser.add_argument(
+ '--cluster',
+ metavar='NAME',
+ default='ceph',
+ help='cluster name to assign this disk to',
+ )
+ trigger_parser.add_argument(
+ '--dmcrypt',
+ action='store_true', default=None,
+ help='map DATA and/or JOURNAL devices with dm-crypt',
+ )
+ trigger_parser.add_argument(
+ '--dmcrypt-key-dir',
+ metavar='KEYDIR',
+ default='/etc/ceph/dmcrypt-keys',
+ help='directory where dm-crypt keys are stored',
+ )
trigger_parser.add_argument(
'--sync',
action='store_true', default=None,