From: Guillaume Abrioux Date: Wed, 20 Mar 2024 08:26:29 +0000 (+0100) Subject: container-engine: enforce docker for Ubuntu os family X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef5a09d0e041806369a6caa7f7d062a47811a08f;p=ceph-ansible.git container-engine: enforce docker for Ubuntu os family This enforces docker.io and docker respectively for `container_package_name` and `container_service_name` by default for Ubuntu distribution. Fixes: #7496 Signed-off-by: Guillaume Abrioux --- diff --git a/roles/ceph-container-engine/vars/Ubuntu-16.yml b/roles/ceph-container-engine/vars/Ubuntu-16.yml deleted file mode 100644 index aa5087fe5..000000000 --- a/roles/ceph-container-engine/vars/Ubuntu-16.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -container_package_name: docker.io -container_service_name: docker diff --git a/roles/ceph-container-engine/vars/Ubuntu-18.yml b/roles/ceph-container-engine/vars/Ubuntu-18.yml deleted file mode 100644 index aa5087fe5..000000000 --- a/roles/ceph-container-engine/vars/Ubuntu-18.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -container_package_name: docker.io -container_service_name: docker diff --git a/roles/ceph-container-engine/vars/Ubuntu-20.yml b/roles/ceph-container-engine/vars/Ubuntu-20.yml deleted file mode 100644 index aa5087fe5..000000000 --- a/roles/ceph-container-engine/vars/Ubuntu-20.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -container_package_name: docker.io -container_service_name: docker diff --git a/roles/ceph-container-engine/vars/Ubuntu.yml b/roles/ceph-container-engine/vars/Ubuntu.yml new file mode 100644 index 000000000..aa5087fe5 --- /dev/null +++ b/roles/ceph-container-engine/vars/Ubuntu.yml @@ -0,0 +1,3 @@ +--- +container_package_name: docker.io +container_service_name: docker