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

Merge pull request #6821 from justinsb/aws_dont_use_aws_conf

Browse Source 
Don't always use aws.conf
This commit is contained in:
Dawn Chen 2015-04-14 13:30:29 -07:00
commit cbe28f151e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,11 +38,6 @@ if [[ -n "${DOCKER_ROOT}" ]]; then
EOF EOF
fi fi
cat <<EOF > /etc/aws.conf
[Global]
Zone = ${ZONE}
EOF
# Auto accept all keys from minions that try to join # Auto accept all keys from minions that try to join
mkdir -p /etc/salt/master.d mkdir -p /etc/salt/master.d
cat <<EOF >/etc/salt/master.d/auto-accept.conf cat <<EOF >/etc/salt/master.d/auto-accept.conf

4
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View File

@ -15,7 +15,9 @@
{% endif -%} {% endif -%}
{% elif grains.cloud == 'aws' -%} {% elif grains.cloud == 'aws' -%}
{% set cloud_config = "--cloud_config=/etc/aws.conf" -%} {% if grains.cloud_config is defined -%}
{% set cloud_config = "--cloud_config=" + grains.cloud_config -%}
{% endif -%}
{% endif -%} {% endif -%}
{% endif -%} {% endif -%}

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

@ -25,7 +25,9 @@
{% endif -%} {% endif -%}
{% elif grains.cloud == 'aws' -%} {% elif grains.cloud == 'aws' -%}
{% set cloud_config = "--cloud_config=/etc/aws.conf" -%} {% if grains.cloud_config is defined -%}
{% set cloud_config = "--cloud_config=" + grains.cloud_config -%}
{% endif -%}
{% 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()) -%}
{% elif grains.cloud == 'azure' -%} {% elif grains.cloud == 'azure' -%}