clean and tide up the code

Author: khaledk2

molecule/rockylinux9/molecule.yml

@@ -29,7 +29,7 @@ provisioner:
     converge: ../resources/playbook.yml
   inventory:
     host_vars:
-      omero-ms-rockylinux:
+      omero-searchengine-rockylinux:
   options:
     v: true
     diff: true

tasks/elasticsearch.yml

@@ -1,28 +1,28 @@
 ---
-- name: Check if IP is in use
-  set_fact:
+- name: omero searchengine | Check if IP is in use
+  ansible.builtin.set_fact:
     ip_taken: "10.11.0.2 network_info.networks[0].containers.values() | map(attribute='ipv4_address') | list }}"
 - name: Get info about the searchengine container
   community.docker.docker_container_info:
     name: searchengine_elasticsearch_node1
   register: container_info_elasticsearch_node1
 
-- name: Add elastic nodes to instances_nodes
+- name: omero searchengine | Add elastic nodes to instances_nodes
   ansible.builtin.set_fact:
     instances_nodes: "{{instances_nodes + [( {'name' : 'searchengine_elasticsearch_node'+item, 'dns': ['searchengine_elasticsearch_node'+item,'localhost'],'ip': '127.0.0.1'})] }}"
   with_sequence: start=1 count={{ elasticsearch_no_nodes }}
 
-- name: Add elastic nodes to instances
+- name: omero searchengine | Add elastic nodes to instances
   ansible.builtin.set_fact:
     instances: "{{instances | combine ( {'instances' : instances_nodes}) }}"
 
 #Add all elasticsearch nodes
-- name: Add elastic nodes to elasticsearch_nodes
+- name: omero searchengine | Add elastic nodes to elasticsearch_nodes
   ansible.builtin.set_fact:
     elasticsearch_nodes: '{{ elasticsearch_nodes + ["searchengine_elasticsearch_node"+item] }}'
   with_sequence: start=1 count={{ elasticsearch_no_nodes }}
 
-- name: Create docker network
+- name: omero searchengine | Create docker network
   become: yes
  #vars:
  #  ansible_python_interpreter: /usr/bin/python
@@ -35,13 +35,13 @@
 # I got some memory exceptions when start using elasticsearch cluster and
 # increasing the mmap counts limits fix this issue
 #https://www.elastic.co/guide/en/elasticsearch/reference/7.16 /vm-max-map-count.html
-- name: set vm.max_map_count to 262144 in sysctl
+- name: omero searchengine | set vm.max_map_count to 262144 in sysctl
   become: yes
   ansible.posix.sysctl: name={{ item.varname }} value={{ item.varvalue }}
   with_items:
     - { varname: "vm.max_map_count", varvalue: "262144" }
 
-- name: create CA
+- name: omero searchengine | create CA
   become: yes
   community.docker.docker_container:
     image: "{{ search_engineelasticsearch_docker_image }}"
@@ -58,14 +58,14 @@
   changed_when: false
   when: not container_info_elasticsearch_node1.exists
 
-- name: Wait for CA file
+- name: omero searchengine | Wait for CA file
   ansible.builtin.wait_for:
     path: "{{ apps_folder }}/searchengine/elasticsearch/certs/elastic-ca.p12"
     state: present
   register: check_ca_file_result
   when: not container_info_elasticsearch_node1.exists
 
-- name: Show wait CA file result
+- name: omero searchengine | Show wait CA file result
   debug:
     var: check_ca_file_result
   when: not container_info_elasticsearch_node1.exists
@@ -76,7 +76,7 @@
         {{ instances   |to_nice_yaml }}
   when: not container_info_elasticsearch_node1.exists
 
-- name: Create nodes' cert
+- name: omero searchengine | Create nodes' cert
   become: yes
   community.docker.docker_container:
     image: "{{ search_engineelasticsearch_docker_image }}"
@@ -95,15 +95,15 @@
   changed_when: false
   when: not container_info_elasticsearch_node1.exists
 
-- name: Get Docker network info
+- name: omero searchengine | Get Docker network info
   community.docker.docker_network_info:
     name: searchengine-net
   register: network_info
 
 - debug:
     msg: "this the value: {{ ip_taken }} "
 
-- name: Run first docker elasticsearch main node
+- name: omero searchengine | Run first docker elasticsearch main node
   become: yes
   community.docker.docker_container:
     image: "{{ search_engineelasticsearch_docker_image }}"
@@ -165,7 +165,7 @@
   when: not container_info_elasticsearch_node1.exists and  elasticsearch_no_nodes >1
 
 
-- name: Run first docker elasticsearch main node
+- name: omero searchengine | Run first docker elasticsearch main node
   become: yes
   community.docker.docker_container:
     image: "{{ search_engineelasticsearch_docker_image }}"
@@ -227,19 +227,19 @@
   when: not container_info_elasticsearch_node1.exists and elasticsearch_no_nodes == 1
 
 
-- name: check elasticsearch node
+- name: omero searchengine | check elasticsearch node
   community.docker.docker_container_info:
     name: searchengine_elasticsearch_node1
   register: node1_log
   when: not container_info_elasticsearch_node1.exists
 
 
 - name: display elasticsearch logs
-  debug:
+  ansible.builtin.debug:
     var: node1_log
   when: not container_info_elasticsearch_node1.exists
 
