summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Silvius <s.silvius@partner.samsung.com>2019-05-30 15:23:26 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-30 15:23:26 +0000
commitbddfaebbfab17f78fc5bfa2e7302584373d44523 (patch)
treeb802282c4d6fb3b4976afdab1b64420b451ce718
parent1827d9c464e55037d4de159ea8461fd660cd37fa (diff)
parent958d874e52843aa5b1857fddd79a380167e3ee5a (diff)
Merge "Modify docker role to use dind"
-rw-r--r--ansible/roles/docker/molecule/default/molecule.yml6
-rw-r--r--ansible/roles/docker/molecule/default/prepare.yml4
2 files changed, 7 insertions, 3 deletions
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