Merge pull request #351 from deNBI/dev

Dev
deNBI · Oct 10, 2023 · 844b78a · 844b78a
2 parents f99ef3c + 175b046
commit 844b78a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/cluster/master.site.yml b/cluster/master.site.yml
@@ -6,7 +6,6 @@
     - vars/common_configuration.yml
   roles:
     - common
-    - geerlingguy.docker
     - master
     - role: slurm
       tags:

diff --git a/cluster/roles/common/tasks/001-apt.yml b/cluster/roles/common/tasks/001-apt.yml
@@ -95,6 +95,16 @@
     name: swift
     state: present
   when: mode == "openstack"
+
+- name: Add Docker repository key
+  ansible.builtin.apt_key:
+    url: 'https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg'
+    state: present
+
+- name: Add Docker repository
+  ansible.builtin.apt_repository:
+    repo: 'deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_lsb.codename}} stable'
+    state: present
 
 - name: Add apt.bi.denbi.de repository key
   ansible.builtin.apt_key:

diff --git a/cluster/worker.site.yml b/cluster/worker.site.yml
@@ -6,7 +6,6 @@
     - vars/common_configuration.yml
   roles:
     - common
-    - geerlingguy.docker
     - worker
     - role: slurm
       tags:

diff --git a/packer/requirements.yml b/packer/requirements.yml
@@ -16,7 +16,7 @@ roles:
 
   - name: autoscaling
     src: https://github.com/deNBI/autoscaling-ansible
-    version: 1.1.8
+    version: 1.1.9
 
   - name: geerlingguy.swap
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
         - vars/common_configuration.yml
       roles:
         - common
-        - geerlingguy.docker
         - master
         - role: slurm
           tags:
@@ Expand Down @@