diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-04-21 16:46:40 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-04-21 16:46:40 -0400 |
| commit | f1bb251f0cc4dafc7c027f5b9cde1e70a4fbec5a (patch) | |
| tree | 3a879fcc74362de298ef0d35252b7e33873499ef /roles/openshift_master | |
| parent | a89fe1202bf344a2389d96369420881e10538724 (diff) | |
| parent | 06cfccafd93995a59cf3a620e460d0cb07328188 (diff) | |
| download | openshift-f1bb251f0cc4dafc7c027f5b9cde1e70a4fbec5a.tar.gz openshift-f1bb251f0cc4dafc7c027f5b9cde1e70a4fbec5a.tar.bz2 openshift-f1bb251f0cc4dafc7c027f5b9cde1e70a4fbec5a.tar.xz openshift-f1bb251f0cc4dafc7c027f5b9cde1e70a4fbec5a.zip | |
Merge pull request #165 from detiber/noEmptyNodes
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.yml | 4 |
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 }}" |