Merge branch 'staging'

deNBI · Jul 27, 2022 · 271da00 · 271da00
2 parents 04d6b7f + f54c563
commit 271da00
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/VirtualMachineService/ancon/playbooks/change_key.yml b/VirtualMachineService/ancon/playbooks/change_key.yml
@@ -1,9 +1,12 @@
 - name: Echo Public Key to set
   ansible.builtin.command: echo "${{ change_key_vars.key  }}"
-
+  tags:
+  - always
 - name: Set user public Key and remove created public Key
   authorized_key:
     user: ubuntu
     key: "{{ change_key_vars.key }}"
     state: present
     exclusive: True
+  tags:
+  - always
diff --git a/VirtualMachineService/ancon/playbooks/generic_playbook.yml b/VirtualMachineService/ancon/playbooks/generic_playbook.yml
@@ -5,10 +5,6 @@
   vars_files:
   pre_tasks:
 
-    - name: PRE_TASK Wait for cloud-init / user-data to finish
-      ansible.builtin.command: cloud-init status --wait
-      changed_when: false
-
     - name: Populate service facts
       ansible.builtin.service_facts:
 

diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml
@@ -17,7 +17,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.3
+    image: redis:7.0.4
     expose:
       - "6379"
     networks:

diff --git a/docker-compose.dev.bibigrid.yml b/docker-compose.dev.bibigrid.yml
@@ -18,7 +18,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.3
+    image: redis:7.0.4
     expose:
       - "6379"
     networks:

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -18,7 +18,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.3
+    image: redis:7.0.4
     expose:
       - "6379"
     networks:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.3
+    image: redis:7.0.4
     expose:
       - "6379"
     networks: