Merge lp:~gnuoy/charms/trusty/percona-cluster/bug-1389670take2 into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/trunk

[Liam Young]

Don't store the allowed_units info in the peerdb as the information is available directly from the db

[Edward Hope-Morley (hopem)]

review: Needs Fixing

[Edward Hope-Morley (hopem)]

review: Needs Fixing

Unmerged revisions

44. By Liam Young on 2015-01-24

Fix local variable 'allowed_units' referenced before assignment

43. By Liam Young on 2015-01-24

Dont store allowed units in peerdb

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2014-12-17 18:59:55 +0000
+++ hooks/percona_hooks.py	2015-01-24 12:53:28 +0000
@@ -23,7 +23,6 @@
 from charmhelpers.core.host import (
     service_restart,
     file_hash,
-    write_file,
     lsb_release,
 )
 from charmhelpers.core.templating import render
@@ -287,8 +286,8 @@
         db_host = get_db_host(hostname)
         peer_store_and_set(relation_id=relation_id,
                            db_host=db_host,
-                           password=password,
-                           allowed_units=allowed_units)
+                           password=password)
+        relation_set(relation_id=relation_id, allowed_units=allowed_units)
     else:
         # Process multiple database setup requests.
         # from incoming relation data:
@@ -317,6 +316,7 @@
             databases[db][x] = v
 
         return_data = {}
+        allowed_units = []
         for db in databases:
             if singleset.issubset(databases[db]):
                 database = databases[db]['database']
@@ -334,9 +334,9 @@
                     password = configure_db(hostname, database, username)
 
                 return_data['_'.join([db, 'password'])] = password
-                return_data['_'.join([db, 'allowed_units'])] = \
-                    " ".join(unit_sorted(get_allowed_units(database,
-                                                           username)))
+                allowed_units = unit_sorted(get_allowed_units(database,
+                                                              username))
+                allowed_units = ' '.join(allowed_units)
                 db_host = get_db_host(hostname)
 
         if len(return_data) > 0:
@@ -344,6 +344,7 @@
                                **return_data)
             peer_store_and_set(relation_id=relation_id,
                                db_host=db_host)
+        relation_set(relation_id=relation_id, allowed_units=allowed_units)
 
     peer_store_and_set(relation_id=relation_id,
                        relation_settings={'access-network': access_network})