diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-20 13:32:52 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-20 13:32:52 -0400 |
| commit | 18ea8db5a35adef533db968305c7876ea740491a (patch) | |
| tree | 1ee9cafe042ab14ea8e5982ad954b87ffed5e8d1 /roles | |
| parent | e8316eea9956568f907db93b541115e5aaeb21a3 (diff) | |
| parent | 72916736e573df386ab02d0a30216a4ab9680aa2 (diff) | |
| download | openshift-18ea8db5a35adef533db968305c7876ea740491a.tar.gz openshift-18ea8db5a35adef533db968305c7876ea740491a.tar.bz2 openshift-18ea8db5a35adef533db968305c7876ea740491a.tar.xz openshift-18ea8db5a35adef533db968305c7876ea740491a.zip | |
Merge pull request #1923 from abutcher/BZ1337438
Remove newline from docker_options template string.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index 0e51fd16f..43359dcb5 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -32,9 +32,7 @@ docker_no_proxy: "{{ openshift.common.no_proxy | default(omit) }}" - set_fact: - docker_options: > - --insecure-registry={{ openshift.docker.hosted_registry_network }} - {{ openshift.docker.options | default ('') }} + docker_options: "--insecure-registry={{ openshift.docker.hosted_registry_network }} {{ openshift.docker.options | default ('') }}" when: openshift.docker.hosted_registry_insecure | default(False) | bool and openshift.docker.hosted_registry_network is defined - set_fact: |