Merge lp:~gandelman-a/charms/precise/keystone/endpoint_reconfig into lp:~charmers/charms/precise/keystone/trunk

[Adam Gandelman]

Allows existing endpoint templates to be reconfigured based on new input from relation settings. This is especially useful (and required) for allowing services to reconfigure their catalog entry based on the existence of an external load balancer (haproxy).

[James Page (james-page)]

Hi Adam

LGTM - I was not able to test the reconfiguration stuff as we don't have any charms that do this yet but the changes don't appear to impact the existing function so +1.

Cheers

James

review: Approve

=== modified file 'hooks/keystone-hooks'
--- hooks/keystone-hooks	2012-10-12 17:26:48 +0000
+++ hooks/keystone-hooks	2012-10-28 10:48:21 +0000
@@ -120,14 +120,14 @@
             realtion_set({ "admin_token": -1 })
             return
 
-    def add_endpoint(region, service, public_url, admin_url, internal_url):
+    def add_endpoint(region, service, publicurl, adminurl, internalurl):
         desc = valid_services[service]["desc"]
         service_type = valid_services[service]["type"]
         create_service_entry(service, service_type, desc)
         create_endpoint_template(region=region, service=service,
-                                 public_url=public_url,
-                                 admin_url=admin_url,
-                                 internal_url=internal_url)
+                                 publicurl=publicurl,
+                                 adminurl=adminurl,
+                                 internalurl=internalurl)
 
     settings = relation_get_dict(relation_id=relation_id,
                                  remote_unit=remote_unit)
@@ -145,9 +145,9 @@
 
         ensure_valid_service(settings['service'])
         add_endpoint(region=settings['region'], service=settings['service'],
-                     public_url=settings['public_url'],
-                     admin_url=settings['admin_url'],
-                     internal_url=settings['internal_url'])
+                     publicurl=settings['public_url'],
+                     adminurl=settings['admin_url'],
+                     internalurl=settings['internal_url'])
         service_username = settings['service']
     else:
         # assemble multiple endpoints from relation data. service name
@@ -182,9 +182,9 @@
                 ep = endpoints[ep]
                 ensure_valid_service(ep['service'])
                 add_endpoint(region=ep['region'], service=ep['service'],
-                             public_url=ep['public_url'],
-                             admin_url=ep['admin_url'],
-                             internal_url=ep['internal_url'])
+                             publicurl=ep['public_url'],
+                             adminurl=ep['admin_url'],
+                             internalurl=ep['internal_url'])
                 services.append(ep['service'])
         service_username = '_'.join(services)
 

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2012-10-03 00:36:25 +0000
+++ hooks/utils.py	2012-10-28 10:48:21 +0000
@@ -264,8 +264,8 @@
                                 description=service_desc)
     juju_log("Created new service entry '%s'" % service_name)
 
-def create_endpoint_template(region, service,  public_url, admin_url,
-                             internal_url):
+def create_endpoint_template(region, service,  publicurl, adminurl,
+                             internalurl):
     """ Create a new endpoint template for service if one does not already
         exist matching name *and* region """
     import manager
@@ -276,13 +276,24 @@
         if ep['service_id'] == service_id and ep['region'] == region:
             juju_log("Endpoint template already exists for '%s' in '%s'"
                       % (service, region))
-            return
+
+            up_to_date = True
+            for k in ['publicurl', 'adminurl', 'internalurl']:
+                if ep[k] != locals()[k]:
+                    up_to_date = False
+
+            if up_to_date:
+                return
+            else:
+                # delete endpoint and recreate if endpoint urls need updating.
+                juju_log("Updating endpoint template with new endpoint urls.")
+                manager.api.endpoints.delete(ep['id'])
 
     manager.api.endpoints.create(region=region,
                                  service_id=service_id,
-                                 publicurl=public_url,
-                                 adminurl=admin_url,
-                                 internalurl=internal_url)
+                                 publicurl=publicurl,
+                                 adminurl=adminurl,
+                                 internalurl=internalurl)
     juju_log("Created new endpoint template for '%s' in '%s'" %
                 (region, service))
 

=== modified file 'revision'
--- revision	2012-10-12 17:26:48 +0000
+++ revision	2012-10-28 10:48:21 +0000
@@ -1,1 +1,1 @@
-163
+164