Merge lp:~lazypower/charms/trusty/etcd/trunk into lp:charms/trusty/etcd

[Charles Butler]

Updates to ETCD client realtionship behavior to match the emerging blueprint in interface:etcd interface layer.

https://github.com/chuckbutler/interface-etcd

[Matt Bruzek (mbruzek)]

+1 LGTM

review: Approve

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2261/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/2240/

review: Approve (automated testing)

=== added file 'hooks/client-relation-changed'
--- hooks/client-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/client-relation-changed	2016-01-19 21:20:53 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -ex
+
+leader=$(is-leader)
+if [[ $leader == True ]]; then
+  connection_string=$(chlp unitdata get etcd.connection_string)
+  # maintain some backwords compatibility with the existing interface until it
+  # is phased out w/ the layer rewrite.
+  relation-set connection_string=$connection_string port=4001 public_address=`unit-get public-address`
+fi

=== modified file 'hooks/client-relation-joined'
--- hooks/client-relation-joined	2014-08-31 20:16:26 +0000
+++ hooks/client-relation-joined	2016-01-19 21:20:53 +0000
@@ -1,3 +1,10 @@
 #!/bin/bash
 set -ex
-relation-set port=4001 hostname=`unit-get private-address` public_hostname=`unit-get public-address`
+
+leader=$(is-leader)
+if [[ $leader == True ]]; then
+  connection_string=$(chlp unitdata get etcd.connection_string)
+  # maintain some backwords compatibility with the existing interface until it
+  # is phased out w/ the layer rewrite.
+  relation-set connection_string=$connection_string port=4001 public_address=`unit-get public-address`
+fi

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-01-13 21:49:59 +0000
+++ hooks/hooks.py	2016-01-19 21:20:53 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 from charmhelpers.core import hookenv
+from charmhelpers.core.hookenv import unit_get
+from charmhelpers.core.hookenv import is_leader
 from charmhelpers.core import unitdata
 from charmhelpers.core import templating
 from charmhelpers.core import host
@@ -118,6 +120,7 @@
     cluster_rels = hook_data.rels['cluster'][1].keys()
     # introspect the cluster, and form the cluster string.
     # https://github.com/coreos/etcd/blob/master/Documentation/configuration.md#-initial-cluster
+    client_cluster = ['http://{}:7001'.format(unit_get('private-address'))]
     if hook_data.rels['cluster'][1]:
         reldata = hook_data.rels['cluster'][1][cluster_rels[0]]
         for unit in reldata:
@@ -125,9 +128,14 @@
             cluster = '{}{}=http://{}:7001,'.format(cluster,
                                                     unit.replace('/', ''),
                                                     private)
+            client_cluster.append('http://{}:7001'.format(private))
     else:
         cluster = "{}=http://{}:7001".format(unit_name, private_address)
 
+    # Only the leader will be communicating with clients. Because he is
+    # the grand poobah of Juju's ETCD story. The end.
+    if is_leader():
+        db.set('etcd.connection_string', ','.join(client_cluster))
     return cluster.rstrip(',')