diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-18 07:47:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 07:47:13 -0400 |
| commit | e007bc8a9b397331f008586dcc3b2ee7d29978ad (patch) | |
| tree | cec74dde2a9918c4afe7ef823a498799e50f601a | |
| parent | 0cf8cf65a89ad7cac8c1cef1f743426b610adae0 (diff) | |
| parent | b61146ccfd57ef264702d55e65e6dd4db7e53fd7 (diff) | |
| download | openshift-e007bc8a9b397331f008586dcc3b2ee7d29978ad.tar.gz openshift-e007bc8a9b397331f008586dcc3b2ee7d29978ad.tar.bz2 openshift-e007bc8a9b397331f008586dcc3b2ee7d29978ad.tar.xz openshift-e007bc8a9b397331f008586dcc3b2ee7d29978ad.zip | |
Merge pull request #5774 from mgugino-upstream-stage/docker-option-fix
Fix missing docker option signature-verification
| -rw-r--r-- | roles/docker/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index e36dfa7b9..1c830cb4e 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1,5 +1,6 @@ --- docker_cli_auth_config_path: '/root/.docker' +openshift_docker_signature_verification: False # oreg_url is defined by user input. oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_url.split('/')[0]) else '' }}" diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index 888ae40e7..7ccab37a5 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -115,11 +115,12 @@ dest: /etc/sysconfig/docker regexp: '^OPTIONS=.*$' line: "OPTIONS='\ - {% if ansible_selinux.status | default(None) == 'enabled' and docker_selinux_enabled | default(true) | bool %} --selinux-enabled {% endif %}\ - {% if docker_log_driver is defined %} --log-driver {{ docker_log_driver }}{% endif %}\ - {% if docker_log_options is defined %} {{ docker_log_options | oo_split() | oo_prepend_strings_in_list('--log-opt ') | join(' ')}}{% endif %}\ - {% if docker_options is defined %} {{ docker_options }}{% endif %}\ - {% if docker_disable_push_dockerhub is defined %} --confirm-def-push={{ docker_disable_push_dockerhub | bool }}{% endif %}'" + {% if ansible_selinux.status | default(None) == 'enabled' and docker_selinux_enabled | default(true) | bool %} --selinux-enabled {% endif %} \ + {% if docker_log_driver is defined %} --log-driver {{ docker_log_driver }}{% endif %} \ + {% if docker_log_options is defined %} {{ docker_log_options | oo_split() | oo_prepend_strings_in_list('--log-opt ') | join(' ')}}{% endif %} \ + {% if docker_options is defined %} {{ docker_options }}{% endif %} \ + {% if docker_disable_push_dockerhub is defined %} --confirm-def-push={{ docker_disable_push_dockerhub | bool }}{% endif %} \ + --signature-verification={{ openshift_docker_signature_verification | bool }}'" when: docker_check.stat.isreg is defined and docker_check.stat.isreg notify: - restart docker |