diff options
| author | Tim Bielawa <timbielawa@gmail.com> | 2016-12-12 11:39:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 11:39:44 -0800 |
| commit | 7374505de2a11b94d22672b8da7e405b919a15bc (patch) | |
| tree | 51881c3f16f1f7368bdbf62e0478a6c292a5470a /roles/docker/tasks | |
| parent | 91fba8015e9e8035cca2444dbbc8954a27e2310e (diff) | |
| parent | be97433dd559a3bdae4baedda20a7f17bd47450b (diff) | |
| download | openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.gz openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.bz2 openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.xz openshift-7374505de2a11b94d22672b8da7e405b919a15bc.zip | |
Merge pull request #2964 from mtnbikenc/linting-refactor
YAML Linting with CI checking
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/main.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index a2b18baa1..a93bdc2ad 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -86,16 +86,16 @@ line: "{{ item.reg_conf_var }}='{{ item.reg_fact_val }}'" state: "{{ 'present' if item.reg_fact_val != '' else 'absent'}}" with_items: - - reg_conf_var: HTTP_PROXY - reg_fact_val: "{{ docker_http_proxy | default('') }}" - - reg_conf_var: HTTPS_PROXY - reg_fact_val: "{{ docker_https_proxy | default('') }}" - - reg_conf_var: NO_PROXY - reg_fact_val: "{{ docker_no_proxy | default('') | join(',') }}" + - reg_conf_var: HTTP_PROXY + reg_fact_val: "{{ docker_http_proxy | default('') }}" + - reg_conf_var: HTTPS_PROXY + reg_fact_val: "{{ docker_https_proxy | default('') }}" + - reg_conf_var: NO_PROXY + reg_fact_val: "{{ docker_no_proxy | default('') | join(',') }}" notify: - - restart docker + - 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: @@ -109,7 +109,7 @@ {% if docker_disable_push_dockerhub is defined %} --confirm-def-push={{ docker_disable_push_dockerhub | bool }}{% endif %}'" when: docker_check.stat.isreg is defined and docker_check.stat.isreg notify: - - restart docker + - restart docker - name: Start the Docker service systemd: |