diff options
| author |   Michal Zegan <m.zegan@samsung.com> | 2019-05-22 14:50:23 +0200 |
|---|---|---|
| committer | Michal Zegan <m.zegan@samsung.com> | 2019-05-24 11:49:10 +0200 |
| commit | 958d874e52843aa5b1857fddd79a380167e3ee5a (patch) | |
| 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>
| -rw-r--r-- | ansible/roles/docker/handlers/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/docker/molecule/default/molecule.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/docker/molecule/default/prepare.yml | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/ansible/roles/docker/handlers/main.yml b/ansible/roles/docker/handlers/main.yml index 9916a81b..de4a52ac 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 d1f67d75..1e800ee9 100644 --- a/ansible/roles/docker/molecule/default/molecule.yml +++ b/ansible/roles/docker/molecule/default/molecule.yml @@ -13,9 +13,11 @@ platforms: 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 8df759c9..6bdde697 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 |