From bf2d53eb7d0c21a371f8be25cd9133b148a74a98 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 20 Feb 2019 08:16:09 -0800 Subject: [PATCH] Don't install a blank docker daemon config It's not necessary to install an empty config file, and doing so will prevent us from using other roles to configure mirrors on test hosts. Change-Id: I3d7eb615f1e297fde2d693b5fc64bc6e691e2c22 --- playbooks/roles/install-docker/tasks/main.yaml | 9 --------- playbooks/roles/install-docker/templates/daemon.json.j2 | 2 -- testinfra/test_docker.py | 5 ----- 3 files changed, 16 deletions(-) delete mode 100644 playbooks/roles/install-docker/templates/daemon.json.j2 diff --git a/playbooks/roles/install-docker/tasks/main.yaml b/playbooks/roles/install-docker/tasks/main.yaml index 296a1e391a..83e088bf2b 100644 --- a/playbooks/roles/install-docker/tasks/main.yaml +++ b/playbooks/roles/install-docker/tasks/main.yaml @@ -4,15 +4,6 @@ state: directory path: /etc/docker -- name: Install docker configuration - become: yes - template: - dest: /etc/docker/daemon.json - group: root - mode: 0644 - owner: root - src: daemon.json.j2 - - name: Install docker-ce from upstream include: upstream.yaml when: use_upstream_docker diff --git a/playbooks/roles/install-docker/templates/daemon.json.j2 b/playbooks/roles/install-docker/templates/daemon.json.j2 deleted file mode 100644 index 2c63c08510..0000000000 --- a/playbooks/roles/install-docker/templates/daemon.json.j2 +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/testinfra/test_docker.py b/testinfra/test_docker.py index 1b71579e67..25c09fb1d0 100644 --- a/testinfra/test_docker.py +++ b/testinfra/test_docker.py @@ -16,11 +16,6 @@ testinfra_hosts = ['bionic-docker'] -def test_docker_config(host): - daemon_json = host.file('/etc/docker/daemon.json') - assert daemon_json.exists - - def test_docker_service(host): docker = host.service('docker') assert docker.is_running