openstack/kolla-ansible
Code Issues Proposed changes

Merge "Option for enable SSL verification on docker registry"

Browse Source
This commit is contained in:
Zuul 2018-07-04 15:02:55 +00:00 committed by Gerrit Code Review
commit 17cc67816f
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -89,6 +89,7 @@ docker_registry_email:
docker_registry:
docker_namespace: "kolla"
docker_registry_username:
docker_registry_insecure: "{{ 'yes' if docker_registry else 'no' }}"
# Valid options are [ never, on-failure, always, unless-stopped ]
docker_restart_policy: "unless-stopped"

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

@ -1,4 +1,4 @@
[Service]
MountFlags=shared
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 %}{% if docker_custom_option %} {{ docker_custom_option }}{% endif %}
ExecStart=/usr/bin/{{ docker_binary_name|default("docker daemon", true) }}{% if docker_registry_insecure | bool %} --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 %}

6
releasenotes/notes/docker_insecure_registry-857bfb9c760aa3bf.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Add option `docker_registry_insecure` to enable the SSL verification
for the docker registry. Default value is true when a private
registry is defined.