summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-04-15 16:17:09 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-04-20 23:53:56 -0400
commit06cfccafd93995a59cf3a620e460d0cb07328188 (patch)
tree068e5fef0c9e1d12f83b9b108660a41774a213a9 /roles/openshift_master
parent96dd0ab929b7f391eee9b23209aa377537114b72 (diff)
downloadopenshift-06cfccafd93995a59cf3a620e460d0cb07328188.tar.gz
openshift-06cfccafd93995a59cf3a620e460d0cb07328188.tar.bz2
openshift-06cfccafd93995a59cf3a620e460d0cb07328188.tar.xz
openshift-06cfccafd93995a59cf3a620e460d0cb07328188.zip
Fix issue with nodes being set to an empty string when generating master config
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 1b1210007..3ea485610 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -61,8 +61,8 @@
--master={{ openshift.master.api_url }}
--public-master={{ openshift.master.public_api_url }}
--listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://0.0.0.0:{{ openshift.master.api_port }}
- {{ ('--images=' ~ openshift_registry_url) if openshift_registry_url is defined else '' }}
- {{ ('--nodes=' ~ openshift_node_ips | join(',')) if openshift_node_ips is defined else '' }}
+ {{ ('--images=' ~ openshift_registry_url) if (openshift_registry_url | default('', true) != '') else '' }}
+ {{ ('--nodes=' ~ openshift_node_ips | join(',')) if (openshift_node_ips | default('', true) != '') else '' }}
args:
chdir: "{{ openshift_cert_parent_dir }}"
creates: "{{ openshift_master_config }}"