Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ceph_volume: add container support for batch command
The batch option got recently added, while rebasing this patch it was
necessary to implement it. So now, the batch option can work on
containerized environments.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1630977
Signed-off-by: Sébastien Han <seb@redhat.com>
  • Loading branch information
leseb authored and guits committed Oct 10, 2018
1 parent 3ddcc9a commit e39fc4f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
19 changes: 10 additions & 9 deletions library/ceph_volume.py
Expand Up @@ -252,20 +252,21 @@ def batch(module):
journal_size = module.params['journal_size']
block_db_size = module.params['block_db_size']
report = module.params['report']
subcommand = 'batch'

if not batch_devices:
module.fail_json(
msg='batch_devices must be provided if action is "batch"', changed=False, rc=1) # noqa 4502

cmd = [
'ceph-volume',
'--cluster',
cluster,
'lvm',
'batch',
'--%s' % objectstore,
'--yes',
]
if "CEPH_CONTAINER_IMAGE" in os.environ:
container_image = os.getenv("CEPH_CONTAINER_IMAGE")
else:
container_image = None

cmd = ceph_volume_cmd(subcommand, container_image, cluster)
cmd.extend(["--%s" % objectstore])
cmd.extend("--yes")
cmd.extend("--no-systemd ")

if crush_device_class:
cmd.extend(["--crush-device-class", crush_device_class])
Expand Down
1 change: 1 addition & 0 deletions roles/ceph-osd/tasks/scenarios/lvm-batch.yml
Expand Up @@ -13,3 +13,4 @@
action: "batch"
environment:
CEPH_VOLUME_DEBUG: 1
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"

0 comments on commit e39fc4f

Please sign in to comment.