Merge ~jason-hobbs/postgresql-charm:fix-iteration-over-relations into postgresql-charm:master

[Jason Hobbs]

I hit this error in the charm upgrading one of my units today:

http://paste.ubuntu.com/25675410/

I tested this change and it fixed the issue.

[Greg Lutostanski (lutostag)]

review: Approve

[Stuart Bishop (stub)]

Ta. I think my upgrade test must be missing a relation or got skipped.

review: Approve

diff --git a/reactive/postgresql/upgrade.py b/reactive/postgresql/upgrade.py
index 494d192..d580935 100644
--- a/reactive/postgresql/upgrade.py
+++ b/reactive/postgresql/upgrade.py
@@ -114,7 +114,7 @@ def upgrade_charm():
 
     # Ensure client usernames and passwords match leader settings.
     for relname in ('db', 'db-admin'):
-        for rel in rels[relname]:
+        for rel in rels[relname].values():
             del rel.local['user']
             del rel.local['password']