scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-25 01:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dutchcoders/kubernetes into dutchcoders-master

Browse Source 
Conflicts:
	cluster/aws/config-default.sh
	cluster/saltbase/salt/kube-controller-manager/default
This commit is contained in:
Brendan Burns
2014-12-19 11:43:25 -08:00
parent 5bd560de51 83f3982eee
commit bd712b61e6
4 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,8 @@
{% set machines = "-machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
{% endif -%}
{% if grains.cloud == 'aws' -%}
# TODO: turn on AWS as a cloud provider. Need to figure out AWS role-based auth.
{% set cloud_provider = "" -%}
{% set cloud_provider = "-cloud_provider=aws" -%}
{% set cloud_config = "-cloud_config=/etc/aws.conf" -%}
{% set minion_regexp = "" -%}
{% set machines = "-machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
{% endif -%}
@@ -46,4 +46,8 @@
{% endif -%}
{% endif -%}
<<<<<<< HEAD
DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{pillar['log_level']}}"
=======
DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{ cloud_config }}"
>>>>>>> 83f3982eee4d36962919d4f55a41ec1c2111d01a