From 70ac0dfea7a55c3580d4a9cd65752f894dfaa222 Mon Sep 17 00:00:00 2001
From: Josh Durgin <joshd@hq.newdream.net>
Date: Wed, 12 Jan 2011 10:17:48 -0800
Subject: Check for whole pool name in check_for_setup_error

---
 nova/volume/driver.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/volume/driver.py b/nova/volume/driver.py
index fa914f662..609a00310 100644
--- a/nova/volume/driver.py
+++ b/nova/volume/driver.py
@@ -322,7 +322,8 @@ class RBDDriver(VolumeDriver):
     def check_for_setup_error(self):
         """Returns an error if prerequisites aren't met"""
         (stdout, stderr) = self._execute("rados lspools")
-        if stdout.find(FLAGS.rbd_pool + "\n") == -1:
+        pools = stdout.split("\n")
+        if not FLAGS.rbd_pool in pools:
             raise exception.Error(_("rbd has no pool %s") %
                                   FLAGS.rbd_pool)
 
-- 
cgit