diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-08-23 14:36:14 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-08-23 14:36:14 -0700 |
| commit | 157ef10b3048f0bb26ce0909d77698ffb37e45df (patch) | |
| tree | 9e9c608678d7828526b93a0ac8a6b9d9ee0eea8a /nova/volume | |
| parent | 78c2175898a468ae734e27dfbc8f5b70f90fd477 (diff) | |
| parent | cfe3b2a6dd73e56652f99a573c1bb0abe5a648d4 (diff) | |
merged trunk and fixed merge errors
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/service.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nova/volume/service.py b/nova/volume/service.py index 513c5edae..37781252a 100644 --- a/nova/volume/service.py +++ b/nova/volume/service.py @@ -122,7 +122,7 @@ class VolumeService(service.Service): "sudo lvcreate -L %s -n %s %s" % (sizestr, volume_id, FLAGS.volume_group), - error_ok=1) + terminate_on_stderr=False) @defer.inlineCallbacks def _exec_delete_volume(self, volume_id): @@ -130,7 +130,8 @@ class VolumeService(service.Service): defer.returnValue(None) yield process.simple_execute( "sudo lvremove -f %s/%s" % (FLAGS.volume_group, - volume_id), error_ok=1) + volume_id), + terminate_on_stderr=False) @defer.inlineCallbacks def _exec_create_export(self, volume_id, shelf_id, blade_id): @@ -143,7 +144,8 @@ class VolumeService(service.Service): blade_id, FLAGS.aoe_eth_dev, FLAGS.volume_group, - volume_id), error_ok=1) + volume_id), + terminate_on_stderr=False) @defer.inlineCallbacks def _exec_remove_export(self, _volume_id, shelf_id, blade_id): @@ -151,18 +153,22 @@ class VolumeService(service.Service): defer.returnValue(None) yield process.simple_execute( "sudo vblade-persist stop %s %s" % (self, shelf_id, - blade_id), error_ok=1) + blade_id), + terminate_on_stderr=False) yield process.simple_execute( "sudo vblade-persist destroy %s %s" % (self, shelf_id, - blade_id), error_ok=1) + blade_id), + terminate_on_stderr=False) @defer.inlineCallbacks def _exec_ensure_exports(self): if FLAGS.fake_storage: defer.returnValue(None) # NOTE(vish): these commands sometimes sends output to stderr for warnings - yield process.simple_execute("sudo vblade-persist auto all", error_ok=1) - yield process.simple_execute("sudo vblade-persist start all", error_ok=1) + yield process.simple_execute("sudo vblade-persist auto all", + terminate_on_stderr=False) + yield process.simple_execute("sudo vblade-persist start all", + terminate_on_stderr=False) @defer.inlineCallbacks def _exec_init_volumes(self): |