x/packstack
Code Issues Proposed changes

Force Glance installation when Nova is being installed.

Browse Source 
Change-Id: Ib2cd2a1f47c65cd68aa05306e8abf2e9bac7aa57
Fixes: rhbz#902485
This commit is contained in:
Martin Magr
2013-01-24 17:12:18 +01:00
parent cbce3ac0ef
commit 442c733431
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packstack/plugins/glance_200.py
View File

@@ -78,7 +78,11 @@ def initConfig(controllerObject):
def initSequences(controller): def initSequences(controller):
if controller.CONF['CONFIG_GLANCE_INSTALL'] != 'y': conf = controller.CONF
if conf['CONFIG_GLANCE_INSTALL'] != 'y':
if conf['CONFIG_NOVA_INSTALL'] == 'y':
raise RuntimeError('Glance is required to instal Nova properly. '
'Please set CONFIG_GLANCE_INSTALL=y')
return return
glancesteps = [ glancesteps = [
@@ -88,11 +92,11 @@ def initSequences(controller):
controller.addSequence("Installing Glance", [], [], glancesteps) controller.addSequence("Installing Glance", [], [], glancesteps)
def createkeystonemanifest(): def createkeystonemanifest():
manifestfile = "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST'] manifestfile = "%s_keystone.pp" % controller.CONF['CONFIG_KEYSTONE_HOST']
manifestdata = getManifestTemplate("keystone_glance.pp") manifestdata = getManifestTemplate("keystone_glance.pp")
appendManifestFile(manifestfile, manifestdata) appendManifestFile(manifestfile, manifestdata)
def createmanifest(): def createmanifest():
manifestfile = "%s_glance.pp"%controller.CONF['CONFIG_GLANCE_HOST'] manifestfile = "%s_glance.pp" % controller.CONF['CONFIG_GLANCE_HOST']
manifestdata = getManifestTemplate("glance.pp") manifestdata = getManifestTemplate("glance.pp")
appendManifestFile(manifestfile, manifestdata) appendManifestFile(manifestfile, manifestdata)