x
/
packstack
Code Issues Proposed changes

[Provision] Don't provision glance images if Glance wasn't installed 

Change-Id: I307a1c273d3a410edd69eade880b93ccddb17ae6
Resolves: rhbz#1175726
This commit is contained in:
Lukas Bezdicka 2014-12-18 14:38:41 +01:00
parent c3828202e7
commit 665d11a077
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packstack/plugins/provision_700.py
View File

@ -292,16 +292,17 @@ def create_demo_manifest(config, messages):
def create_storage_manifest(config, messages):
if config['CONFIG_UNSUPPORTED'] != 'y':
config['CONFIG_STORAGE_HOST'] = config['CONFIG_CONTROLLER_HOST']
if config['CONFIG_GLANCE_INSTALL'] == 'y':
if config['CONFIG_UNSUPPORTED'] != 'y':
config['CONFIG_STORAGE_HOST'] = config['CONFIG_CONTROLLER_HOST']
if config['CONFIG_PROVISION_TEMPEST']:
template = "provision_tempest_glance"
else:
template = "provision_demo_glance"
manifest_file = '%s_provision_glance' % config['CONFIG_STORAGE_HOST']
manifest_data = getManifestTemplate(template)
appendManifestFile(manifest_file, manifest_data)
if config['CONFIG_PROVISION_TEMPEST']:
template = "provision_tempest_glance"
else:
template = "provision_demo_glance"
manifest_file = '%s_provision_glance' % config['CONFIG_STORAGE_HOST']
manifest_data = getManifestTemplate(template)
appendManifestFile(manifest_file, manifest_data)
def create_tempest_manifest(config, messages):