diff --git a/cluster/saltbase/salt/apiserver/default b/cluster/saltbase/salt/apiserver/default index 30b359bf499..43fad7b141d 100644 --- a/cluster/saltbase/salt/apiserver/default +++ b/cluster/saltbase/salt/apiserver/default @@ -28,7 +28,7 @@ MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}" {% set machines = "-machines $MACHINES" %} {% endif %} -{% if grains.cloud == 'rackspace' or grains.cloud == 'vsphere' %} +{% if grains.cloud == 'vsphere' %} # Collect IPs of minions as machines list. # # 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 minion_regexp = "" %} {% 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 %} DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }}"