Merge lp:~1chb1n/charm-helpers/os-amulet-keystone-ip into lp:charm-helpers

[Ryan Beisner]

Update OpenStack Amulet helper to get keystone address from sentry info instead of relation data

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2016-09-11 03:28:39 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2016-10-04 04:46:39 +0000
@@ -306,10 +306,8 @@
                                   password, tenant):
         """Authenticates admin user with cinder."""
         # NOTE(beisner): cinder python client doesn't accept tokens.
-        service_ip = \
-            keystone_sentry.relation('shared-db',
-                                     'mysql:shared-db')['private-address']
-        ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8'))
+        keystone_ip = keystone_sentry.info['private-address']
+        ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8'))
         return cinder_client.Client(username, password, tenant, ept)
 
     def authenticate_keystone_admin(self, keystone_sentry, user, password,
@@ -319,8 +317,8 @@
         self.log.debug('Authenticating keystone admin...')
         unit = keystone_sentry
         if not keystone_ip:
-            keystone_ip = unit.relation('shared-db',
-                                        'mysql:shared-db')['private-address']
+            keystone_ip = keystone_sentry.info['private-address']
+
         base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8'))
         if not api_version or api_version == 2:
             ep = base_ep + "/v2.0"