github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
Joe Beda 2014-09-25 11:49:57 -07:00
parent 7d6f5b45ea
commit b3e7fd4209
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/saltbase/salt/apiserver/default
View File

@ -9,8 +9,8 @@
{% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %} {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %}
{% endif %} {% endif %}
{% set minion_regexp = "-minion_regexp '" + pillar['instance_prefix'] + ".*'" %} {% set minion_regexp = "-minion_regexp='" + pillar['instance_prefix'] + ".*'" %}
{% set address = "-address 127.0.0.1" %} {% set address = "-address=127.0.0.1" %}
{% if grains.etcd_servers is defined %} {% if grains.etcd_servers is defined %}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %} {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %}
@ -22,11 +22,11 @@
{% if grains.cloud is defined %} {% if grains.cloud is defined %}
{% if grains.cloud == 'gce' %} {% if grains.cloud == 'gce' %}
{% set cloud_provider = "-cloud_provider=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 %} {% endif %}
{% if grains.cloud == 'azure' %} {% if grains.cloud == 'azure' %}
MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}" 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 %} {% endif %}
{% if grains.cloud == 'vsphere' %} {% if grains.cloud == 'vsphere' %}
# Collect IPs of minions as machines list. # Collect IPs of minions as machines list.
@ -52,4 +52,4 @@
{% endif %} {% endif %}
{% 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']}}"