Merge pull request #15 from khaledk2/fix_deployment_issues

Fix deployment issues

Author: khaledk2

ansible.cfg

@@ -0,0 +1,4 @@
+[defaults]
+fact_caching = jsonfile
+fact_caching_connection =  /tmp/ansible_cache
+fact_caching_timeout = 600

defaults/main.yml

@@ -33,9 +33,15 @@ instances: {}
 nginx_port: 8080
 es_java_options: "-Xms2g -Xmx2g"
 no_index_processes: 2
-test_mode: false
+prune_app_folder: false
 queries_folder: queries/
 force_update: false
 dump_output_format: "json"
 max_page_size: 10000
 support_async: true
+search_container_names:
+  - searchengine
+  - searchengine-nginx-container
+  - searchengine-redis-container
+  - searchengine_celery
+  - searchengine_celery_beat

molecule/resources/playbook.yml

@@ -7,5 +7,3 @@
     es_java_options: "-Xms512m -Xmx512m"
     elasticsearch_no_nodes: 1
     elastic_password: my_password
-    test_mode: true
-

tasks/elasticsearch.yml

@@ -1,12 +1,13 @@
 ---
-- 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: 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: 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'})] }}"
@@ -16,16 +17,8 @@
   ansible.builtin.set_fact:
     instances: "{{instances | combine ( {'instances' : instances_nodes}) }}"
 
-#Add all 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: omero searchengine | Create docker network
   become: yes
- #vars:
- #  ansible_python_interpreter: /usr/bin/python
   community.docker.docker_network:
     name: searchengine-net
     driver: bridge

tasks/main.yml

@@ -1,6 +1,18 @@
 ---
-## create the searchengine and elasticsearch folders
 
+#Add all elasticsearch nodes
+- name: omero searchengine | Add elastic nodes to elasticsearch_nodes
+  ansible.builtin.set_fact:
+    elasticsearch_nodes: '{{ elasticsearch_nodes + ["searchengine_elasticsearch_node"+item] }}'
+    cacheable: yes
+  with_sequence: start=1 count={{ elasticsearch_no_nodes }}
+
+#Add all elasticsearch nodes
+- name: omero searchengine | Add elastic nodes to elasticsearch_nodes_urls
+  ansible.builtin.set_fact:
+    elasticsearch_nodes_urls: '{{ elasticsearch_nodes_urls + ["https://10.11.0."+item+":9200"] }}'
+    cacheable: yes
+  with_sequence: start=2 count={{ elasticsearch_no_nodes }}
 
 - name:  omero searchengine | Ensure sysctl is present
   ansible.builtin.package:
@@ -28,6 +40,40 @@
   ansible.builtin.import_role:
     name: ome.docker
 
+- name: omero searchengine | Get Docker information
+  community.docker.docker_host_info:
+    containers: true
+    containers_all: true
+  register: searchengine_docker_info
+
+- name: omero searchengine | Get list of container names
+  set_fact:
+    searchengine_container_names: >-
+      {{
+        searchengine_docker_info.containers
+        | map(attribute='Names')
+        | flatten
+        | map('regex_replace', '^/', '')
+        | list
+      }}
+    cacheable: yes
+
+- name: omero searchengine | Stop and delete running containers
+  community.docker.docker_container:
+    name: "{{ item }}"
+    state: absent  #stopped
+  loop: "{{ searchengine_container_names }}"
+  when:
+    - item in elasticsearch_nodes or item in search_container_names
+    - not molecule_yml is defined
+
+- name: omero searchengine |  remove app directory
+  become: yes
+  ansible.builtin.file:
+   path: "{{ apps_folder }}/searchengine"
+   state: absent
+  when: prune_app_folder
+
 - name: omero searchengine | Check if a elastic node data folder exists
   ansible.builtin.stat:
     path: "{{ apps_folder }}/searchengine/elasticsearch/node1/data"
@@ -55,7 +101,6 @@
     mode: 0755
   changed_when: false
 
-
 - name: omero searchengine | Create elasticsearch certs folder
   become: yes
   ansible.builtin.file:
@@ -108,15 +153,14 @@
 
 - name: omero searchengine | deploy elasticsearch cluster
   ansible.builtin.include_tasks: elasticsearch.yml
-  when: not elastic_node_data_folder.stat.exists or force_update
 
 - name: omero searchengine | deploy nginx for the search engine
   ansible.builtin.import_tasks: nginx.yml
-  when: not test_mode
+  when: not molecule_yml is defined
 
 - name: omero searchengine | deploy redis
   ansible.builtin.import_tasks: redis.yml
-  when: not test_mode and support_async
+  when: not molecule_yml is defined
 
 - name: omero searchengine | deploy searchengine
   ansible.builtin.import_tasks: searchengine.yml

tasks/nginx.yml

@@ -47,7 +47,6 @@
     restart_policy: always
   tags: [always, nginx]
 
-
 - name: copy adjust containers files script to the host machine
   ansible.builtin.template:
     src: adjust_containers_files.sh.j2

tasks/searchengine.yml

@@ -11,11 +11,6 @@
   ansible.builtin.debug:
     msg: "Container '{{ container_info_searchengine_f }}' is in state: {{ container_info_searchengine_f.exists}}"
 
-- name: omero searchengine | set elasticsearch_nodes_urls
-  ansible.builtin.set_fact:
-    elasticsearch_nodes_urls: []
-
-
 - name: omero searchengine | Create searchengine folder directory
   become: yes
   ansible.builtin.file:
@@ -63,12 +58,6 @@
     group: root
     mode: 0755
 
-#Add all elasticsearch nodes
-- name: omero searchengine | Add elastic nodes to elasticsearch_nodes_urls
-  ansible.builtin.set_fact:
-    elasticsearch_nodes_urls: '{{ elasticsearch_nodes_urls + ["https://10.11.0."+item+":9200"] }}'
-  with_sequence: start=2 count={{ elasticsearch_no_nodes }}
-
 - name: omero searchengine | configure elasticsearch backup folder for docker searchengine
   become: yes
   community.docker.docker_container:
@@ -363,8 +352,6 @@
       - "{{ apps_folder }}/data_dump:/data/data_dump"
   when: not container_info_searchengine_f.exists and support_async
 
-
-
 #ansible-playbook install_searchengine.yml  --tags "indexer"
 - name: omero searchengine | Index the default data source
   become: yes