summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-09 13:32:01 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-09 13:32:01 -0400
commit16b4b62c7f8abfcb690da19d9b3d05a120407f3f (patch)
tree062cf538358863d6dee4833f72f7cf02b46485b3 /roles/openshift_master/tasks
parenta266aafa43d5219e9b26c13c34ac270b0dc00989 (diff)
parentb32741c6480567f9118cbc14fe5a533b5f140e91 (diff)
downloadopenshift-16b4b62c7f8abfcb690da19d9b3d05a120407f3f.tar.gz
openshift-16b4b62c7f8abfcb690da19d9b3d05a120407f3f.tar.bz2
openshift-16b4b62c7f8abfcb690da19d9b3d05a120407f3f.tar.xz
openshift-16b4b62c7f8abfcb690da19d9b3d05a120407f3f.zip
Merge pull request #106 from detiber/condionalNodeOption
Conditionally set --nodes on master
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 1921b29cf..7a7f02be9 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -6,8 +6,9 @@
lineinfile:
dest: /etc/sysconfig/openshift-master
regexp: '^OPTIONS='
- line: "OPTIONS=\"--public-master={{ openshift_hostname }} --nodes={{ openshift_node_ips
- | join(',') }} --loglevel={{ openshift_master_debug_level }}\""
+ line: "OPTIONS=\"--public-master={{ openshift_hostname }} {% if
+ openshift_node_ips %} --nodes={{ openshift_node_ips
+ | join(',') }} {% endif %} --loglevel={{ openshift_master_debug_level }}\""
notify:
- restart openshift-master