github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(aws): cloud provider wasn't set, corrected cloud config syntax

Browse Source
This commit is contained in:
Remco 2014-11-26 17:30:35 +01:00
parent 1265db9686
commit 83f3982eee
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/aws/templates/salt-master.sh
View File

@ -26,11 +26,8 @@ grains:
EOF EOF
cat <<EOF > /etc/aws.conf cat <<EOF > /etc/aws.conf
{ [Global]
"Global": { Region:${AWS_ZONE}
"Region": "${AWS_ZONE}"
}
}
EOF EOF
# Auto accept all keys from minions that try to join # Auto accept all keys from minions that try to join

7
cluster/saltbase/salt/kube-controller-manager/default
View File

@ -7,6 +7,7 @@
{% set machines = ""%} {% set machines = ""%}
{% set cloud_provider = "" %} {% set cloud_provider = "" %}
{% set cloud_config = "" %}
{% set minion_regexp = "-minion_regexp=.*" %} {% set minion_regexp = "-minion_regexp=.*" %}
{% if grains.cloud_provider is defined %} {% if grains.cloud_provider is defined %}
{% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %} {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %}
@ -22,8 +23,8 @@
{% 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 == 'aws' %} {% if grains.cloud == 'aws' %}
# TODO: turn on AWS as a cloud provider. Need to figure out AWS role-based auth. {% set cloud_provider = "-cloud_provider=aws" %}
{% set cloud_provider = "" %} {% set cloud_config = "-cloud_config=/etc/aws.conf" %}
{% set minion_regexp = "" %} {% set minion_regexp = "" %}
{% 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 %}
@ -46,4 +47,4 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }}" DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{ cloud_config }}"