Merge lp:~james-page/charms/trusty/neutron-calico/etcd-proxy into lp:~project-calico/charms/trusty/neutron-calico/trunk

[James Page]

Switch to using etcd charm with non-ambiguous relation type.

[lp:~james-page/charms/trusty/neutron-calico/etcd-proxy]

58. By James Page on 2015-07-16

Update to correct interface name, not type

[Cory Benfield (cory-benfield)]

Thanks for this James!

Right now I'm holding off on merging this until I've arranged with the OIL to do a managed transition to a new bundle, which will hopefully be in the next couple of days.

[James Page (james-page)]

Awesome; once we have these changes landed, I'm +1 on all of the charm work to support Calico!

[Cory Benfield (cory-benfield)]

Ok, this merge request was superseded by this one[0], which has now been merged. That one contains a few extra changes, and is the one that has been tested by the OIL.

Looks like we're back to you to re-review the outstanding Calico bugs for the charms!

[0]: https://code.launchpad.net/~project-calico/charms/trusty/neutron-calico/next/+merge/268709

Unmerged revisions

58. By James Page on 2015-07-16

Update to correct interface name, not type

57. By James Page on 2015-07-16

Switch to using offical etcd charm for etcd-proxy

=== modified file 'hooks/neutron_calico_context.py'
--- hooks/neutron_calico_context.py	2015-04-23 12:38:43 +0000
+++ hooks/neutron_calico_context.py	2015-07-16 15:49:41 +0000
@@ -105,24 +105,17 @@
 
 
 class EtcdContext(context.OSContextGenerator):
-    interfaces = ['http']
+    interfaces = ['etcd-peer']
 
     def __call__(self):
         peers = []
-        ctxt = {'cluster': ''}
+        ctxt = {}
 
         for rid in relation_ids('etcd-peer'):
             for unit in related_units(rid):
                 rdata = relation_get(rid=rid, unit=unit)
-                peers.append({
-                    'ip': rdata.get('ip'),
-                    'port': rdata.get('port'),
-                    'name': rdata.get('name'),
-                })
-
-        cluster_string = ','.join(
-            '{name}=http://{ip}:{port}'.format(**p) for p in peers
-        )
-        ctxt['cluster'] = cluster_string
+                if rdata.get('cluster'):
+                    ctxt['cluster'] = rdata.get('cluster')
+                    break
 
         return ctxt

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-04-16 12:41:16 +0000
+++ metadata.yaml	2015-07-16 15:49:41 +0000
@@ -31,7 +31,7 @@
   bgp-route-reflector:
     interface: bgp-route-reflector
   etcd-peer:
-    interface: http
+    interface: etcd-proxy
 peers:
   cluster:
     interface: neutron-calico-ha