From 257950f0d6648d5302c85ab0f44d0814b4d34a37 Mon Sep 17 00:00:00 2001 From: David DIDIER Date: Sat, 18 Feb 2017 14:47:44 +0100 Subject: [PATCH] Fix 2 idempotence issues --- tasks/elasticsearch-Debian-version-lock.yml | 2 ++ tasks/java.yml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tasks/elasticsearch-Debian-version-lock.yml b/tasks/elasticsearch-Debian-version-lock.yml index 5a8c996..948b1b6 100644 --- a/tasks/elasticsearch-Debian-version-lock.yml +++ b/tasks/elasticsearch-Debian-version-lock.yml @@ -1,3 +1,5 @@ --- - name: Debian - hold elasticsearch version command: apt-mark hold elasticsearch + register: hold_elasticsearch_result + changed_when: "hold_elasticsearch_result.stdout != 'elasticsearch was already set on hold.'" diff --git a/tasks/java.yml b/tasks/java.yml index ed49fb1..5fb032a 100644 --- a/tasks/java.yml +++ b/tasks/java.yml @@ -9,14 +9,15 @@ - name: RedHat - Ensure Java is installed yum: name={{ java }} state={{java_state}} when: ansible_os_family == 'RedHat' - + - name: Debian - Ensure Java is installed apt: name={{ java }} state={{java_state}} update_cache=yes force=yes when: ansible_os_family == 'Debian' - command: java -version 2>&1 | grep OpenJDK register: open_jdk + changed_when: false - name: refresh the java ca-certificates command: /var/lib/dpkg/info/ca-certificates-java.postinst configure - when: ansible_distribution == 'Ubuntu' and open_jdk.rc == 0 \ No newline at end of file + when: ansible_distribution == 'Ubuntu' and open_jdk.rc == 0