scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-26 19:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5064 from justinsb/ignore_stopped_aws_instances

Browse Source 
Ignore EC2 instances that are stopped
This commit is contained in:
Brian Grant
2015-03-10 11:03:34 -07:00
parent 4805aecff8 a3ae480acc
commit b3d3db08ef
3 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@
{% if grains.cloud == 'aws' -%}
{% 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 -%}
{% if grains.cloud == 'azure' -%}