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

[Ryan Beisner]

Use public-address in OpenStack Amulet keystone address helper

'private-address' is not always present, even after a deployment is completely settled.

Here is a dump of all keys from sentry.info:

DEBUG:amulet-logger:['machine', 'open-ports', 'public-address', 'service', 'workload-status', 'agent-status', 'unit_name', 'agent-state', 'unit', 'agent-version']

Given that sentry.info is just a copy of the juju status yaml data, when juju status has no private-address to report, it is also not present.

More detail and an example at:

http://pastebin.ubuntu.com/23277010/

=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2016-10-04 14:04:01 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2016-10-04 21:58:31 +0000
@@ -306,7 +306,7 @@
                                   password, tenant):
         """Authenticates admin user with cinder."""
         # NOTE(beisner): cinder python client doesn't accept tokens.
-        keystone_ip = keystone_sentry.info['private-address']
+        keystone_ip = keystone_sentry.info['public-address']
         ept = "http://{}:5000/v2.0".format(keystone_ip.strip().decode('utf-8'))
         return cinder_client.Client(username, password, tenant, ept)
 
@@ -317,7 +317,7 @@
         self.log.debug('Authenticating keystone admin...')
         unit = keystone_sentry
         if not keystone_ip:
-            keystone_ip = keystone_sentry.info['private-address']
+            keystone_ip = keystone_sentry.info['public-address']
 
         base_ep = "http://{}:35357".format(keystone_ip.strip().decode('utf-8'))
         if not api_version or api_version == 2: