openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add custom option for docker"

Browse Source
This commit is contained in:
Zuul 2018-05-31 11:15:40 +00:00 committed by Gerrit Code Review
commit 360f2b9464
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,8 @@ selinux_state: "permissive"
docker_storage_driver: "" docker_storage_driver: ""
docker_custom_option: ""
docker_runtime_directory: "" docker_runtime_directory: ""
debian_pkg_install: debian_pkg_install:

2
ansible/roles/baremetal/templates/docker_systemd_service.j2
View File

@ -1,4 +1,4 @@
[Service] [Service]
MountFlags=shared MountFlags=shared
ExecStart= ExecStart=
ExecStart=/usr/bin/{{ docker_binary_name|default("docker daemon", true) }}{% if docker_registry %} --insecure-registry {{ docker_registry }}{% endif %}{% if docker_storage_driver %} --storage-driver {{ docker_storage_driver }}{% endif %}{% if docker_runtime_directory %} --graph {{ docker_runtime_directory }}{% endif %} ExecStart=/usr/bin/{{ docker_binary_name|default("docker daemon", true) }}{% if docker_registry %} --insecure-registry {{ docker_registry }}{% endif %}{% if docker_storage_driver %} --storage-driver {{ docker_storage_driver }}{% endif %}{% if docker_runtime_directory %} --graph {{ docker_runtime_directory }}{% endif %}{% if docker_custom_option %} {{ docker_custom_option }}{% endif %}

5
releasenotes/notes/custom_option_docker-f5b810a8edce06fa.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Add custom option for docker daemon by configure the docker service. An operator
named "docker_custom_option" will be added.