summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-05-19 11:16:39 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-05-19 11:16:39 -0400
commit72916736e573df386ab02d0a30216a4ab9680aa2 (patch)
treef2e6bb5a8733addbaca99ef38e63947b93a2ab01
parentc78e91c7d4a304cc5d20135e96206008407c5f6f (diff)
downloadopenshift-72916736e573df386ab02d0a30216a4ab9680aa2.tar.gz
openshift-72916736e573df386ab02d0a30216a4ab9680aa2.tar.bz2
openshift-72916736e573df386ab02d0a30216a4ab9680aa2.tar.xz
openshift-72916736e573df386ab02d0a30216a4ab9680aa2.zip
Remove newline from docker_options template string.
-rw-r--r--roles/openshift_docker_facts/tasks/main.yml4
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: