| commit | 958d874e52843aa5b1857fddd79a380167e3ee5a | [log] [tgz] |
|---|---|---|
| author | Michal Zegan <m.zegan@samsung.com> | Wed May 22 14:50:23 2019 +0200 |
| committer | Michal Zegan <m.zegan@samsung.com> | Fri May 24 11:49:10 2019 +0200 |
| tree | 8dde000716cd0ca7d56fd6939fcf307bb0e47207 | |
| parent | 810c950a6d80ec288a28d7cec7ef997db75699e3 [diff] |
Modify docker role to use dind This modifies the docker role to use dind. Note that it now uses pepare-docker-dind role, but *disables* start of docker. Change-Id: I55ac8d1f69531ba7496c34f990818b894a7d02a5 Issue-ID: OOM-1864 Signed-off-by: Michal Zegan <m.zegan@samsung.com>
diff --git a/ansible/roles/docker/handlers/main.yml b/ansible/roles/docker/handlers/main.yml index 9916a81..de4a52a 100644 --- a/ansible/roles/docker/handlers/main.yml +++ b/ansible/roles/docker/handlers/main.yml
@@ -1,6 +1,3 @@ --- - name: Restart Docker import_tasks: docker_restart.yml - when: - - ansible_env.container is defined - - ansible_env.container != 'docker'
diff --git a/ansible/roles/docker/molecule/default/molecule.yml b/ansible/roles/docker/molecule/default/molecule.yml index d1f67d7..1e800ee 100644 --- a/ansible/roles/docker/molecule/default/molecule.yml +++ b/ansible/roles/docker/molecule/default/molecule.yml
@@ -13,9 +13,11 @@ command: ${MOLECULE_DOCKER_COMMAND:-""} groups: - infrastructure + networks: + - name: docker_install + purge_networks: true volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /dev:/dev:ro + - /var/lib/docker provisioner: name: ansible lint:
diff --git a/ansible/roles/docker/molecule/default/prepare.yml b/ansible/roles/docker/molecule/default/prepare.yml index 8df759c..6bdde69 100644 --- a/ansible/roles/docker/molecule/default/prepare.yml +++ b/ansible/roles/docker/molecule/default/prepare.yml
@@ -2,4 +2,6 @@ - name: Prepare infra hosts: all roles: - - prepare-docker + - role: prepare-docker-dind + vars: + start_docker: false