From: Dimitri Savineau <dsavinea@redhat.com>
Date: Fri, 9 Oct 2020 18:34:14 +0000 (-0400)
Subject: container: remove container_binding_name variable
X-Git-Tag: v6.0.0alpha3~91
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9252b7517300fd507842a1b76966928048855758;p=ceph-ansible.git

container: remove container_binding_name variable

The container_binding_name package was only mandatory when we were
using the docker modules (docker_image and docker_container) but since
we manage both docker and podman containers without using the dedicated
module then we can remove it.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml b/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
index b00ba4646..5d73a1621 100644
--- a/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
+++ b/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
@@ -13,7 +13,7 @@
 
 - name: install container packages
   package:
-    name: ['{{ container_package_name }}', '{{ container_binding_name }}']
+    name: '{{ container_package_name }}'
     update_cache: true
   register: result
   until: result is succeeded
diff --git a/roles/ceph-container-engine/vars/Debian.yml b/roles/ceph-container-engine/vars/Debian.yml
index 3df067185..9e2eaf69a 100644
--- a/roles/ceph-container-engine/vars/Debian.yml
+++ b/roles/ceph-container-engine/vars/Debian.yml
@@ -1,4 +1,3 @@
 ---
 container_package_name: docker-ce
 container_service_name: docker
-container_binding_name: python-docker
diff --git a/roles/ceph-container-engine/vars/RedHat-8.yml b/roles/ceph-container-engine/vars/RedHat-8.yml
index 3a93dbd04..a46ed44fb 100644
--- a/roles/ceph-container-engine/vars/RedHat-8.yml
+++ b/roles/ceph-container-engine/vars/RedHat-8.yml
@@ -1,4 +1,3 @@
 ---
 container_package_name: podman
 container_service_name: podman
-container_binding_name: podman
diff --git a/roles/ceph-container-engine/vars/RedHat.yml b/roles/ceph-container-engine/vars/RedHat.yml
index 4a14707dd..8fca22c27 100644
--- a/roles/ceph-container-engine/vars/RedHat.yml
+++ b/roles/ceph-container-engine/vars/RedHat.yml
@@ -1,4 +1,3 @@
 ---
 container_package_name: docker
 container_service_name: docker
-container_binding_name: python-docker-py
diff --git a/roles/ceph-container-engine/vars/Ubuntu-16.yml b/roles/ceph-container-engine/vars/Ubuntu-16.yml
index b5b7c3529..aa5087fe5 100644
--- a/roles/ceph-container-engine/vars/Ubuntu-16.yml
+++ b/roles/ceph-container-engine/vars/Ubuntu-16.yml
@@ -1,4 +1,3 @@
 ---
 container_package_name: docker.io
 container_service_name: docker
-container_binding_name: python-docker
diff --git a/roles/ceph-container-engine/vars/Ubuntu-18.yml b/roles/ceph-container-engine/vars/Ubuntu-18.yml
index f457ca03a..aa5087fe5 100644
--- a/roles/ceph-container-engine/vars/Ubuntu-18.yml
+++ b/roles/ceph-container-engine/vars/Ubuntu-18.yml
@@ -1,4 +1,3 @@
 ---
 container_package_name: docker.io
 container_service_name: docker
-container_binding_name: python3-docker
diff --git a/roles/ceph-container-engine/vars/Ubuntu-20.yml b/roles/ceph-container-engine/vars/Ubuntu-20.yml
index f457ca03a..aa5087fe5 100644
--- a/roles/ceph-container-engine/vars/Ubuntu-20.yml
+++ b/roles/ceph-container-engine/vars/Ubuntu-20.yml
@@ -1,4 +1,3 @@
 ---
 container_package_name: docker.io
 container_service_name: docker
-container_binding_name: python3-docker