summaryrefslogtreecommitdiffstats
path: root/ansible/roles/nginx
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/roles/nginx')
-rw-r--r--ansible/roles/nginx/defaults/main.yml2
-rw-r--r--ansible/roles/nginx/tasks/main.yml12
2 files changed, 8 insertions, 6 deletions
diff --git a/ansible/roles/nginx/defaults/main.yml b/ansible/roles/nginx/defaults/main.yml
index 7c9fa0be..260de9bf 100644
--- a/ansible/roles/nginx/defaults/main.yml
+++ b/ansible/roles/nginx/defaults/main.yml
@@ -19,3 +19,5 @@ nginx:
- "{{ 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
+# Default rule for tarball naming translation
+nginx_server_image_tar: "{{ nginx_server_image | regex_replace('(\\/|\\:)', '_') }}.tar"
diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
index 1ec0adbc..54a0c818 100644
--- a/ansible/roles/nginx/tasks/main.yml
+++ b/ansible/roles/nginx/tasks/main.yml
@@ -9,10 +9,10 @@
src: nginx.conf.j2
dest: "{{ app_data_path }}/cfg/nginx.conf"
-- name: Load nginx image
+- name: Load nginx server image
docker_image:
- name: own_nginx
- load_path: "{{ app_data_path }}/offline_data/docker_images_infra/own_nginx_latest.tar"
+ name: "{{ nginx_server_image }}"
+ load_path: "{{ infra_images_path }}/{{ nginx_server_image_tar }}"
state: present
timeout: 120
@@ -21,10 +21,10 @@
name: nexus_network
state: present
-- name: Start nginx
+- name: Start nginx server container
docker_container:
- name: own_nginx
- image: own_nginx
+ name: nginx-server
+ image: "{{ nginx_server_image }}"
networks:
- name: nexus_network
ports: "{{ nginx.ports }}"