openstack/charm-glance
Code Issues Proposed changes

Ensure that migration only occurs when unit can assure that mysql has granted it permissions to access the database

Browse Source
This commit is contained in:
james.page@ubuntu.com
2015-04-21 16:07:19 +01:00
parent b4e2464b85
commit b47ceebd57
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
hooks/glance_relations.py
View File

@@ -164,18 +164,19 @@ def db_changed():
# acl entry has been added. So, if the db supports passing a list of
# permitted units then check if we're in the list.
allowed_units = relation_get('allowed_units')
if allowed_units and local_unit() not in allowed_units.split():
juju_log('Allowed_units list provided and this unit not present')
return
if rel == "essex":
status = call(['glance-manage', 'db_version'])
if status != 0:
juju_log('Setting version_control to 0')
cmd = ["glance-manage", "version_control", "0"]
check_call(cmd)
if allowed_units and local_unit() in allowed_units.split():
if rel == "essex":
status = call(['glance-manage', 'db_version'])
if status != 0:
juju_log('Setting version_control to 0')
cmd = ["glance-manage", "version_control", "0"]
check_call(cmd)
juju_log('Cluster leader, performing db sync')
migrate_database()
juju_log('Cluster leader, performing db sync')
migrate_database()
else:
juju_log('allowed_units either not presented, or local unit '
'not in acl list: %s' % allowed_units)
@hooks.hook('pgsql-db-relation-changed')