summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-04-13 13:51:56 +0200
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-04-13 13:51:56 +0200
commit6a2f8ac75a0e5699751f7343c2d6caaba57c91b9 (patch)
tree2fafb38cdbc8bf928197dc3eb55abf99d46c37da
parentb9594d6baad6c570585d0f9b7ea25d82edccfca9 (diff)
[ANSIBLE 3.2.0] Upgrade 'nginx' role's tasks to ansible 3.2.0
Change-Id: Ieba3f13a29240e0f8ed8ff6acb5472559a9134a5 Issue-ID: OOM-2722 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-rw-r--r--ansible/roles/nginx/tasks/main.yml3
-rw-r--r--ansible/test/roles/prepare-nginx/tasks/main.yml5
2 files changed, 7 insertions, 1 deletions
diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
index 54a0c818..7798f2ff 100644
--- a/ansible/roles/nginx/tasks/main.yml
+++ b/ansible/roles/nginx/tasks/main.yml
@@ -14,6 +14,7 @@
name: "{{ nginx_server_image }}"
load_path: "{{ infra_images_path }}/{{ nginx_server_image_tar }}"
state: present
+ source: load
timeout: 120
- name: Create nexus network
@@ -27,7 +28,9 @@
image: "{{ nginx_server_image }}"
networks:
- name: nexus_network
+ network_mode: default
ports: "{{ nginx.ports }}"
volumes: "{{ nginx.volumes }}"
state: started
restart_policy: unless-stopped
+ container_default_behavior: compatibility
diff --git a/ansible/test/roles/prepare-nginx/tasks/main.yml b/ansible/test/roles/prepare-nginx/tasks/main.yml
index 3cd93990..820f5cc8 100644
--- a/ansible/test/roles/prepare-nginx/tasks/main.yml
+++ b/ansible/test/roles/prepare-nginx/tasks/main.yml
@@ -11,7 +11,9 @@
- name: Build nginx docker image
delegate_to: localhost
docker_image:
- path: ../../../../../build/creating_data/create_nginx_image/
+ build:
+ path: ../../../../../build/creating_data/create_nginx_image/
+ source: build
name: own_nginx
tag: 2.0.0
@@ -21,6 +23,7 @@
name: own_nginx
tag: 2.0.0
archive_path: /tmp/nginx.tar
+ source: local
- name: Copy nginx image to node
copy: