Move tau-specific docker-env setup to main playbook

2020-12-09 19:27:14 +01:00 · 2020-12-09 19:27:14 +01:00 · 176881738a
commit 176881738a
parent 164d717ffe
2 changed files with 8 additions and 12 deletions
--- a/main.yml
+++ b/main.yml
@ -49,8 +49,14 @@
  - role: install-docker

  tasks:
-    - name: Setup Docker Environment
-      include_tasks: tasks/docker_env.yml
+    - name: Setup docker network
+      docker_network:
+        name: dockernet
+        driver: bridge
+        ipam_config:
+          - subnet: 192.168.0.0/24
+            gateway: 192.168.0.1
+        state: present

    - name: Setup httpd
      include_tasks: tasks/httpd.yml
--- a/tasks/docker_env.yml
+++ b/tasks/docker_env.yml
@ -1,10 +0,0 @@
- name: Setup docker network
-  docker_network:
-    name: dockernet
-    driver: bridge
-    ipam_config:
-      - subnet: 192.168.0.0/24
-        gateway: 192.168.0.1
-    state: present
-
-