openstack/kayobe
Code Issues Proposed changes

In latest Docker 17.05 restart-retires and unless-stopped are

Browse Source 
mutually exclusive. Remove restart-retries where used.
This commit is contained in:
stack 2017-09-20 15:10:39 +01:00
parent ba6d30c10a
commit 20e3b75547
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/docker-registry/defaults/main.yml
View File

@ -30,4 +30,4 @@ docker_registry_tag: "latest"
docker_registry_image_full: "{{ docker_registry_image }}:{{ docker_registry_tag }}" docker_registry_image_full: "{{ docker_registry_image }}:{{ docker_registry_tag }}"
docker_registry_restart_policy: "unless-stopped" docker_registry_restart_policy: "unless-stopped"
docker_registry_restart_retries: 10 #docker_registry_restart_retries:

2
ansible/roles/docker-registry/tasks/deploy.yml
View File

@ -7,7 +7,7 @@
privileged: "{{ item.value.privileged | default(omit) }}" privileged: "{{ item.value.privileged | default(omit) }}"
read_only: "{{ item.value.read_only | default(omit) }}" read_only: "{{ item.value.read_only | default(omit) }}"
restart_policy: "{{ docker_registry_restart_policy }}" restart_policy: "{{ docker_registry_restart_policy }}"
restart_retries: "{{ docker_registry_restart_retries }}" restart_retries: "{{ docker_registry_restart_retries | default(omit) }}"
state: "{{ (item.value.enabled and action != 'destroy') | ternary('started', 'absent') }}" state: "{{ (item.value.enabled and action != 'destroy') | ternary('started', 'absent') }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes }}"
with_dict: "{{ docker_registry_services }}" with_dict: "{{ docker_registry_services }}"

2
ansible/roles/inspection-store/defaults/main.yml
View File

@ -34,4 +34,4 @@ inspection_store_tag: "latest"
inspection_store_image_full: "{{ inspection_store_image }}:{{ inspection_store_tag }}" inspection_store_image_full: "{{ inspection_store_image }}:{{ inspection_store_tag }}"
inspection_store_restart_policy: "unless-stopped" inspection_store_restart_policy: "unless-stopped"
inspection_store_restart_retries: 10 #inspection_store_restart_retries:

2
ansible/roles/inspection-store/tasks/start.yml
View File

@ -7,7 +7,7 @@
privileged: "{{ item.value.privileged | default(omit) }}" privileged: "{{ item.value.privileged | default(omit) }}"
read_only: "{{ item.value.read_only | default(omit) }}" read_only: "{{ item.value.read_only | default(omit) }}"
restart_policy: "{{ inspection_store_restart_policy }}" restart_policy: "{{ inspection_store_restart_policy }}"
restart_retries: "{{ inspection_store_restart_retries }}" restart_retries: "{{ inspection_store_restart_retries | default(omit) }}"
state: "{{ item.value.enabled | ternary('started', 'absent') }}" state: "{{ item.value.enabled | ternary('started', 'absent') }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes }}"
with_dict: "{{ inspection_store_services }}" with_dict: "{{ inspection_store_services }}"

2
ansible/roles/opensm/defaults/main.yml
View File

@ -27,4 +27,4 @@ opensm_tag: "latest"
opensm_image_full: "{{ opensm_image }}:{{ opensm_tag }}" opensm_image_full: "{{ opensm_image }}:{{ opensm_tag }}"
opensm_restart_policy: "unless-stopped" opensm_restart_policy: "unless-stopped"
opensm_restart_retries: 10 #opensm_restart_retries:

2
ansible/roles/opensm/tasks/deploy.yml
View File

@ -7,7 +7,7 @@
privileged: "{{ item.value.privileged | default(omit) }}" privileged: "{{ item.value.privileged | default(omit) }}"
read_only: "{{ item.value.read_only | default(omit) }}" read_only: "{{ item.value.read_only | default(omit) }}"
restart_policy: "{{ opensm_restart_policy }}" restart_policy: "{{ opensm_restart_policy }}"
restart_retries: "{{ opensm_restart_retries }}" restart_retries: "{{ opensm_restart_retries | default(omit) }}"
state: "{{ (item.value.enabled and action != 'destroy') | ternary('started', 'absent') }}" state: "{{ (item.value.enabled and action != 'destroy') | ternary('started', 'absent') }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes }}"
with_dict: "{{ opensm_services }}" with_dict: "{{ opensm_services }}"