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

[Charles Butler]

Updates init template to include a local host binding

[Charles Butler (lazypower)]

This appears to have pulled in a prior merge that hasn't quite landed,

Not sure what happened as that MP is not listed as active against the charmers branch of the charm. Please address this MP as required, noting that the included fix was to correct an issue where leader election is not available in older releases of Juju, and this adds behavior to correctly notify the user that leader election is not available.

[lp:~kubernetes/charms/trusty/etcd/trunk]

19. By Matt Bruzek on 2015-09-22

The run method is on the unit object not sentry.

[Matt Bruzek (mbruzek)]

+1 LGTM Tests pass now.

review: Approve

=== modified file 'README.md'
--- README.md	2015-07-17 14:48:11 +0000
+++ README.md	2015-09-22 16:27:05 +0000
@@ -51,11 +51,17 @@
     juju action fetch <uuid>
 
 
+## Usage Caveats
+
+This charm requires Leader Election, which is a feature of Juju >= 1.23.2. The
+charm will panic and refuse to continue if the leader_election binary is not
+found. Please take care when deploying this charm on older versions of Juju.
+
 ## Credits
 
 The etcd charm was originally written by Kapil Thangavelu ([@kapilt](https://github.com/kapilt)).
 
-#### Mantainers:
+#### Maintainers:
 
 The kubernetes team maintains this charm:
   - Whit Morriss &lt;[e-mail]&gt;

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-07-24 19:30:09 +0000
+++ hooks/hooks.py	2015-09-22 16:27:05 +0000
@@ -16,11 +16,18 @@
 hook_data = unitdata.HookData()
 db = unitdata.kv()
 
-leader_status = check_output(['is-leader']).rstrip() != "False"
 private_address = hookenv.unit_get('private-address')
 public_address = hookenv.unit_get('private-address')
 unit_name = environ['JUJU_UNIT_NAME'].replace('/', '')
 
+try:
+    leader_status = hookenv.is_leader()
+except NotImplementedError:
+    hookenv.log('This charm requires Leader Election. Juju >= 1.23.2.'
+                ' Leader election binary not found, Panic and exit!',
+                'CRITICAL')
+    sys.exit(1)
+
 
 @hooks.hook('config-changed')
 def config_changed():

=== modified file 'templates/etcd.conf.jinja2'
--- templates/etcd.conf.jinja2	2015-07-13 16:56:39 +0000
+++ templates/etcd.conf.jinja2	2015-09-22 16:27:05 +0000
@@ -11,7 +11,7 @@
 exec /opt/etcd/etcd \
         --initial-advertise-peer-urls http://{{private_address}}:7001 \
         --listen-peer-urls http://{{private_address}}:7001 \
-        --listen-client-urls http://{{private_address}}:4001 \
+        --listen-client-urls http://127.0.0.1:4001,http://{{private_address}}:4001 \
         --advertise-client-urls http://{{private_address}}:4001 \
         --initial-cluster-token {{token}} \
         --initial-cluster-state {{cluster_state}} \

=== modified file 'tests/10-deploy'
--- tests/10-deploy	2015-07-13 16:56:39 +0000
+++ tests/10-deploy	2015-09-22 16:27:05 +0000
@@ -26,8 +26,8 @@
         self.deployment.add_unit('etcd')
         self.deployment.sentry.wait()
 
-        status1 = self.deployment.sentry['etcd/0'].run('service etcd status')
-        status2 = self.deployment.sentry['etcd/1'].run('service etcd status')
+        status1 = self.deployment.sentry.unit['etcd/0'].run('service etcd status')
+        status2 = self.deployment.sentry.unit['etcd/1'].run('service etcd status')
         self.assertTrue("running" in status1[0])
         self.assertTrue("running" in status2[0])