Merge lp:~chad.smith/charms/precise/keystone/keystone-health-updates into lp:~openstack-charmers/charms/precise/keystone/ha-support

[Chad Smith]

Update health scripts with changes in how keystone internal service port numbers are now defined using cluster.determine_api_port

[Chad Smith (chad.smith)]

question on cluster.determine_api_port on HA passive versus active units. will determine_api_port return the public port on the leader versus the private private port on the passive unit?

[James Page (james-page)]

Determine API port will give you the port that the actual keystone service is listening on rather than the haproxy or the apache https port if configured.

[James Page (james-page)]

review: Approve

=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2013-03-19 13:50:23 +0000
+++ hooks/keystone_hooks.py	2013-03-27 15:45:33 +0000
@@ -372,8 +372,10 @@
         do_openstack_upgrade(config['openstack-origin'], ' '.join(packages))
 
     env_vars = {'OPENSTACK_SERVICE_KEYSTONE': 'keystone',
-                'OPENSTACK_PORT_ADMIN': config['admin-port'],
-                'OPENSTACK_PORT_PUBLIC': config['service-port']}
+                'OPENSTACK_PORT_ADMIN': cluster.determine_api_port(
+                    config['admin-port']),
+                'OPENSTACK_PORT_PUBLIC': cluster.determine_api_port(
+                    config['service-port'])}
     save_script_rc(**env_vars)
 
     set_admin_token(config['admin-token'])

=== modified file 'revision'
--- revision	2013-03-21 18:25:39 +0000
+++ revision	2013-03-27 15:45:33 +0000
@@ -1,1 +1,1 @@
-212
+213