github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

workaround lack of jinja2.7 support

Browse Source
This commit is contained in:
Ryan Richard 2014-08-28 20:56:20 -05:00
parent 0b4581e98d
commit 0b50244c72
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@
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 == 'rackspace' or grains.cloud == 'vsphere' %} {% if grains.cloud == 'vsphere' %}
# Collect IPs of minions as machines list. # Collect IPs of minions as machines list.
# #
# Use a bash array to build the value we need. Jinja 2.7 does support a 'map' # Use a bash array to build the value we need. Jinja 2.7 does support a 'map'
@ -41,6 +41,15 @@
{% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" %} {% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" %}
{% set minion_regexp = "" %} {% set minion_regexp = "" %}
{% endif %} {% endif %}
{%- if grains.cloud == 'rackspace' %}
{%- set ip_addrs = [] %}
{%- for addrs in salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values() %}
{%- do ip_addrs.append(addrs.ip_interfaces.eth2[0]) %}
{%- endfor %}
MACHINES="{{ip_addrs|join(',')}}"
{%- set machines = "-machines=$MACHINES" %}
{%- set minion_regexp = "" %}
{% endif %}
{% endif %} {% endif %}
DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }}" DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }}"