← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ceph-deploy/trusty

« back to all changes in this revision

Viewing changes to ceph_deploy/osd.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-23 13:59:35 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20130823135935-8l1apw6ulg3n5cnp
Tags: 1.2.2-0ubuntu1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceph_deploy/osd.py
98
98
            ],
99
99
        )
100
100
 
 
101
 
101
102
def prepare_disk(cluster, disk, journal, activate_prepared_disk, zap, dmcrypt, dmcrypt_dir):
102
103
    """
103
104
    Run on osd node, prepares a data disk for use.
113
114
            args.append('--dmcrypt-key-dir')
114
115
            args.append(dmcrypt_dir)
115
116
    args.extend([
116
 
            '--',
117
 
            disk,
118
 
            ])
 
117
        '--cluster',
 
118
        cluster,
 
119
        '--',
 
120
        disk,
 
121
    ])
119
122
    if journal is not None:
120
123
        args.append(journal)
121
124