Compare commits
2 Commits
35e27f79ef
...
bbb940da65
Author | SHA1 | Date | |
---|---|---|---|
bbb940da65 | |||
a0b45a2bcd |
@ -1629,7 +1629,6 @@ def ceph_volume_upload(zkhandler, pool, volume, img_type, file_size=None):
|
|||||||
zkhandler, pool, "{}_tmp".format(volume)
|
zkhandler, pool, "{}_tmp".format(volume)
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create a temporary block device to store non-raw images
|
|
||||||
if img_type == "raw":
|
if img_type == "raw":
|
||||||
if file_size != dev_size:
|
if file_size != dev_size:
|
||||||
output = {
|
output = {
|
||||||
@ -1676,7 +1675,6 @@ def ceph_volume_upload(zkhandler, pool, volume, img_type, file_size=None):
|
|||||||
cleanup_maps_and_volumes()
|
cleanup_maps_and_volumes()
|
||||||
return output, retcode
|
return output, retcode
|
||||||
|
|
||||||
# Write the image directly to the blockdev
|
|
||||||
else:
|
else:
|
||||||
if file_size is None:
|
if file_size is None:
|
||||||
output = {"message": "A file size must be specified"}
|
output = {"message": "A file size must be specified"}
|
||||||
|
@ -763,9 +763,7 @@ def add_volume(zkhandler, pool, name, size):
|
|||||||
|
|
||||||
# 2. Create the volume
|
# 2. Create the volume
|
||||||
retcode, stdout, stderr = common.run_os_command(
|
retcode, stdout, stderr = common.run_os_command(
|
||||||
"rbd create --size {} {}/{}".format(
|
"rbd create --size {}B {}/{}".format(size_bytes, pool, name)
|
||||||
format_bytes_tohuman(size_bytes), pool, name
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
if retcode:
|
if retcode:
|
||||||
return False, 'ERROR: Failed to create RBD volume "{}": {}'.format(name, stderr)
|
return False, 'ERROR: Failed to create RBD volume "{}": {}'.format(name, stderr)
|
||||||
|
Reference in New Issue
Block a user