Merge lp:~michael.nelson/charms/trusty/elasticsearch/elasticsearch2-with-xenial-support into lp:~onlineservices-charmers/charms/trusty/elasticsearch/elasticsearch2

[Michael Nelson]

Update to support Xenial (where python2 is not installed by default)

Two changes to enable xenial deploys (without breaking trusty deploys):
 * Ensure python-minimal and python-yaml are installed *before* the install hook is run
 * Ensure openjdk-8-jre is used on xenial (trusty has 7)

When testing I also saw that the firewall setup, run during install, was sometimes curling localhost:9200 before it was available - so I added a wait there too.

I've not yet had a chance to test this on anything other than a local provider, but will do so next week.

If this passes tests etc., I'd also like to push this to:

https://code.launchpad.net/~onlineservices-charmers/charms/xenial/elasticsearch/trunk

as well (and not diverge the charm for the trusty/xenial versions - at least not yet as it's not necessary).

Historical note: online-services initially maintained the elasticsearch branch, but when ES 2.0 was released, there were backwards incompatible changes, so we created and additionally maintained the elasticsearch2 branch which is targeted in the MP. Independently, Charles and Marco then landed ES2.0 support to the original elasticsearch branch (breaking 1.0 support), so the two have diverged slightly.

Unmerged revisions

46. By Michael Nelson on 2017-01-20

Support xenial as well as trusty installations

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-10-27 22:30:30 +0000
+++ hooks/hooks.py	2017-01-20 07:02:23 +0000
@@ -97,4 +97,9 @@
 
 
 if __name__ == "__main__":
+    # Ensure if the hooks/hooks.py has been called directly that we treat
+    # it as an install hook.
+    if sys.argv[0] == 'hooks/hooks.py':
+        sys.argv[0] = 'hooks/install'
+
     hooks.execute(sys.argv)

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2017-01-20 07:02:23 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+
+# Ensure /usr/bin/python is available (for xenial support with current
+# python2 charm).
+apt-get install --assume-yes python-minimal python-yaml
+hooks/hooks.py

=== removed symlink 'hooks/install'
=== target was u'hooks.py'
=== modified file 'tasks/install-elasticsearch.yml'
--- tasks/install-elasticsearch.yml	2015-11-20 03:06:23 +0000
+++ tasks/install-elasticsearch.yml	2017-01-20 07:02:23 +0000
@@ -16,7 +16,7 @@
     state: present
   when: apt_repository != ""
 
-- name: Install dependent packages.
+- name: Install dependent packages for trusty or other non-xenial.
   apt: pkg={{ item }} state=latest update_cache=yes
   tags:
     - install
@@ -24,6 +24,17 @@
   with_items:
     - openjdk-7-jre-headless
     - ufw
+  when: ansible_distribution_major_version != "16"
+
+- name: Install dependent packages for xenial.
+  apt: pkg={{ item }} state=latest update_cache=yes
+  tags:
+    - install
+    - upgrade-charm
+  with_items:
+    - openjdk-8-jre-headless
+    - ufw
+  when: ansible_distribution_major_version == "16"
 
 - name: Check for local elasticsearch.deb in payload.
   stat: path=files/elasticsearch.deb

=== modified file 'tasks/setup-ufw.yml'
--- tasks/setup-ufw.yml	2014-10-31 03:43:31 +0000
+++ tasks/setup-ufw.yml	2017-01-20 07:02:23 +0000
@@ -40,6 +40,9 @@
   with_items: relations["peer"]
   when: firewall_enabled
 
+- name: Wait until the local service is available
+  wait_for: port=9200
+
 # Only deny incoming on 9300 once the unit is part of a cluster.
 - name: Record current cluster health
   uri: url=http://localhost:9200/_cluster/health return_content=yes