diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-15 16:39:26 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-15 16:39:26 -0500 |
| commit | 0825b8327a1c509337e5c91c3b8cf6a63816782c (patch) | |
| tree | 6f38679b5ed2f7f359e6c1f85478fcfa7072fdfe /roles | |
| parent | ef56d0297d29dd0d65e8912daa1ede67c4d46516 (diff) | |
| parent | 6f5a98a13251b7017d9be60603c31f46ff2dc5d1 (diff) | |
| download | openshift-0825b8327a1c509337e5c91c3b8cf6a63816782c.tar.gz openshift-0825b8327a1c509337e5c91c3b8cf6a63816782c.tar.bz2 openshift-0825b8327a1c509337e5c91c3b8cf6a63816782c.tar.xz openshift-0825b8327a1c509337e5c91c3b8cf6a63816782c.zip | |
Merge pull request #1404 from sdodson/docker-options
Add openshift_docker_options to append arbitrary options to
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_docker/tasks/main.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml index 5a285e773..a57cf815e 100644 --- a/roles/openshift_docker/tasks/main.yml +++ b/roles/openshift_docker/tasks/main.yml @@ -10,6 +10,7 @@ docker_additional_registries: "{{ docker_additional_registries }}" docker_insecure_registries: "{{ docker_insecure_registries }}" docker_blocked_registries: "{{ docker_blocked_registries }}" + docker_options: "{{ openshift_docker_options | default('',True) }}" - role: node local_facts: portal_net: "{{ openshift_master_portal_net | default(None) }}" @@ -44,10 +45,11 @@ lineinfile: dest: /etc/sysconfig/docker regexp: '^OPTIONS=.*$' - line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }} \ - {% if ansible_selinux and ansible_selinux.status == '''enabled''' %}--selinux-enabled{% endif %} \ - {% if openshift.node.docker_log_driver is defined %} --log-driver {{ openshift.node.docker_log_driver }} {% endif %} \ - {% if openshift.node.docker_log_options is defined %} {{ openshift.node.docker_log_options | oo_split() | oo_prepend_strings_in_list('--log-opt ') | join(' ')}} {% endif %} '" + line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }}\ + {% if ansible_selinux and ansible_selinux.status == '''enabled''' %} --selinux-enabled{% endif %}\ + {% if openshift.node.docker_log_driver is defined %} --log-driver {{ openshift.node.docker_log_driver }}{% endif %}\ + {% if openshift.node.docker_log_options is defined %} {{ openshift.node.docker_log_options | oo_split() | oo_prepend_strings_in_list('--log-opt ') | join(' ')}}{% endif %}\ + {% if openshift.common.docker_options is defined %} {{ openshift.common.docker_options }}{% endif %}'" when: docker_check.stat.isreg notify: - restart openshift_docker |