openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

fixes in upgrade

This commit is contained in:
yolanda.robla@canonical.com 2014-03-03 10:31:10 +01:00
parent 450209e199
commit b6c982fe69
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hooks/rabbitmq_server_relations.py
View File

@ -406,10 +406,6 @@ def upgrade_charm():
if f.endswith('.passwd'):
s = os.path.join('/var/lib/juju', f)
d = os.path.join('/var/lib/rabbitmq', f)
utils.juju_log('INFO',
'upgrade_charm: Migrating stored passwd'
' from %s to %s.' % (s, d))
shutil.move(s, d)
# propagate to cluster if needed
if cluster_rid:
@ -419,9 +415,14 @@ def upgrade_charm():
if password is None:
with open(s, 'r') as h:
stored_password = h.read()
if stored_password:
hookenv.relation_set(relation_id=cluster_rid,
relation_settings={username: stored_password})
if stored_password:
hookenv.relation_set(relation_id=cluster_rid,
relation_settings={username: stored_password})
utils.juju_log('INFO',
'upgrade_charm: Migrating stored passwd'
' from %s to %s.' % (s, d))
shutil.move(s, d)
# explicitly update buggy file name naigos.passwd
old = os.path.join('var/lib/rabbitmq', 'naigos.passwd')