Merge lp:~hopem/charms/trusty/ceph-radosgw/lp1449279-stable-backport into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/trunk

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

LGTM, Approved

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-01-15 15:43:50 +0000
+++ hooks/hooks.py	2015-04-29 13:38:38 +0000
@@ -199,11 +199,9 @@
     hosts = []
     for relid in relation_ids('mon'):
         for unit in related_units(relid):
-            hosts.append(
-                '{}:6789'.format(get_host_ip(
-                    relation_get('private-address',
-                                 unit, relid)))
-            )
+            host_ip = get_host_ip(relation_get('ceph-public-address',
+                                               unit, relid))
+            hosts.append('{}:6789'.format(host_ip))
 
     hosts.sort()
     return hosts

=== modified file 'unit_tests/test_hooks.py'
--- unit_tests/test_hooks.py	2015-03-30 17:04:31 +0000
+++ unit_tests/test_hooks.py	2015-04-29 13:38:38 +0000
@@ -213,8 +213,13 @@
     def test_get_mon_hosts(self):
         self.relation_ids.return_value = ['monrelid']
         self.related_units.return_value = ['monunit']
-        self.relation_get.return_value = '10.0.0.1'
-        self.get_host_ip.return_value = '10.0.0.1'
+
+        def rel_get(k, *args):
+            return {'private-address': '127.0.0.1',
+                    'ceph-public-address': '10.0.0.1'}[k]
+
+        self.relation_get.side_effect = rel_get
+        self.get_host_ip.side_effect = lambda x: x
         self.assertEquals(ceph_hooks.get_mon_hosts(), ['10.0.0.1:6789'])
 
     def test_get_conf(self):

=== modified file 'unit_tests/test_utils.py'
--- unit_tests/test_utils.py	2015-03-30 17:04:31 +0000
+++ unit_tests/test_utils.py	2015-04-29 13:38:38 +0000
@@ -25,7 +25,7 @@
 
     if not config:
         logging.error('Could not find config.yaml in any parent directory '
-                      'of %s. ' % file)
+                      'of %s. ' % f)
         raise Exception
 
     return yaml.safe_load(open(config).read())['options']