Bläddra i källkod

Merge pull request #165 from detiber/noEmptyNodes

Fix issue with nodes being set to an empty string when generating master config
Thomas Wiest 10 år sedan
förälder
incheckning
f1bb251f0c
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. 2 2
      roles/openshift_master/tasks/main.yml

+ 2 - 2
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 }}"