Merge "Don't install a blank docker daemon config"

This commit is contained in:
Zuul 2019-02-22 20:26:39 +00:00 committed by Gerrit Code Review
commit 1e71c37df7
3 changed files with 0 additions and 16 deletions

View File

@ -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

View File

@ -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