-- name: Run docker elasticsearch for the remaining nodes
+- name: omero searchengine | Run docker elasticsearch for the remaining nodes
   become: yes
   community.docker.docker_container:
     image: "{{ search_engineelasticsearch_docker_image }}"
@@ -285,7 +285,7 @@
       cluster.routing.allocation.disk.watermark.flood_stage: "98%"
       ####################################################################
 
-    networks:
+    community.docker.networks:
     - name: "searchengine-net"
       ipv4_address: 10.11.0.{{ item | int + 1 }}
     published_ports:

tasks/main.yml

@@ -2,13 +2,13 @@
 ## create the searchengine and elasticsearch folders
 
 
-- name: Ensure sysctl is present
+- name:  omero searchengine | Ensure sysctl is present
   ansible.builtin.package:
     name: procps-ng
     state: present
   become: true
 
-- name: update curl and ca certificates
+- name: omero searchengine | update curl and ca certificates
   ansible.builtin.dnf:
     name:
       - curl
@@ -19,26 +19,26 @@
   become: true
 
 
-- name: Ensure python3-requests is installed
+- name: omero searchengine | Ensure python3-requests is installed
   ansible.builtin.package:
     name: python3-requests
     state: present
   become: yes
 
 
-- name:  Import ome.docker role
+- name:  omero searchengine | Import ome.docker role
   ansible.builtin.import_role:
     name: ome.docker
   #vars:
   #  docker_systemd_setup: false
 
 
-- name: Check if a elastic node data folder exists
+- name: omero searchengine | Check if a elastic node data folder exists
   ansible.builtin.stat:
     path: "{{ apps_folder }}/searchengine/elasticsearch/node1/data"
   register: elastic_node_data_folder
 
-- name: Create app top level directory
+- name: omero searchengine | Create app top level directory
   become: yes
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine"
@@ -49,7 +49,7 @@
     mode: 0755
   changed_when: false
 
-- name: Create elasticsearch directory
+- name: omero searchengine | Create elasticsearch directory
   become: yes
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine/elasticsearch"
@@ -61,7 +61,7 @@
   changed_when: false
 
 
-- name: Create elasticsearch certs folder
+- name: omero searchengine | Create elasticsearch certs folder
   become: yes
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine/elasticsearch/certs"
@@ -73,7 +73,7 @@
   changed_when: false
 
 
-- name: Create elasticsearch main nodes directories
+- name: omero searchengine | Create elasticsearch main nodes directories
   become: yes
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine/elasticsearch/node{{ item }}"
@@ -86,7 +86,7 @@
   changed_when: false
 
 
-- name: Create elasticsearch logs directory
+- name: omero searchengine | Create elasticsearch logs directory
   become: yes
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine/elasticsearch/node{{ item }}/logs"
@@ -100,7 +100,7 @@
 
 
 
-- name: Create elasticsearch data directory
+- name: omero searchengine | Create elasticsearch data directory
   become: yes
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine/elasticsearch/node{{ item }}/data"
@@ -118,19 +118,19 @@
 #  ansible.builtin.include_tasks: optm.yml
 #  when: not elastic_node_data_folder.stat.exists
 
-- name: deploy elasticsearch cluster
+- name: omero searchengine | deploy elasticsearch cluster
   ansible.builtin.include_tasks: elasticsearch.yml
   when: not elastic_node_data_folder.stat.exists
   #elasticsearch.yml
 
-- name: deploy nginx for the search engine
+- name: omero searchengine | deploy nginx for the search engine
   ansible.builtin.import_tasks: nginx.yml
   when: not test_mode
 
-- name: deploy redis
+- name: omero searchengine | deploy redis
   ansible.builtin.import_tasks: redis.yml
   when: not test_mode
 
-- name: deploy searchengine
+- name: omero searchengine | deploy searchengine
   ansible.builtin.import_tasks: searchengine.yml
 

tasks/nginx.yml

@@ -1,5 +1,5 @@
 ---
-- name: Create Nginx configuration directory
+- name: omero searchengine | Create Nginx configuration directory
   become: true
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine/nginx/conf.d"
@@ -9,7 +9,7 @@
     mode: 0644
   changed_when: false
 
-- name: Create Nginx log directory
+- name: omero searchengine | Create Nginx log directory
   become: true
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine/nginx/log"
@@ -19,7 +19,7 @@
     mode: 0755
   changed_when: false
 
-- name:  Copy serachengine Nginx config
+- name:  omero searchengine | Copy serachengine Nginx config
   become: true
   ansible.builtin.template:
     dest: "{{ apps_folder }}/searchengine/nginx/conf.d/searchengine.conf"
@@ -29,7 +29,7 @@
     mode: 0644
   changed_when: false
 
-- name: Run Nginx container
+- name: omero searchengine | Run Nginx container
   become: true
   community.docker.docker_container:
     name: searchengine-nginx-container

tasks/redis.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: Create redis data directory
+- name: omero searchengine | Create redis data directory
   become: yes
   ansible.builtin.file:
     path: "{{ apps_folder }}/searchengine/data_dump/redis"
@@ -11,7 +11,7 @@
     mode: 0700
   changed_when: false
 
-- name: Create Searchengine Redis container
+- name: omero searchengine | Create Searchengine Redis container
   community.docker.docker_container:
     name: searchengine-redis-container
     image: redis:latest