From b3e7fd4209c12c45518e4870d1b3cb9afcc5fa31 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Thu, 25 Sep 2014 11:49:57 -0700 Subject: [PATCH] Be more robust in how we pass flags. Using the '=' form of a flag makes things better if we have an empty list of machines. --- cluster/saltbase/salt/apiserver/default | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/saltbase/salt/apiserver/default b/cluster/saltbase/salt/apiserver/default index 36c64075f34..7380d60837f 100644 --- a/cluster/saltbase/salt/apiserver/default +++ b/cluster/saltbase/salt/apiserver/default @@ -9,8 +9,8 @@ {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %} {% endif %} -{% set minion_regexp = "-minion_regexp '" + pillar['instance_prefix'] + ".*'" %} -{% set address = "-address 127.0.0.1" %} +{% set minion_regexp = "-minion_regexp='" + pillar['instance_prefix'] + ".*'" %} +{% set address = "-address=127.0.0.1" %} {% if grains.etcd_servers is defined %} {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %} @@ -22,11 +22,11 @@ {% if grains.cloud is defined %} {% if grains.cloud == 'gce' %} {% set cloud_provider = "-cloud_provider=gce" %} - {% set machines = "-machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) %} + {% set machines = "-machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) %} {% endif %} {% if grains.cloud == 'azure' %} MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}" - {% set machines = "-machines $MACHINES" %} + {% set machines = "-machines=$MACHINES" %} {% endif %} {% if grains.cloud == 'vsphere' %} # Collect IPs of minions as machines list. @@ -52,4 +52,4 @@ {% endif %} {% endif %} -DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }} --allow_privileged {{pillar['allow_privileged']}}" +DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}}"