diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml index 2f63499130c7db723317466f0cd08450ba643748..d9df1ef78cd8fa2dba8a673f2445014c957d3847 100644 --- a/ansible/roles/docker/defaults/main.yml +++ b/ansible/roles/docker/defaults/main.yml @@ -3,5 +3,6 @@ docker_storage_driver: overlay2 docker_storage_volume_group: docker_storage_volume_thinpool: docker_registry_mirrors: [] +docker_daemon_debug: false docker_daemon_mtu: 1500 docker_daemon_live_restore: false diff --git a/ansible/roles/docker/templates/daemon.json.j2 b/ansible/roles/docker/templates/daemon.json.j2 index da8ede5251ef1ada7aa7d91208524c2bee102981..bf392d5607f45b8e552cb1947d616d24e60622c8 100644 --- a/ansible/roles/docker/templates/daemon.json.j2 +++ b/ansible/roles/docker/templates/daemon.json.j2 @@ -1,4 +1,7 @@ { +{%- if docker_daemon_debug | bool %} + "debug": {{ docker_daemon_debug | to_json }}, +{%- endif %} {%- if docker_registry_mirrors | length > 0 %} "registry-mirrors": [ {%- for mirror in docker_registry_mirrors %} diff --git a/playbooks/kayobe-infra-vm-base/overrides.yml.j2 b/playbooks/kayobe-infra-vm-base/overrides.yml.j2 index 061d7589ce517bb2d9ffdee6a45598982348889c..79e67bca4b679819e6e6d0168a3a50a4510aab71 100644 --- a/playbooks/kayobe-infra-vm-base/overrides.yml.j2 +++ b/playbooks/kayobe-infra-vm-base/overrides.yml.j2 @@ -1,4 +1,5 @@ --- +docker_daemon_debug: true # Use the OpenStack infra's Dockerhub mirror. docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2 index c3376987552a6b955ffee583c4a87e3b7c9f7178..cae26b8186ffdc1f86734b6c6a3451938c44cb5b 100644 --- a/playbooks/kayobe-overcloud-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-base/overrides.yml.j2 @@ -1,4 +1,5 @@ --- +docker_daemon_debug: true # Use the OpenStack infra's Dockerhub mirror. docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 index d499f5cd5d94780648a8578a2d4a669574e5710a..84301ef94725c838af320a6c7a465318503c1fe1 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 @@ -1,4 +1,5 @@ --- +docker_daemon_debug: true # Use the OpenStack infra's Dockerhub mirror. docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" diff --git a/playbooks/kayobe-seed-base/overrides.yml.j2 b/playbooks/kayobe-seed-base/overrides.yml.j2 index f5cca32d9ed3f95652e029a0d696f289020518e9..062ab6c15505e8732899142d9a2f643cb864c2dc 100644 --- a/playbooks/kayobe-seed-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-base/overrides.yml.j2 @@ -1,4 +1,5 @@ --- +docker_daemon_debug: true # Use the OpenStack infra's Dockerhub mirror. docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" diff --git a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 index 81b539e03f9d84c0a1b18d62d6fb95566b1a2d73..185d4242008e8d789c04d8166d45ec1d9b9af231 100644 --- a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 @@ -1,4 +1,5 @@ --- +docker_daemon_debug: true # Use the OpenStack infra's Dockerhub mirror. docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" diff --git a/playbooks/kayobe-seed-vm-base/overrides.yml.j2 b/playbooks/kayobe-seed-vm-base/overrides.yml.j2 index 108efb74f761e5f83028df96ee57f5f5603db665..085ea11f5a4383f68edbbf92ee624469a48a1a2b 100644 --- a/playbooks/kayobe-seed-vm-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-vm-base/overrides.yml.j2 @@ -1,4 +1,5 @@ --- +docker_daemon_debug: true # Use the OpenStack infra's Dockerhub mirror. docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/"