openstack/charm-swift-proxy
Code Issues Proposed changes

synced l/e charm-helpers to get migration patch

Browse Source
This commit is contained in:
Edward Hope-Morley
2015-04-01 19:29:55 +01:00
parent b4c5956f6c
commit 57c7d7d5e8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/charmhelpers/contrib/peerstorage/__init__.py
View File

@@ -68,10 +68,12 @@ def leader_get(attribute=None):
If a setting is not extant in the leader-get but us on the relation-get If a setting is not extant in the leader-get but us on the relation-get
peer rel, it is migrated and marked as such so that it is not re-migrated. peer rel, it is migrated and marked as such so that it is not re-migrated.
""" """
settings = _leader_get(attribute=attribute) or {} settings = _leader_get(attribute=attribute)
if not is_leader():
return settings
settings_migrated = False settings_migrated = False
migration_key = '__leader_get_migrated_settings__' migration_key = '__leader_get_migrated_settings__'
if attribute: if attribute:
migrated = _leader_get(attribute=migration_key) migrated = _leader_get(attribute=migration_key)
if migrated: if migrated: