update is-collector role with service prefix to distinct secrets

group_vars/is_collector_devnext/is_collector_devnext.yml

@@ -0,0 +1,6 @@
+start_scopes: 'devNext'
+complete_start_scope: '/gcube/devNext'
+gcore_host: 'node22.d.d4science.research-infrastructures.eu'
+is_collector_docker_stack_name: 'gcore-devnext'
+is_collector_docker_service_server_name: 'is-collector'
+

inventory/hosts.devnext

@@ -3,4 +3,5 @@
 10.1.29.205
 
 
-
+[is_collector_devnext]
+10.1.29.205

is-collector.yml

@@ -1,7 +1,7 @@
 ---
 - name: Configurazione IS Collector Service
-  #hosts: is_registry_devsec:is_registry_devnext
+  hosts: is_collector_devnext
-  hosts: all
+  #hosts: all
   # tasks:
   #   - name:
   #     debug:

roles/is-collector/defaults/main.yml

@@ -1,16 +1,17 @@
 ---
 # defaults file for is-collector
+service_prefix: 'is-collector'
 start_scopes: 'devNext'
 infrastructure: 'gcube'
 complete_start_scope: '/gcube/devNext'
-gcore_host: 'node8-d-d4s.d4science.org'
+gcore_host: 'node22.d.d4science.research-infrastructures.eu'
 config_dir: 'etc/org.gcube.informationsystem.collector'
 scope_name: '{{ start_scopes | lower }}'
 backup_dir: '/home/gcube/existICBackups-root'
-is_collector_compose_dir: '/srv/is-collector-stack-{{ scope_name }}'
+is_collector_compose_dir: '/srv/{{ service_prefix}}-stack-{{ scope_name }}'
-is_collector_docker_stack_name: 'is-collector-stack-{{ scope_name }}'
+is_collector_docker_stack_name: '{{ service_prefix}}-stack-{{ scope_name }}'
-is_collector_docker_service_server_name: 'is-collector-{{ scope_name }}'
+is_collector_docker_service_server_name: '{{ service_prefix}}-{{ scope_name }}'
-is_collector_docker_server_image: 'd4science/gcore-is-collector:latest'
+is_collector_docker_server_image: 'd4science/gcore-{{ service_prefix}}:latest'
-is_collector_docker_network: 'is-collector-network'
+is_collector_docker_network: '{{ service_prefix}}-network'
 #is_registry_service_port: 8080
-is_registry_haproxy_public_net: 'haproxy-public'
+is_collector_haproxy_public_net: 'haproxy-public'

roles/is-collector/tasks/main.yml

@@ -11,7 +11,7 @@
 - name: Install the docker compose file
   ansible.builtin.template:
     src: docker-compose.yml.j2
-    dest: '{{ is_collector_compose_dir }}/is-collector-docker-compose.yml'
+    dest: '{{ is_collector_compose_dir }}/{{ service_prefix }}-docker-compose.yml'
     owner: root
     group: root
     mode: 0400
@@ -43,19 +43,19 @@
 
 - name: Create the secret for GHNConfig.xml
   community.docker.docker_secret:
-    name: ghn-config-{{ scope_name }}
+    name: "{{ service_prefix }}-ghn-config-{{ scope_name }}"
     data_src: '{{ is_collector_compose_dir }}/GHNConfig.xml'
     state: present
 
 - name: Create the secret for jndi-config.xml
   community.docker.docker_secret:
-    name: jndi-config-{{ scope_name }}
+    name: "{{ service_prefix }}-jndi-config-{{ scope_name }}"
     data_src: '{{ is_collector_compose_dir }}/jndi-config.xml'
     state: present
 
 - name: Create the secret for server-config.wsdd
   community.docker.docker_secret:
-    name: server-config-{{ scope_name }}
+    name: "{{ service_prefix }}-server-config-{{ scope_name }}"
     data_src: '{{ is_collector_compose_dir }}/server-config.wsdd'
     state: present
 
@@ -64,4 +64,4 @@
     name: '{{ is_collector_docker_stack_name }}'
     state: present
     compose:
-      - '{{ is_collector_compose_dir }}/is-collector-docker-compose.yml'
+      - '{{ is_collector_compose_dir }}/{{ service_prefix }}-docker-compose.yml'

roles/is-collector/templates/docker-compose.yml.j2

@@ -6,11 +6,11 @@ networks:
     external: true
 
 secrets:
-  ghn-config-{{ scope_name }}:
+  {{ service_prefix }}-ghn-config-{{ scope_name }}:
     external: true
-  jndi-config-{{ scope_name }}:
+  {{ service_prefix }}-jndi-config-{{ scope_name }}:
     external: true  
-  server-config-{{ scope_name }}:
+  {{ service_prefix }}-server-config-{{ scope_name }}:
     external: true
 
 volumes:
@@ -31,13 +31,13 @@ services:
     volumes:
       - is_collector_{{ scope_name }}:/gcube-data
     secrets:
-      - source: ghn-config-{{ scope_name }}
+      - source: {{ service_prefix }}-ghn-config-{{ scope_name }}
         target: /home/gcube/gCore/config/GHNConfig.xml
         mode: 0444
-      - source: jndi-config-{{ scope_name }}
+      - source: {{ service_prefix }}-jndi-config-{{ scope_name }}
         target: /home/gcube/gCore/etc/is-collector-service/jndi-config.xml
         mode: 0444
-      - source: server-config-{{ scope_name }}
+      - source: {{ service_prefix }}-server-config-{{ scope_name }}
         target: /home/gcube/gCore/etc/globus_wsrf_core/server-config.wsdd
         mode: 0444
     deploy: