From ce25f40da005541d15741da1fadb6322511a9414 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Mon, 13 Mar 2017 13:18:13 -0700 Subject: [PATCH 1/2] License update --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c702191..207826f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /vars/Debian.yml .kitchen/ -license.json +license*.json *.pyc .vendor .bundle From 0973da9c46f3b83221a173ed20bcda8e451cfa03 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Mon, 13 Mar 2017 13:21:46 -0700 Subject: [PATCH 2/2] Idempotent fix --- tasks/elasticsearch-Debian-version-lock.yml | 2 ++ tasks/java.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/tasks/elasticsearch-Debian-version-lock.yml b/tasks/elasticsearch-Debian-version-lock.yml index 5a8c996..a932af7 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.'" \ No newline at end of file diff --git a/tasks/java.yml b/tasks/java.yml index a940cc2..388ceed 100644 --- a/tasks/java.yml +++ b/tasks/java.yml @@ -15,6 +15,7 @@ - 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