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 <gabrioux@ibm.com>
(cherry picked from commit ef5a09d0e041806369a6caa7f7d062a47811a08f)

diff --git a/roles/ceph-container-engine/vars/Ubuntu-16.yml b/roles/ceph-container-engine/vars/Ubuntu-16.yml
deleted file mode 100644 (file)
index aa5087f..0000000
--- 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 (file)
index aa5087f..0000000
--- 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 (file)
index aa5087f..0000000
--- 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 (file)
index 0000000..aa5087f
--- /dev/null
+++ b/roles/ceph-container-engine/vars/Ubuntu.yml
@@ -0,0 +1,3 @@
+---
+container_package_name: docker.io
+container_service_name: docker