Skip to content
Snippets Groups Projects
Commit b492a623 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Fix kolla-bootstrap-servers with docker_storage_driver set"

parents d55dac92 12987ca0
No related branches found
No related tags found
No related merge requests found
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
debug: debug:
msg: > msg: >
docker_custom_option is deprecated in favor of docker_custom_config docker_custom_option is deprecated in favor of docker_custom_config
when: docker_custom_option when: docker_custom_option | length > 0
- name: Setup docker insecure registries - name: Setup docker insecure registries
vars: vars:
...@@ -83,12 +83,12 @@ ...@@ -83,12 +83,12 @@
- name: Setup docker storage driver - name: Setup docker storage driver
set_fact: set_fact:
docker_config: "{{ docker_config | combine({'storage-driver': docker_storage_driver}) }}" docker_config: "{{ docker_config | combine({'storage-driver': docker_storage_driver}) }}"
when: docker_storage_driver when: docker_storage_driver | length > 0
- name: Setup docker runtime directory - name: Setup docker runtime directory
set_fact: set_fact:
docker_config: "{{ docker_config | combine({'data-root': docker_runtime_directory}) }}" docker_config: "{{ docker_config | combine({'data-root': docker_runtime_directory}) }}"
when: docker_runtime_directory when: docker_runtime_directory | length > 0
- name: Merge custom docker config - name: Merge custom docker config
set_fact: set_fact:
...@@ -117,14 +117,14 @@ ...@@ -117,14 +117,14 @@
path: /etc/systemd/system/docker.service.d path: /etc/systemd/system/docker.service.d
state: directory state: directory
recurse: yes recurse: yes
when: docker_custom_option or docker_configure_for_zun|bool when: docker_custom_option | length > 0 or docker_configure_for_zun|bool
- name: Configure docker service - name: Configure docker service
become: True become: True
template: template:
src: docker_systemd_service.j2 src: docker_systemd_service.j2
dest: /etc/systemd/system/docker.service.d/kolla.conf dest: /etc/systemd/system/docker.service.d/kolla.conf
when: docker_custom_option or docker_configure_for_zun|bool when: docker_custom_option | length > 0 or docker_configure_for_zun|bool
- name: Reload docker service file - name: Reload docker service file
become: True become: True
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment