From e2dac12dbe96520db34d7cdc68b26b5ba819420a Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Tue, 5 Sep 2023 13:56:05 +0200 Subject: [PATCH 1/6] * Fix #256 Make container#s name variable --- molecule/elasticstack_default/molecule.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/elasticstack_default/molecule.yml b/molecule/elasticstack_default/molecule.yml index 9e0591c6..4e6cf133 100644 --- a/molecule/elasticstack_default/molecule.yml +++ b/molecule/elasticstack_default/molecule.yml @@ -4,7 +4,7 @@ dependency: driver: name: docker platforms: - - name: elasticstack-cluster1 + - name: "elasticstack-cluster1-${MOLECULE_DISTRO}-${ELASTIC_RELEASE}" groups: - beats - logstash @@ -17,7 +17,7 @@ platforms: cgroupns_mode: host privileged: true pre_build_image: true - - name: elasticstack-cluster2 + - name: "elasticstack-cluster2-${MOLECULE_DISTRO}-${ELASTIC_RELEASE}" groups: - beats - logstash From fed6a263cde4b8f3a183f8b93184cb7d90d43fad Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Tue, 5 Sep 2023 13:58:45 +0200 Subject: [PATCH 2/6] * Fix #257 * Remove failure suppress by ealsticsearch service start --- roles/elasticsearch/tasks/elasticsearch-security.yml | 2 +- roles/elasticsearch/tasks/main.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/elasticsearch/tasks/elasticsearch-security.yml b/roles/elasticsearch/tasks/elasticsearch-security.yml index 2e1c695c..e63f56c2 100644 --- a/roles/elasticsearch/tasks/elasticsearch-security.yml +++ b/roles/elasticsearch/tasks/elasticsearch-security.yml @@ -519,7 +519,7 @@ ansible.builtin.service: name: elasticsearch state: started - failed_when: false + enabled: yes - name: Wait for all instances to start ansible.builtin.include_tasks: wait_for_instance.yml diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 174233dc..1af7df77 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -186,7 +186,6 @@ name: elasticsearch state: started enabled: yes - failed_when: false - name: Handle cluster setup without security when: not elasticsearch_security | bool From 2e1dfb549ebc2ce732ccc195acc50f6cc47fd16c Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Tue, 5 Sep 2023 14:08:52 +0200 Subject: [PATCH 3/6] Fix #258 --- molecule/elasticstack_default/converge.yml | 10 ---------- roles/elasticsearch/tasks/main.yml | 5 +++++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/molecule/elasticstack_default/converge.yml b/molecule/elasticstack_default/converge.yml index dc7fd6f0..8cde64e3 100644 --- a/molecule/elasticstack_default/converge.yml +++ b/molecule/elasticstack_default/converge.yml @@ -28,16 +28,6 @@ ansible.builtin.set_fact: elasticstack_rpm_workaround: true when: ansible_os_family == 'RedHat' and ansible_distribution_major_version >= "9" - - name: Update apt cache. - ansible.builtin.apt: - update_cache: yes - cache_valid_time: 600 - changed_when: false - when: ansible_os_family == 'Debian' - - name: Install dependencies - ansible.builtin.package: - name: - - curl - name: Include Redis ansible.builtin.include_role: name: geerlingguy.redis diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 1af7df77..1b0580c3 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -171,6 +171,11 @@ force: yes notify: Restart Elasticsearch +- name: Force systemd to reread configs on container + ansible.builtin.systemd: + daemon_reload: true + when: ansible_virtualization_type == "container" + - name: Import Tasks elasticsearch-security.yml ansible.builtin.import_tasks: elasticsearch-security.yml when: From 8abd02aafdc118b6d9b6193f704c72ca59926f37 Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Tue, 5 Sep 2023 14:11:51 +0200 Subject: [PATCH 4/6] * Add an explanation comment to a task * Move a task to a better place --- roles/elasticsearch/tasks/elasticsearch-security.yml | 9 --------- roles/elasticsearch/tasks/main.yml | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/roles/elasticsearch/tasks/elasticsearch-security.yml b/roles/elasticsearch/tasks/elasticsearch-security.yml index e63f56c2..65483fc3 100644 --- a/roles/elasticsearch/tasks/elasticsearch-security.yml +++ b/roles/elasticsearch/tasks/elasticsearch-security.yml @@ -551,15 +551,6 @@ elasticsearch_http_protocol: "https" when: elasticsearch_http_security -# Free up some space to let elsticsearch allocate replica in GitHub Action -- name: Remove cache # noqa: risky-shell-pipe - ansible.builtin.shell: > - if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi; - rm -rf /var/cache/* - failed_when: false - changed_when: false - when: ansible_virtualization_type == "container" - - name: Check for cluster status with bootstrap password # noqa: risky-shell-pipe ansible.builtin.shell: > if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi; diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 1b0580c3..6ff6e608 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -171,11 +171,21 @@ force: yes notify: Restart Elasticsearch +# On containerized Debian 10 systemd will not recognize elasticsearch service - name: Force systemd to reread configs on container ansible.builtin.systemd: daemon_reload: true when: ansible_virtualization_type == "container" +# Free up some space to let elsticsearch allocate replica in GitHub Action +- name: Remove cache # noqa: risky-shell-pipe + ansible.builtin.shell: > + if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi; + rm -rf /var/cache/* + failed_when: false + changed_when: false + when: ansible_virtualization_type == "container" + - name: Import Tasks elasticsearch-security.yml ansible.builtin.import_tasks: elasticsearch-security.yml when: From e883851f36484c1ecba3c5fa2bf6c51d3a3a83ab Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Tue, 5 Sep 2023 14:29:51 +0200 Subject: [PATCH 5/6] Fix lint --- roles/elasticsearch/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml index 6ff6e608..7677f040 100644 --- a/roles/elasticsearch/tasks/main.yml +++ b/roles/elasticsearch/tasks/main.yml @@ -171,7 +171,7 @@ force: yes notify: Restart Elasticsearch -# On containerized Debian 10 systemd will not recognize elasticsearch service +# On containerized Debian 10 systemd will not recognize elasticsearch service - name: Force systemd to reread configs on container ansible.builtin.systemd: daemon_reload: true From 550d2443336007eafe49f5aa4844a086cc1f6019 Mon Sep 17 00:00:00 2001 From: Afeef Ghannam Date: Tue, 5 Sep 2023 14:35:36 +0200 Subject: [PATCH 6/6] Make the container name better --- molecule/elasticstack_default/molecule.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/elasticstack_default/molecule.yml b/molecule/elasticstack_default/molecule.yml index 4e6cf133..f92ae58b 100644 --- a/molecule/elasticstack_default/molecule.yml +++ b/molecule/elasticstack_default/molecule.yml @@ -4,7 +4,7 @@ dependency: driver: name: docker platforms: - - name: "elasticstack-cluster1-${MOLECULE_DISTRO}-${ELASTIC_RELEASE}" + - name: "elasticstack${ELASTIC_RELEASE}-cluster1-${MOLECULE_DISTRO}" groups: - beats - logstash @@ -17,7 +17,7 @@ platforms: cgroupns_mode: host privileged: true pre_build_image: true - - name: "elasticstack-cluster2-${MOLECULE_DISTRO}-${ELASTIC_RELEASE}" + - name: "elasticstack${ELASTIC_RELEASE}-cluster2-${MOLECULE_DISTRO}" groups: - beats - logstash