From 19acfbad5db83c20f6e6459f35b63600203ba09c Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Wed, 12 Dec 2012 16:14:31 -0500
Subject: [PATCH] Test to make sure that the cinder-volumes vg exists

---
 packstack/plugins/cinder_250.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packstack/plugins/cinder_250.py b/packstack/plugins/cinder_250.py
index f3592493f..a8bc17fc7 100644
--- a/packstack/plugins/cinder_250.py
+++ b/packstack/plugins/cinder_250.py
@@ -54,10 +54,20 @@ def initSequences(controller):
 
     cindersteps = [
              {'title': 'Adding Cinder Keystone Manifest entries', 'functions':[createkeystonemanifest]},
+             {'title': 'Checking if the Cinder server has a cinder-volumes vg', 'functions':[checkcindervg]},
              {'title': 'Creating Cinder Manifest', 'functions':[createmanifest]}
     ]
     controller.addSequence("Installing Cinder", [], [], cindersteps)
 
+def checkcindervg():
+    server = utils.ScriptRunner(controller.CONF['CONFIG_CINDER_HOST'])
+    server.append('vgdisplay cinder-volumes')
+    try:
+        server.execute()
+    except:
+        print "The cinder server should contain a cinder-volumes volume group"
+        raise
+
 def createkeystonemanifest():
     manifestfile = "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST']
     manifestdata = getManifestTemplate("keystone_cinder.pp")