Skip to content

Commit 595b9a3

Browse files
committed
usecluster_id
1 parent b432d8a commit 595b9a3

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

defaults/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ searchengine_published_port: 5577
4646
elasticsearch_published_port_dig: 0
4747
searchengine_network: searchengine-net
4848
search_container_names:
49-
- searchengine
50-
- searchengine-nginx-container
51-
- searchengine-redis-container
52-
- searchengine_celery
53-
- searchengine_celery_beat
49+
- "searchengine{{ cluster_id | default(omit) }}"
50+
- "searchengine-nginx-container{{ cluster_id | default(omit) }}"
51+
- "searchengine-redis-container{{ cluster_id | default(omit) }}"
52+
- "searchengine_celery{{ cluster_id | default(omit) }}"
53+
- "searchengine_celery_beat{{ cluster_id | default(omit) }}"

tasks/elasticsearch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
path.data: "/var/lib/elasticsearch"
109109
path.logs: "/var/log/elasticsearch"
110110
path.repo: "{{ elasticsearch_backup_folder }}"
111-
node.name: searchengine_elasticsearch_node1
111+
node.name: "searchengine_elasticsearch_node1{{ cluster_id | default(omit) }}"
112112
bootstrap.memory_lock: "true"
113113
network.host: 0.0.0.0
114114
cluster.name: "searchengine-cluster"
@@ -170,7 +170,7 @@
170170
path.data: "/var/lib/elasticsearch"
171171
path.logs: "/var/log/elasticsearch"
172172
path.repo: "{{ elasticsearch_backup_folder }}"
173-
node.name: searchengine_elasticsearch_node1
173+
node.name: "searchengine_elasticsearch_node1{{ cluster_id | default(omit) }}"
174174
bootstrap.memory_lock: "true"
175175
network.host: 0.0.0.0
176176
cluster.name: "searchengine-cluster"
@@ -236,7 +236,7 @@
236236
become: yes
237237
community.docker.docker_container:
238238
image: "{{ search_engineelasticsearch_docker_image }}"
239-
name: "searchengine_elasticsearch_node{{ item }}"
239+
name: "searchengine_elasticsearch_node{{ item }}{{ cluster_id | default(omit) }}"
240240
ulimits:
241241
- 'memlock:-1:-1'
242242
cleanup: True

tasks/nginx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
- name: omero searchengine | Run Nginx container
3333
become: true
3434
community.docker.docker_container:
35-
name: searchengine-nginx-container
35+
name: "searchengine-nginx-container{{ cluster_id | default(omit) }}"
3636
image: nginx:latest
3737
networks:
3838
- name: host

tasks/redis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
- name: omero searchengine | Create Searchengine Redis container
1515
community.docker.docker_container:
16-
name: searchengine-redis-container
16+
name: "searchengine-redis-container{{ cluster_id | default(omit) }}"
1717
image: redis:latest
1818
networks:
1919
- name: "{{ searchengine_network }}"

tasks/searchengine.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@
298298
become: yes
299299
community.docker.docker_container:
300300
image: "{{ searchengine_docker_image }}"
301-
name: searchengine
301+
name: "searchengine{{ cluster_id | default(omit) }}"
302302
cleanup: True
303303
command: "run_app {{ searchengineurlprefix }}"
304304
networks:
@@ -319,7 +319,7 @@
319319
become: yes
320320
community.docker.docker_container:
321321
image: "{{ searchengine_docker_image }}"
322-
name: searchengine_celery
322+
name: "searchengine_celery{{ cluster_id | default(omit) }}"
323323
cleanup: True
324324
command: "celery"
325325
networks:
@@ -337,7 +337,7 @@
337337
become: yes
338338
community.docker.docker_container:
339339
image: "{{ searchengine_docker_image }}"
340-
name: searchengine_celery_beat
340+
name: "searchengine_celery_beat{{ cluster_id | default(omit) }}"
341341
cleanup: True
342342
command: "beat"
343343
networks:
@@ -357,7 +357,7 @@
357357
become: yes
358358
community.docker.docker_container:
359359
image: "{{ searchengine_docker_image }}"
360-
name: searchengine_indexer
360+
name: "searchengine_indexer{{ cluster_id | default(omit) }}"
361361
cleanup: True
362362
command: "get_index_data_from_database"
363363
networks:
@@ -376,7 +376,7 @@
376376
become: yes
377377
community.docker.docker_container:
378378
image: "{{ searchengine_docker_image }}"
379-
name: searchengine_backup_data
379+
name: "searchengine_backup_data{{ cluster_id | default(omit) }}"
380380
cleanup: True
381381
command: "backup_elasticsearch_data"
382382
networks:
@@ -394,7 +394,7 @@
394394
become: yes
395395
community.docker.docker_container:
396396
image: "{{ searchengine_docker_image }}"
397-
name: searchengine_restore
397+
name: "searchengine_restore{{ cluster_id | default(omit) }}"
398398
cleanup: True
399399
command: "restore_elasticsearch_data"
400400
networks:
@@ -413,7 +413,7 @@
413413
become: yes
414414
community.docker.docker_container:
415415
image: "{{ searchengine_docker_image }}"
416-
name: dump_projects_{{ dump_output_format }}
416+
name: "dump_projects_{{ dump_output_format }}{{ cluster_id | default(omit) }}"
417417
cleanup: True
418418
command: "dump_searchengine_data -d {{ default_datasource }} -r project -f {{ dump_output_format }} -t {{ data_dump_folder }}/{{ default_datasource }}/{{ dump_output_format }} -o True"
419419
networks:
@@ -431,7 +431,7 @@
431431
become: yes
432432
community.docker.docker_container:
433433
image: "{{ searchengine_docker_image }}"
434-
name: dump_screens_{{ dump_output_format }}
434+
name: "dump_screens_{{ dump_output_format }}{{ cluster_id | default(omit) }}"
435435
cleanup: True
436436
command: "dump_searchengine_data -d {{ default_datasource }} -r screen -f {{ dump_output_format }} -t {{ data_dump_folder }}/{{ default_datasource }}/{{ dump_output_format }} -o True"
437437
networks:

0 commit comments

Comments
 (0)