diff options
author | Samuli Silvius <s.silvius@partner.samsung.com> | 2019-03-03 13:24:55 +0200 |
---|---|---|
committer | Samuli Silvius <s.silvius@partner.samsung.com> | 2019-03-03 13:27:00 +0200 |
commit | 427850b55cb858549582bfc9c8737d3a3bcf55b2 (patch) | |
tree | 8be1c57b8c5027dfa41a96379e23562ae240daf6 /ansible | |
parent | 3313c854585836ec97b72e2ff82d9ed4bf4ed710 (diff) |
Improve nginx role testability
Moving ports and volumes to defaults to make them easier customiced.
Change-Id: I8b5418443f0b55ef61890a08c530040c07617122
Issue-ID: OOM-1693
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Diffstat (limited to 'ansible')
-rw-r--r-- | ansible/roles/nginx/defaults/main.yml | 21 | ||||
-rw-r--r-- | ansible/roles/nginx/tasks/main.yml | 19 |
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 |