From be7a659353b7d6ea66447af9328c48da87d783d8 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sun, 27 Feb 2022 19:00:06 +0100 Subject: [PATCH] Update to 2022-02-27 19:00 --- roles/appsmith/tasks/main.yml | 37 +++++++++++++++++---------- roles/babashka/tasks/main.yml | 9 ++++--- roles/bookstack/tasks/main.yml | 4 +-- roles/clojure/tasks/main.yml | 9 ++++--- roles/elasticsearch/defaults/main.yml | 4 +-- 5 files changed, 40 insertions(+), 23 deletions(-) diff --git a/roles/appsmith/tasks/main.yml b/roles/appsmith/tasks/main.yml index 1208952..808fac9 100644 --- a/roles/appsmith/tasks/main.yml +++ b/roles/appsmith/tasks/main.yml @@ -1,17 +1,28 @@ --- -- include: user.yml -- include: directories.yml -- include: facts.yml -- include: archive_pre.yml - when: appsmith_install_mode == 'upgrade' -- include: install.yml -- include: conf.yml -- include: iptables.yml +- include_tasks: user.yml + tags: always +- include_tasks: directories.yml + tags: always +- include_tasks: facts.yml + tags: always +- include_tasks: archive_pre.yml + when: appsmith_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: iptables.yml when: iptables_manage | default(True) -- include: services.yml -- include: write_version.yml -- include: archive_post.yml - when: appsmith_install_mode == 'upgrade' -- include: cleanup.yml + tags: always +- include_tasks: services.yml + tags: always +- include_tasks: write_version.yml + tags: always +- include_tasks: archive_post.yml + when: appsmith_install_mode | default('none') == 'upgrade' + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/babashka/tasks/main.yml b/roles/babashka/tasks/main.yml index fcd5af4..0e55ce3 100644 --- a/roles/babashka/tasks/main.yml +++ b/roles/babashka/tasks/main.yml @@ -1,5 +1,8 @@ --- -- include: facts.yml -- include: install.yml -- include: cleanup.yml +- include_tasks: facts.yml + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/bookstack/tasks/main.yml b/roles/bookstack/tasks/main.yml index 3e0d96b..241c263 100644 --- a/roles/bookstack/tasks/main.yml +++ b/roles/bookstack/tasks/main.yml @@ -7,7 +7,7 @@ - include_tasks: facts.yml tags: always - include_tasks: archive_pre.yml - when: bookstack_install_mode == 'upgrade' + when: bookstack_install_mode | default('none') == 'upgrade' tags: always - include_tasks: install.yml tags: always @@ -18,7 +18,7 @@ - include_tasks: write_version.yml tags: always - include_tasks: archive_post.yml - when: bookstack_install_mode == 'upgrade' + when: bookstack_install_mode | default('none') == 'upgrade' tags: always - include_tasks: cleanup.yml tags: always diff --git a/roles/clojure/tasks/main.yml b/roles/clojure/tasks/main.yml index fcd5af4..0e55ce3 100644 --- a/roles/clojure/tasks/main.yml +++ b/roles/clojure/tasks/main.yml @@ -1,5 +1,8 @@ --- -- include: facts.yml -- include: install.yml -- include: cleanup.yml +- include_tasks: facts.yml + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/elasticsearch/defaults/main.yml b/roles/elasticsearch/defaults/main.yml index cbc848d..f9bcd92 100644 --- a/roles/elasticsearch/defaults/main.yml +++ b/roles/elasticsearch/defaults/main.yml @@ -1,13 +1,13 @@ --- # Version of elasticsearch to deploy -es_version: 7.16.3 +es_version: 7.17.0 # root directory es_root_dir: /opt/elasticsearch # URL of the archive es_archive_url: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{ es_version }}-linux-x86_64.tar.gz # Expected sha512 of the archive -es_archive_sha512: d9ad7a510b8bad63788f5081b9431519e0581242499394f7a2c59f6097f8956603b28881e30697c50fe440b0ced7a2eb66afadb0e12bf97126db1d468d3818ff +es_archive_sha512: c9c3e2ef237c825c67f8a242a419eb7989b40beeaf399f3e68bdff0f5d62a5d5dcfa832b8e3284778e941f73bc64b8eaa899dad1b1282af65fc3687d7e9d6a4c # Should ansible handle upgrades or only initial installation ? es_manage_upgrade: True # User under which the service will run (will be created)