From 53f5d61fe536a595b3d98a8f579e77996d22d490 Mon Sep 17 00:00:00 2001
From: Dale McDiarmid <dalem@elastic.co>
Date: Fri, 15 Apr 2016 17:04:31 +0100
Subject: [PATCH] Gem lock + standard images

---
 .gitignore        |  1 -
 .kitchen.yml      |  6 +++---
 Gemfile.lock      | 42 ++++++++++++++++++++++++++++++++++++++++++
 handlers/main.yml |  2 +-
 4 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 Gemfile.lock

diff --git a/.gitignore b/.gitignore
index dca2467..7a4be3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .kitchen/
-*.lock
 *.pyc
 .vendor
 .bundle
diff --git a/.kitchen.yml b/.kitchen.yml
index 0728b01..f0d6ad1 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -15,7 +15,7 @@ provisioner:
 platforms:
   - name: ubuntu-14.04
     driver_config:
-      image: dliappis/ubuntuhetzner:14.04
+      image: dliappis/ubuntu:14.04
       privileged: true
       provision_command:
         - apt-get update && apt-get install -y software-properties-common &&  add-apt-repository -y ppa:ansible/ansible
@@ -45,7 +45,7 @@ platforms:
       run_command: "/sbin/init"
   - name: centos-6
     driver_config:
-      image:  dliappis/centoshetzner:6
+      image:  dliappis/centos:6
       privileged: true
       provision_command:
         - yum remove -y ansible
@@ -54,7 +54,7 @@ platforms:
       use_sudo: false
   - name: centos-7
     driver_config:
-      image: dliappis/centoshetzner:7
+      image: dliappis/centos:7
       provision_command:
         - yum remove -y ansible
         - yum -y install gmp-devel python-devel python-pip
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..8c827c2
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,42 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    highline (1.7.8)
+    kitchen-ansible (0.40.1)
+      librarian-ansible
+      test-kitchen (~> 1.4)
+    kitchen-docker (2.1.0)
+      test-kitchen (>= 1.0.0)
+    librarian (0.1.2)
+      highline
+      thor (~> 0.15)
+    librarian-ansible (3.0.0)
+      faraday
+      librarian (~> 0.1.0)
+    mixlib-shellout (2.2.6)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.4)
+    safe_yaml (1.0.4)
+    test-kitchen (1.4.2)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (~> 2.7, < 2.10)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  kitchen-ansible (= 0.40.1)
+  kitchen-docker (= 2.1.0)
+  net-ssh (~> 2.0)
+  test-kitchen (= 1.4.2)
+
+BUNDLED WITH
+   1.11.2
diff --git a/handlers/main.yml b/handlers/main.yml
index 8c6431e..2432ffe 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,4 @@
 
 - name: restart elasticsearch
   service: name={{instance_init_script | basename}} state=restarted enabled=yes
-  when: es_restart_on_change and es_start_service and (not elasticsearch_started.changed or (plugin_installed is defined and plugin_installed.changed) or elasticsearch_install.changed)
+  when: es_restart_on_change and es_start_service and not elasticsearch_started.changed and ((plugin_installed is defined and plugin_installed.changed) or elasticsearch_install.changed)