diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2010-08-18 22:19:39 +0100 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2010-08-18 22:19:39 +0100 |
| commit | 7e403e381612e5678aa8f2b9e714d472ba4b3ef0 (patch) | |
| tree | 42ab3a79579184a49249d99e3b77c5efc535b1e2 /nova | |
| parent | d8f8d121a00173cb3f5fb5e496cc010dc179cf19 (diff) | |
| download | nova-7e403e381612e5678aa8f2b9e714d472ba4b3ef0.tar.gz nova-7e403e381612e5678aa8f2b9e714d472ba4b3ef0.tar.xz nova-7e403e381612e5678aa8f2b9e714d472ba4b3ef0.zip | |
Fix to better reflect (my believed intent) as to the meaning of error_ok (ignore stderr vs accept failure)
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/volume/service.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/volume/service.py b/nova/volume/service.py index bf803eaf6..be62f621d 100644 --- a/nova/volume/service.py +++ b/nova/volume/service.py @@ -249,14 +249,14 @@ class Volume(datastore.BasicModel): "sudo lvcreate -L %s -n %s %s" % (sizestr, self['volume_id'], FLAGS.volume_group), - check_exit_code=True) + terminate_on_stderr=False) @defer.inlineCallbacks def _delete_lv(self): yield process.simple_execute( "sudo lvremove -f %s/%s" % (FLAGS.volume_group, self['volume_id']), - check_exit_code=True) + terminate_on_stderr=False) @property def __devices_key(self): @@ -285,7 +285,7 @@ class Volume(datastore.BasicModel): FLAGS.aoe_eth_dev, FLAGS.volume_group, self['volume_id']), - check_exit_code=True) + terminate_on_stderr=False) @defer.inlineCallbacks def _remove_export(self): @@ -299,11 +299,11 @@ class Volume(datastore.BasicModel): yield process.simple_execute( "sudo vblade-persist stop %s %s" % (self['shelf_id'], self['blade_id']), - check_exit_code=True) + terminate_on_stderr=False) yield process.simple_execute( "sudo vblade-persist destroy %s %s" % (self['shelf_id'], self['blade_id']), - check_exit_code=True) + terminate_on_stderr=False) class FakeVolume(Volume): |