diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-05 12:52:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-05 12:52:51 +0000 |
| commit | 7d2b17fa49c407f9742fad8d1814776ab70bf8da (patch) | |
| tree | 1a4e69e75bd57d35b191d0db0df39b2f4f48c70b | |
| parent | 07bbedcfb2ad6f0e677bc90af27a10c9023d2062 (diff) | |
| parent | 43e0b44db00b3aece584978dace0bcc84e0eef52 (diff) | |
| download | nova-7d2b17fa49c407f9742fad8d1814776ab70bf8da.tar.gz | |
Merge "Pass '-r' option to 'collie cluster status'." into stable/diablo
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | nova/volume/driver.py | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -43,6 +43,7 @@ Eldar Nugaev <reldan@oscloud.ru> Eric Day <eday@oddments.org> Eric Windisch <eric@cloudscaling.com> Ewan Mellor <ewan.mellor@citrix.com> +François Charlier <francois.charlier@enovance.com> Gabe Westmaas <gabe.westmaas@rackspace.com> Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> Hisaki Ohara <hisaki.ohara@intel.com> diff --git a/nova/volume/driver.py b/nova/volume/driver.py index e5bb498edb..bb5695684d 100644 --- a/nova/volume/driver.py +++ b/nova/volume/driver.py @@ -690,8 +690,11 @@ class SheepdogDriver(VolumeDriver): def check_for_setup_error(self): """Returns an error if prerequisites aren't met""" try: + #NOTE(francois-charlier) Since 0.24 'collie cluster info -r' + # gives short output, but for compatibility reason we won't + # use it and just check if 'running' is in the output. (out, err) = self._execute('collie', 'cluster', 'info') - if not out.startswith('running'): + if not 'running' in out.split(): raise exception.Error(_("Sheepdog is not working: %s") % out) except exception.ProcessExecutionError: raise exception.Error(_("Sheepdog is not working")) |