Merge lp:~jamesbeedy/charm-elasticsearch/fixes_for_xenial_5_x into lp:charm-elasticsearch

[james beedy]

Updates for 5.x + xenial

[Thomas Cuthbert (tcuthbert)]

+1 LGTM

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2017-03-29 09:59:19 +0000
+++ hooks/hooks.py	2017-09-15 00:48:54 +0000
@@ -8,10 +8,8 @@
 from charmhelpers.core import hookenv
 import os
 import shutil
-import subprocess as sp
 
 mountpoint = '/srv/elasticsearch'
-config = hookenv.config()
 
 hooks = charmhelpers.contrib.ansible.AnsibleHooks(
     playbook_path='playbook.yaml',
@@ -36,14 +34,10 @@
     ])
 
 
[e-mail]('install', 'upgrade-charm')
-def install():
[e-mail]('install.real', 'upgrade-charm')
+def install_real():
     """Install ansible before running the tasks tagged with 'install'."""
     # Allow charm users to run preinstall setup.
-    if is_container:
-        config["env-vars"] = {"ES_SKIP_SET_KERNEL_PARAMETERS": "true"}
-    else:
-        config["env-vars"] = {}
     charmhelpers.payload.execd.execd_preinstall()
     charmhelpers.contrib.ansible.install_ansible_support(
         from_ppa=False)
@@ -103,14 +97,5 @@
     charmhelpers.core.host.service_start('elasticsearch')
 
 
-def is_container():
-    """Return True if system is running inside a container"""
-    virt_type = sp.check_output('systemd-detect-virt').decode().strip()
-    if virt_type == 'lxc':
-        return True
-    else:
-        return False
-
-
 if __name__ == "__main__":
     hooks.execute(sys.argv)
 
