Merge lp:~michael.nelson/charms/trusty/elasticsearch/restart-on-reboot into lp:~onlineservices-charmers/charms/trusty/elasticsearch/elasticsearch2

[Michael Nelson]

Elasticsearch is started on boot (enabled=yes)
Move install/upgrade task for defaults into install-elasticsearch tasks

Tested locally with:

$ sudo lxc-stop -r --name michael-local-machine-2
dev-trusty# ~/configs/canonical-mojo-specs/is/mojo-is-logging-kibana
$ juju run --unit elasticsearch/0 "service elasticsearch status"
 * elasticsearch is running

which failed prior to this change.

[Kelvin Li (kelvin.li)]

LGTM

review: Approve

=== modified file 'playbook.yaml'
--- playbook.yaml	2015-11-18 03:05:16 +0000
+++ playbook.yaml	2015-11-20 03:11:27 +0000
@@ -45,14 +45,6 @@
       notify:
         - Restart ElasticSearch
 
-    - name: Set Elasticsearch user limits
-      tags:
-        - upgrade-charm
-      template: src={{ charm_dir }}/templates/limits.conf
-                dest=/etc/security/limits.d/elasticsearch.conf
-      notify:
-        - Restart ElasticSearch
-
     - name: Open ES Port when exposed
       command: open-port 9200
       tags:
 
=== modified file 'tasks/install-elasticsearch.yml'
--- tasks/install-elasticsearch.yml	2015-10-01 19:00:31 +0000
+++ tasks/install-elasticsearch.yml	2015-11-20 03:11:27 +0000
@@ -45,3 +45,18 @@
     - install
     - upgrade-charm
   when: stat_elasticsearch_deb.stat.exists == true
+
+- name: Set Elasticsearch user limits
+  tags:
+    - upgrade-charm
+    - install
+  template: src={{ charm_dir }}/templates/limits.conf
+            dest=/etc/security/limits.d/elasticsearch.conf
+  notify:
+    - Restart ElasticSearch
+
+- name: Ensure Elasticsearch is started on boot
+  tags:
+    - upgrade-charm
+    - install
+  service: name=elasticsearch enabled=yes