ansible: Support Ubuntu in docker role

Change-Id: Ib68bfe59fc1c8da177ed1780876c01029478f1e8
Signed-off-by: Kienan Stewart <kstewart@efficios.com>

diff --git a/automation/ansible/roles/docker/defaults/main.yml b/automation/ansible/roles/docker/defaults/main.yml
index ea6986d115bb2476185e36e58a6261258f59dcce..4959b97b13d71d4bd0390a7e5574961e710e6534 100644 (file)
--- a/automation/ansible/roles/docker/defaults/main.yml
+++ b/automation/ansible/roles/docker/defaults/main.yml
@@ -17,3 +17,7 @@ docker_sles_products:
 
 docker_SLES_packages:
   - 'docker'
+
+docker_Ubuntu_packages:
+  - 'docker.io'
+  - 'docker-compose-v2'

diff --git a/automation/ansible/roles/docker/tasks/setup-Debian.yml b/automation/ansible/roles/docker/tasks/setup-Debian.yml
index b670181dfa1029ac343bdf906f8c77635bc4b0b3..386a27a365a3cf918ab540181017f01224982032 100644 (file)
--- a/automation/ansible/roles/docker/tasks/setup-Debian.yml
+++ b/automation/ansible/roles/docker/tasks/setup-Debian.yml
@@ -8,9 +8,8 @@
   block:
     - name: Add upstream docker apt key
       ansible.builtin.apt_key:
-        url: 'https://download.docker.com/linux/debian/gpg'
+        url: "https://download.docker.com/linux/{{ansible_distribution|lower}}/gpg"
     - name: Add upstream docker sources
-      when: ansible_distribution == 'Debian'
       ansible.builtin.apt_repository:
         filename: 'docker'
-        repo: "deb https://download.docker.com/linux/debian {{ansible_distribution_release}} stable"
+        repo: "deb https://download.docker.com/linux/{{ansible_distribution|lower}} {{ansible_distribution_release}} stable"

diff --git a/automation/ansible/roles/docker/vars/Ubuntu-24.yml b/automation/ansible/roles/docker/vars/Ubuntu-24.yml
new file mode 100644 (file)
index 0000000..7ffcfd7
--- /dev/null
+++ b/automation/ansible/roles/docker/vars/Ubuntu-24.yml
@@ -0,0 +1,4 @@
+---
+
+# Docker upstream doesn't yet have a repository for Ubuntu noble
+docker_upstream: false