=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2017-09-15 00:48:54 +0000
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Wrapper to deal with older Ubuntu versions that don't have py3 installed
+# by default.
+
+declare -a DEPS=('python3' 'python3-dnspython' 'python3-netifaces' 'python-dnspython')
+
+check_and_install() {
+    pkg="${1}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${dep}
+done
+
+exec ./hooks/install.real
 
=== added symlink 'hooks/install.real'
=== target is u'hooks.py'
=== modified file 'playbook.yaml'
--- playbook.yaml	2016-09-02 18:52:15 +0000
+++ playbook.yaml	2017-09-15 00:48:54 +0000
@@ -19,7 +19,7 @@
     - include: tasks/peer-relations.yml
     - include: tasks/setup-ufw.yml
       tags:
-        - install
+        - install.real
         - upgrade-charm
         - config-changed
         - client-relation-joined
@@ -92,4 +92,3 @@
         - peer-relation-joined
         - peer-relation-departed
         - start
-
 
=== modified file 'tasks/install-elasticsearch.yml'
--- tasks/install-elasticsearch.yml	2017-03-29 09:59:19 +0000
+++ tasks/install-elasticsearch.yml	2017-09-15 00:48:54 +0000
@@ -1,14 +1,14 @@
 - name: Add apt key.
   tags:
-    - install
+    - install.real
     - upgrade-charm
     - config-changed
-  apt_key: url={{ apt_key_url }} state=present id={{gpg_key_id}}
+  apt_key: url={{ apt_key_url }} state=present id={{gpg_key_id}} validate_certs=no
   when: apt_key_url != ""
 
 - name: Add apt archive.
   tags:
-    - install
+    - install.real
     - upgrade-charm
     - config-changed
   apt_repository:
@@ -16,34 +16,42 @@
     state: present
   when: apt_repository != ""
 
+- name: Add java apt archive for trusty only.
+  tags:
+    - install.real
+    - upgrade-charm
+    - config-changed
+  apt_repository:
+    repo: "ppa:openjdk-r/ppa"
+    state: present
+  when: ansible_distribution_release == 'trusty'
+
 - name: Install dependent packages.
   apt: pkg={{ item }} state=latest update_cache=yes
   tags:
-    - install
+    - install.real
     - upgrade-charm
   with_items:
-    - default-jre-headless
+    - openjdk-8-jre-headless
     - ufw
 
 - name: Check for local elasticsearch.deb in payload.
   stat: path=files/elasticsearch.deb
   register: stat_elasticsearch_deb
   tags:
-    - install
+    - install.real
     - upgrade-charm
 
 - name: Install elasticsearch from repository
   apt: pkg=elasticsearch state=latest update_cache=yes
-  environment: "{{ env_vars }}"
   tags:
-    - install
+    - install.real
     - upgrade-charm
   when: stat_elasticsearch_deb.stat.exists == false and apt_repository != ""
 
 - name: Install ElasticSearch from payload
   command: dpkg -i {{ charm_dir }}/files/elasticsearch.deb
-  environment: "{{ env_vars }}"
   tags:
-    - install
+    - install.real
     - upgrade-charm
   when: stat_elasticsearch_deb.stat.exists == true
 
=== modified file 'tasks/setup-ufw.yml'
--- tasks/setup-ufw.yml	2014-10-31 03:43:31 +0000
+++ tasks/setup-ufw.yml	2017-09-15 00:48:54 +0000
@@ -27,8 +27,8 @@
   when: firewall_enabled
 
 - name: Open the firewall for all clients
-  ufw: rule=allow src={{ lookup('dns', item['private-address']) }} port=9200 proto=tcp
-  with_items: relations["client"]
+  ufw: rule=allow src="{{lookup('dig', item.get('address', ''))}}" port=9200 proto=tcp
+  with_items: "{{relations['client']}}"
   when: firewall_enabled
 
 - name: Deny all other requests on 9200
@@ -36,8 +36,8 @@
   when: firewall_enabled
 
 - name: Open the firewall for all peers
-  ufw: rule=allow src={{ lookup('dns', item['private-address']) }} port=9300 proto=tcp
-  with_items: relations["peer"]
+  ufw: rule=allow src="{{lookup('dig', item.get('address', ''))}}" port=9300 proto=tcp
+  with_items: "{{relations['peer']}}"
   when: firewall_enabled
 
 # Only deny incoming on 9300 once the unit is part of a cluster.
 
=== modified file 'templates/elasticsearch.yml'
--- templates/elasticsearch.yml	2017-07-26 03:30:57 +0000
+++ templates/elasticsearch.yml	2017-09-15 00:48:54 +0000
@@ -4,9 +4,16 @@
 cluster.name: {{ cluster_name }}
 http.port: 9200
 network.host: ["_site_", "_local_"]
-{% if (relations.peer is defined) and relations.peer %}
+{% if not '5' in apt_repository %}
+discovery.zen.ping.multicast.enabled: false
+{% endif %}
+{% if relations.peer is defined and relations.peer|length > 0 %}
 discovery.zen.ping.unicast.hosts:
 {% for reln in relations.peer %}
   - {{ reln['private-address'] }}
 {% endfor %}
 {% endif %}
+{% if not '5' in apt_repository %}
+# workaround for Kibana4 Export Everything bug https://github.com/elastic/kibana/issues/5524
+index.max_result_window: 2147483647
+{% endif %}
 
=== modified file 'unit_tests/test_hooks.py'
--- unit_tests/test_hooks.py	2017-03-29 01:20:22 +0000
+++ unit_tests/test_hooks.py	2017-09-15 00:48:54 +0000
@@ -56,26 +56,26 @@
         self.addCleanup(patcher.stop)
 
     def test_installs_ansible_support(self):
-        hooks.execute(['install'])
+        hooks.execute(['install.real'])
 
         ansible = self.mock_ansible
         ansible.install_ansible_support.assert_called_once_with(
             from_ppa=False)
 
     def test_applies_install_playbook(self):
-        hooks.execute(['install'])
+        hooks.execute(['install.real'])
 
         self.assertEqual([
-            mock.call('playbook.yaml', tags=['install'], extra_vars=None)
+            mock.call('playbook.yaml', tags=['install.real'], extra_vars=None)
         ], self.mock_ansible.apply_playbook.call_args_list)
 
     def test_executes_preinstall(self):
-        hooks.execute(['install'])
+        hooks.execute(['install.real'])
 
         self.mock_preinstall.assert_called_once_with()
 
     def test_copys_backported_ansible_modules(self):
-        hooks.execute(['install'])
+        hooks.execute(['install.real'])
 
         self.mock_rsync.assert_called_once_with(
             'ansible_module_backports',