Merge "Improve nginx role testability"

2 files changed, 28 insertions, 12 deletions

diff --git a/ansible/roles/nginx/defaults/main.yml b/ansible/roles/nginx/defaults/main.yml
new file mode 100644
index 00000000..7c9fa0be
--- /dev/null
+++ b/ansible/roles/nginx/defaults/main.yml
@@ -0,0 +1,21 @@
+---
+simulated_hosts:
+  git:
+  http:
+  nexus:
+all_simulated_hosts:
+    "{{ simulated_hosts.git + simulated_hosts.http + simulated_hosts.nexus }}"
+
+nginx:
+  ports:
+    - "80:80"
+    - "443:443"
+    - "10001:443"
+  volumes:
+    - "{{ app_data_path }}/cfg/nginx.conf:/etc/nginx/nginx.conf:ro"
+    - "{{ app_data_path }}/certs:/etc/nginx/certs:ro"
+    - "{{ app_data_path }}/git-repo:/srv/git:rw"
+    - "{{ app_data_path }}/http:/srv/http:rw"
+    - "{{ app_data_path }}/pkg/rhel:/srv/http/repo.infra-server/rhel:rw"
+    - "{{ app_data_path }}/pkg/ubuntu/xenial:/srv/http/repo.infra-server/ubuntu/xenial:rw"
+    - /var/log/nginx:/var/log/nginx:rw
diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
index c59be75f..1ec0adbc 100644
--- a/ansible/roles/nginx/tasks/main.yml
+++ b/ansible/roles/nginx/tasks/main.yml
@@ -16,23 +16,18 @@
     state: present
     timeout: 120
 
+- name: Create nexus network
+  docker_network:
+    name: nexus_network
+    state: present
+
 - name: Start nginx
   docker_container:
     name: own_nginx
     image: own_nginx
     networks:
       - name: nexus_network
-    ports:
-      - "80:80"
-      - "443:443"
-      - "10001:443"
-    volumes:
-      - "{{ app_data_path }}/cfg/nginx.conf:/etc/nginx/nginx.conf:ro"
-      - "{{ app_data_path }}/certs:/etc/nginx/certs:ro"
-      - "{{ app_data_path }}/git-repo:/srv/git:rw"
-      - "{{ app_data_path }}/http:/srv/http:rw"
-      - "{{ app_data_path }}/pkg/rhel:/srv/http/repo.infra-server/rhel:rw"
-      - "{{ app_data_path }}/pkg/ubuntu/xenial:/srv/http/repo.infra-server/ubuntu/xenial:rw"
-      - /var/log/nginx:/var/log/nginx:rw
+    ports: "{{ nginx.ports }}"
+    volumes: "{{ nginx.volumes }}"
     state: started
     restart_policy: unless-stopped