Update variable name flattening lower case values

group_vars/is_registry_devnext/is_registry_devnext.yml

@@ -1,5 +1,6 @@
 start_scopes: 'devNext'
 complete_start_scope: '/gcube/devNext'
 gcore_host: 'node14-d-d4s.d4science.org'
-
+is_registry_docker_stack_name: 'gcore-devnext'
+is_registry_docker_service_server_name: 'is-registry'
 

group_vars/is_registry_devsec/is_registry_devsec.yml

@@ -1,3 +1,5 @@
 start_scopes: 'devsec'
 complete_start_scope: '/gcube/devsec'
-gcore_host: 'node3.d.d4science.research-infrastructures.eu'
+gcore_host: 'node3.d.d4science.research-infrastructures.eu'
+is_registry_docker_stack_name: 'gcore-devsec'
+is_registry_docker_service_server_name: 'is_registry'

inventory/hosts.devnext

@@ -1,6 +1,6 @@
 [is_registry_devnext]
-10.1.28.135
-
+#10.1.28.135
+10.1.29.205
 
 
 

inventory/hosts.devsec

@@ -1,6 +1,6 @@
 [is_registry_devsec]
-10.1.28.135
-
+#10.1.28.135
+10.1.29.205
 
 
 

is-registry/defaults/main.yml

@@ -5,9 +5,10 @@ infrastructure: 'gcube'
 complete_start_scope: '/gcube/devNext'
 gcore_host: 'node14-d-d4s.d4science.org'
 config_dir: 'etc/is-registry-service'
-is_registry_compose_dir: '/srv/is-registry-stack-{{ start_scopes }}'
-is_registry_docker_stack_name: 'is-registry-stack-{{ start_scopes }}'
-is_registry_docker_service_server_name: 'is-registry-{{ start_scopes }}'
+scope_name: '{{ start_scopes | lower }}'
+is_registry_compose_dir: '/srv/is-registry-stack-{{ scope_name }}'
+is_registry_docker_stack_name: 'is-registry-stack-{{ scope_name }}'
+is_registry_docker_service_server_name: 'is-registry-{{ scope_name }}'
 is_registry_docker_server_image: 'd4science/gcore-is-registry:latest'
 is_registry_docker_network: 'is-registry-network'
 #is_registry_service_port: 8080

is-registry/tasks/main.yml

@@ -43,19 +43,19 @@
 
 - name: Create the secret for GHNConfig.xml
   community.docker.docker_secret:
-    name: ghn-config-{{ start_scopes }}
+    name: ghn-config-{{ scope_name }}
     data_src: '{{ is_registry_compose_dir }}/GHNConfig.xml'
     state: present
 
 - name: Create the secret for jndi-config.xml
   community.docker.docker_secret:
-    name: jndi-config-{{ start_scopes }}
+    name: jndi-config-{{ scope_name }}
     data_src: '{{ is_registry_compose_dir }}/jndi-config.xml'
     state: present
 
 - name: Create the secret for server-config.wsdd
   community.docker.docker_secret:
-    name: server-config-{{ start_scopes }}
+    name: server-config-{{ scope_name }}
     data_src: '{{ is_registry_compose_dir }}/server-config.wsdd'
     state: present
 

is-registry/templates/docker-compose.yml.j2

@@ -3,14 +3,14 @@ version: '3.6'
 networks:
   {{ is_registry_docker_network }}:
   {{ is_registry_haproxy_public_net }}:
-  #  external: true
+    external: true
 
 secrets:
-  ghn-config-{{ start_scopes }}:
+  ghn-config-{{ scope_name }}:
     external: true
-  jndi-config-{{ start_scopes }}:
+  jndi-config-{{ scope_name }}:
     external: true  
-  server-config-{{ start_scopes }}:
+  server-config-{{ scope_name }}:
     external: true
 
 services:
@@ -20,13 +20,13 @@ services:
       - {{ is_registry_docker_network }}
       - {{ is_registry_haproxy_public_net }}
     secrets:
-      - source: ghn-config-{{ start_scopes }}
+      - source: ghn-config-{{ scope_name }}
         target: /home/gcube/gCore/config/GHNConfig.xml
         mode: 0444
-      - source: jndi-config-{{ start_scopes }}
+      - source: jndi-config-{{ scope_name }}
         target: /home/gcube/gCore/etc/is-registry-service/jndi-config.xml
         mode: 0444
-      - source: server-config-{{ start_scopes }}
+      - source: server-config-{{ scope_name }}
         target: /home/gcube/gCore/etc/globus_wsrf_core/server-config.wsdd
         mode: 0444
     deploy: