Merge "Gnocchi DB is skipped if ceilometer is disabled"

This commit is contained in:
Jenkins
2016-04-26 14:15:09 +00:00
committed by Gerrit Code Review

View File

@@ -122,10 +122,14 @@ def create_manifest(config, messages):
append_for("keystone", suffix)
for mod in ['nova', 'cinder', 'glance', 'neutron', 'heat', 'sahara',
'trove', 'ironic', 'manila', 'gnocchi']:
'trove', 'ironic', 'manila']:
if config['CONFIG_%s_INSTALL' % mod.upper()] == 'y':
append_for(mod, suffix)
if (config['CONFIG_GNOCCHI_INSTALL'] == 'y' and
config['CONFIG_CEILOMETER_INSTALL'] == 'y'):
append_for('gnocchi', suffix)
hosts = filtered_hosts(config, exclude=False, dbhost=True)
fw_details = dict()