diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-16 20:50:08 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-16 20:50:08 +0000 |
| commit | 382381f74ca3423958add26b2578c4e77282a9a0 (patch) | |
| tree | 44ee37dae2238846cd0c699f21f392dd4fbd9cd5 | |
| parent | c0437edb3fa7fef892aa43b749398bf0fd1ee3e7 (diff) | |
simplify call to simple_execute
| -rw-r--r-- | nova/compute/node.py | 8 | ||||
| -rw-r--r-- | nova/volume/storage.py | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/nova/compute/node.py b/nova/compute/node.py index 8874ef17e..7cae86d02 100644 --- a/nova/compute/node.py +++ b/nova/compute/node.py @@ -223,7 +223,7 @@ class Node(object, service.Service): volume_id = None, mountpoint = None): volume = storage.get_volume(volume_id) yield self._init_aoe() - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo virsh attach-disk %s /dev/etherd/%s %s" % (instance_id, volume['aoe_device'], @@ -233,8 +233,8 @@ class Node(object, service.Service): @defer.inlineCallbacks def _init_aoe(self): - yield process.SharedPool().simple_execute("sudo aoe-discover") - yield process.SharedPool().simple_execute("sudo aoe-stat") + yield process.simple_execute("sudo aoe-discover") + yield process.simple_execute("sudo aoe-stat") @defer.inlineCallbacks @exception.wrap_exception @@ -244,7 +244,7 @@ class Node(object, service.Service): # name without the leading /dev/ volume = storage.get_volume(volume_id) target = volume['mountpoint'].rpartition('/dev/')[2] - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo virsh detach-disk %s %s " % (instance_id, target)) volume.finish_detach() defer.returnValue(True) diff --git a/nova/volume/storage.py b/nova/volume/storage.py index 305ef527a..5424b092f 100644 --- a/nova/volume/storage.py +++ b/nova/volume/storage.py @@ -148,18 +148,18 @@ class BlockStore(object): def _restart_exports(self): if FLAGS.fake_storage: return - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo vblade-persist auto all") - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo vblade-persist start all") @defer.inlineCallbacks def _init_volume_group(self): if FLAGS.fake_storage: return - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo pvcreate %s" % (FLAGS.storage_dev)) - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo vgcreate %s %s" % (FLAGS.volume_group, FLAGS.storage_dev)) @@ -241,14 +241,14 @@ class Volume(datastore.BasicModel): sizestr = '100M' else: sizestr = '%sG' % self['size'] - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo lvcreate -L %s -n %s %s" % (sizestr, self['volume_id'], FLAGS.volume_group)) @defer.inlineCallbacks def _delete_lv(self): - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo lvremove -f %s/%s" % (FLAGS.volume_group, self['volume_id'])) @@ -262,7 +262,7 @@ class Volume(datastore.BasicModel): @defer.inlineCallbacks def _exec_export(self): - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo vblade-persist setup %s %s %s /dev/%s/%s" % (self['shelf_id'], self['blade_id'], @@ -272,10 +272,10 @@ class Volume(datastore.BasicModel): @defer.inlineCallbacks def _remove_export(self): - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo vblade-persist stop %s %s" % (self['shelf_id'], self['blade_id'])) - yield process.SharedPool().simple_execute( + yield process.simple_execute( "sudo vblade-persist destroy %s %s" % (self['shelf_id'], self['blade_id'])) |