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
This commit is contained in:
parent
7a39eaafcf
commit
bf2d53eb7d
@ -4,15 +4,6 @@
|
|||||||
state: directory
|
state: directory
|
||||||
path: /etc/docker
|
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
|
- name: Install docker-ce from upstream
|
||||||
include: upstream.yaml
|
include: upstream.yaml
|
||||||
when: use_upstream_docker
|
when: use_upstream_docker
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
{
|
|
||||||
}
|
|
@ -16,11 +16,6 @@
|
|||||||
testinfra_hosts = ['bionic-docker']
|
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):
|
def test_docker_service(host):
|
||||||
docker = host.service('docker')
|
docker = host.service('docker')
|
||||||
assert docker.is_running
|
assert docker.is_running
|
||||||
|
Loading…
x
Reference in New Issue
Block a user