diff options
| author | Manjunath A Kumatagi <mkumatag@in.ibm.com> | 2016-08-17 23:51:59 +0530 |
|---|---|---|
| committer | Manjunath A Kumatagi <mkumatag@in.ibm.com> | 2016-08-17 23:51:59 +0530 |
| commit | a89148a30b1f9cfebea60d13f7d7c10ffed3f8de (patch) | |
| tree | b78718aa340443fba0bad2db9bb1b7c6269aa5e7 /roles/docker/tasks | |
| parent | 66df6c2f5ee015036f82fe53fc510d6fd26603d6 (diff) | |
| download | openshift-a89148a30b1f9cfebea60d13f7d7c10ffed3f8de.tar.gz openshift-a89148a30b1f9cfebea60d13f7d7c10ffed3f8de.tar.bz2 openshift-a89148a30b1f9cfebea60d13f7d7c10ffed3f8de.tar.xz openshift-a89148a30b1f9cfebea60d13f7d7c10ffed3f8de.zip | |
Fix errors in docker role
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/main.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 87a4e7af0..dfe25e6a4 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -67,7 +67,7 @@ dest: /etc/sysconfig/docker regexp: '^{{ item.reg_conf_var }}=.*$' line: "{{ item.reg_conf_var }}='{{ item.reg_fact_val | oo_prepend_strings_in_list(item.reg_flag ~ ' ') | join(' ') }}'" - when: item.reg_fact_val != '' and docker_check.stat.isreg + when: item.reg_fact_val != '' and (docker_check.stat.isreg is define and docker_check.stat.isreg) with_items: - reg_conf_var: ADD_REGISTRY reg_fact_val: "{{ docker_additional_registries | default(None, true)}}" @@ -96,7 +96,8 @@ reg_fact_val: "{{ docker_no_proxy | default('') | join(',') }}" notify: - restart docker - when: "{{ 'http_proxy' in openshift.common or 'https_proxy' in openshift.common and docker_check.stat.isreg }}" + when: + - (docker_check.stat.isreg is define and docker_check.stat.isreg) and "{{ 'http_proxy' in openshift.common or 'https_proxy' in openshift.common }}" - name: Set various Docker options lineinfile: @@ -108,7 +109,7 @@ {% 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 %}'" - when: docker_check.stat.isreg + when: docker_check.stat.isreg is define and docker_check.stat.isreg notify: - restart docker |