diff options
| -rw-r--r-- | inventory/group_vars/k8s-chtest/vars.yml | 1 | ||||
| -rw-r--r-- | inventory/group_vars/k8s-emc/vars.yml | 1 | ||||
| -rw-r--r-- | inventory/group_vars/k8s-lwl/vars.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-thetys.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ele-thetys.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ele-uhrturm.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/glt-calypso.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/glt-datacop.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/glt-dione.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/glt-helene.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/glt-telesto.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/glt-thetys.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/lw-thetys.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/s2-thetys.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/sgg-icecast.yml | 1 | ||||
| -rw-r--r-- | roles/docker/engine/defaults/main.yml | 9 |
16 files changed, 6 insertions, 18 deletions
diff --git a/inventory/group_vars/k8s-chtest/vars.yml b/inventory/group_vars/k8s-chtest/vars.yml index 5d0d1002..60450f88 100644 --- a/inventory/group_vars/k8s-chtest/vars.yml +++ b/inventory/group_vars/k8s-chtest/vars.yml @@ -1,6 +1,5 @@ --- docker_pkg_provider: docker-com -docker_pkg_name: docker-ce kubernetes_version: 1.20.2 kubernetes_container_runtime: docker diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml index 28b7c785..6964effb 100644 --- a/inventory/group_vars/k8s-emc/vars.yml +++ b/inventory/group_vars/k8s-emc/vars.yml @@ -1,6 +1,5 @@ --- docker_pkg_provider: docker-com -docker_pkg_name: docker-ce kubernetes_version: 1.17.2 kubernetes_container_runtime: docker diff --git a/inventory/group_vars/k8s-lwl/vars.yml b/inventory/group_vars/k8s-lwl/vars.yml index 821e083c..cd375971 100644 --- a/inventory/group_vars/k8s-lwl/vars.yml +++ b/inventory/group_vars/k8s-lwl/vars.yml @@ -1,6 +1,5 @@ --- docker_pkg_provider: docker-com -docker_pkg_name: docker-ce kubernetes_version: 1.17.5 kubernetes_container_runtime: docker diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index 77e9470c..0c4e13fb 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -31,7 +31,6 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 7901beda..dc4be807 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -26,7 +26,6 @@ apt_repo_components: - non-free ## for microcode updates docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/ele-uhrturm.yml b/inventory/host_vars/ele-uhrturm.yml index 71c312cc..6ea67363 100644 --- a/inventory/host_vars/ele-uhrturm.yml +++ b/inventory/host_vars/ele-uhrturm.yml @@ -18,5 +18,4 @@ ssh_users_root: - datacop docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_pkg_version: 18.06.1~ce~3-0~debian diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml index bdd377cc..531e4366 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -56,7 +56,6 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/glt-datacop.yml b/inventory/host_vars/glt-datacop.yml index e66eba05..2d40a418 100644 --- a/inventory/host_vars/glt-datacop.yml +++ b/inventory/host_vars/glt-datacop.yml @@ -51,7 +51,6 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index c860d301..fab997bc 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -46,7 +46,6 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index c016b0a7..f3bc6263 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -46,7 +46,6 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index 3ce9154c..93db9df5 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -56,7 +56,6 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index 51aaee89..c2c3878c 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -51,7 +51,6 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml index 706557f7..4dd48a27 100644 --- a/inventory/host_vars/lw-thetys.yml +++ b/inventory/host_vars/lw-thetys.yml @@ -27,7 +27,6 @@ apt_repo_components: - non-free ## for microcode updates docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index 957abfb0..e292d060 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -33,7 +33,6 @@ blackmagic_desktopvideo_version: 11.7a12 docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/inventory/host_vars/sgg-icecast.yml b/inventory/host_vars/sgg-icecast.yml index cab24c65..887ef8ac 100644 --- a/inventory/host_vars/sgg-icecast.yml +++ b/inventory/host_vars/sgg-icecast.yml @@ -36,7 +36,6 @@ nginx_server_names_hash_bucket_size: 64 docker_pkg_provider: docker-com -docker_pkg_name: docker-ce docker_storage: type: lvm diff --git a/roles/docker/engine/defaults/main.yml b/roles/docker/engine/defaults/main.yml index b2c21963..a476bda1 100644 --- a/roles/docker/engine/defaults/main.yml +++ b/roles/docker/engine/defaults/main.yml @@ -1,9 +1,12 @@ --- -docker_pkg_provider: distro -docker_pkg_name: docker.io +_docker_pkg_name_map_: + distro: docker.io + docker-com: docker-ce +docker_pkg_provider: distro # docker_pkg_provider: docker-com -# docker_pkg_name: docker-ce + +docker_pkg_name: "{{ _docker_pkg_name_map_[docker_pkg_provider] }}" # docker_pkg_version: |