parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Use quotes around variables in output

This commit is contained in:
Joshua Boniface 2019-07-08 22:31:24 -04:00
parent b0bdf72310
commit dd78aa8fb8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client-common/ceph.py
View File

@ -221,7 +221,7 @@ def add_osd(zk_conn, node, device, weight):
try: try:
result = zkhandler.readdata(zk_conn, '/ceph/cmd').split()[0] result = zkhandler.readdata(zk_conn, '/ceph/cmd').split()[0]
if result == 'success-osd_add': if result == 'success-osd_add':
message = 'Created new OSD with block device {} on node {}.'.format(device, node) message = 'Created new OSD with block device "{}" on node "{}".'.format(device, node)
success = True success = True
else: else:
message = 'ERROR: Failed to create new OSD; check node logs for details.' message = 'ERROR: Failed to create new OSD; check node logs for details.'
@ -670,7 +670,7 @@ def add_pool(zk_conn, name, pgs):
try: try:
result = zkhandler.readdata(zk_conn, '/ceph/cmd').split()[0] result = zkhandler.readdata(zk_conn, '/ceph/cmd').split()[0]
if result == 'success-pool_add': if result == 'success-pool_add':
message = 'Created new RBD pool {} with {} PGs.'.format(name, pgs) message = 'Created new RBD pool "{}" with "{}" PGs.'.format(name, pgs)
success = True success = True
else: else:
message = 'ERROR: Failed to create new pool; check node logs for details.' message = 'ERROR: Failed to create new pool; check node logs for details.'
@ -949,7 +949,7 @@ def add_volume(zk_conn, pool, name, size):
try: try:
result = zkhandler.readdata(zk_conn, '/ceph/cmd').split()[0] result = zkhandler.readdata(zk_conn, '/ceph/cmd').split()[0]
if result == 'success-volume_add': if result == 'success-volume_add':
message = 'Created new RBD volume {} of size {} on pool {}.'.format(name, size, pool) message = 'Created new RBD volume "{}" of size "{}" on pool "{}".'.format(name, size, pool)
success = True success = True
else: else:
message = 'ERROR: Failed to create new volume; check node logs for details.' message = 'ERROR: Failed to create new volume; check node logs for details.'
@ -1166,7 +1166,7 @@ def add_snapshot(zk_conn, pool, volume, name):
try: try:
result = zkhandler.readdata(zk_conn, '/ceph/cmd').split()[0] result = zkhandler.readdata(zk_conn, '/ceph/cmd').split()[0]
if result == 'success-snapshot_add': if result == 'success-snapshot_add':
message = 'Created new RBD snapshot {} of volume {} on pool {}.'.format(name, volume, pool) message = 'Created new RBD snapshot "{}" of volume "{}" on pool "{}".'.format(name, volume, pool)
success = True success = True
else: else:
message = 'ERROR: Failed to create new snapshot; check node logs for details.' message = 'ERROR: Failed to create new snapshot; check node logs for details.'