Skip to content

Commit 855f50e

Browse files
authored
fixed compatibility with latest docker_swarm_module (#64)
1 parent 7799062 commit 855f50e

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

roles/docker_service_deploy/tasks/create_service.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
image: "{{ repository_deploy_image }}"
44
name: "{{ inventory_hostname }}"
55
hostname: "{{ inventory_hostname }}"
6-
limit_cpu: "{{ limit_cpu }}"
7-
limit_memory: "{{ limit_memory }}"
8-
restart_policy: "{{ restart_policy }}"
6+
limits:
7+
cpus: "{{ limit_cpu }}"
8+
memory: "{{ limit_memory }}"
9+
restart_config:
10+
condition: "{{ restart_policy }}"
911
publish: "{{ publish | default(omit) }}"
1012
replicas: "{{ replicas | default(omit) }}"
1113
# XXX - stupid naming
@@ -14,8 +16,9 @@
1416
state: "{{ state|default(omit) }}"
1517
# require user to be specified, because defaults to root pre-2.8, overriding the image configuration
1618
user: "{{ user }}"
17-
log_driver: "{{ log_driver | default(omit) }}"
18-
log_driver_options: "{{ log_driver_options | default(omit) }}"
19+
logging:
20+
driver: "{{ log_driver | default(omit) }}"
21+
options: "{{ log_driver_options | default(omit) }}"
1922
env: "{{ env | default(omit) }}"
2023
become: "{{ docker_become_user is defined }}"
2124
become_user: "{{ docker_become_user|default(omit) }}"

0 commit comments

Comments
 (0)