summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorManjunath A Kumatagi <mkumatag@in.ibm.com>2016-08-27 15:29:28 -0400
committerManjunath A Kumatagi <mkumatag@in.ibm.com>2016-08-27 15:29:28 -0400
commit43e9680b4ea8fe2343d13103081a5717f7f2b32e (patch)
treecaae955d1b8109f66af2dfa2388cb388f17f722f /roles/docker/tasks
parent26b0e3b6e7771b120e7ee1970e05f14a9c3c80d1 (diff)
downloadopenshift-43e9680b4ea8fe2343d13103081a5717f7f2b32e.tar.gz
openshift-43e9680b4ea8fe2343d13103081a5717f7f2b32e.tar.bz2
openshift-43e9680b4ea8fe2343d13103081a5717f7f2b32e.tar.xz
openshift-43e9680b4ea8fe2343d13103081a5717f7f2b32e.zip
Fix review comments
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index a6751e882..a89f5b91a 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 is defined and docker_check.stat.isreg)
+ when: item.reg_fact_val != '' and docker_check.stat.isreg is defined and docker_check.stat.isreg
with_items:
- reg_conf_var: ADD_REGISTRY
reg_fact_val: "{{ docker_additional_registries | default(None, true)}}"
@@ -97,7 +97,7 @@
notify:
- restart docker
when:
- - (docker_check.stat.isreg is defined and docker_check.stat.isreg) and "{{ 'http_proxy' in openshift.common or 'https_proxy' in openshift.common }}"
+ - docker_check.stat.isreg is defined and docker_check.stat.isreg and '"http_proxy" in openshift.common or "https_proxy" in openshift.common'
- name: Set various Docker options
lineinfile: