Merge pull request #6103 from zmerlynn/remove_gce_node_names

Remove the --machines SaltStack configuration on GCE
2015-03-27 17:55:16 -07:00
parent 3bc933645b 68ccb97907
commit 525bbfd175
3 changed files with 6 additions and 34 deletions
--- a/cluster/saltbase/salt/kube-controller-manager/default
+++ b/cluster/saltbase/salt/kube-controller-manager/default
@@ -21,7 +21,6 @@
 {% if grains.cloud is defined -%}
 {% if grains.cloud == 'gce' -%}
  {% set cloud_provider = "--cloud_provider=gce" -%}
-  {% set machines = "--machines=" + pillar['gce_node_names'] -%}
 {% endif -%}
 {% if grains.cloud == 'aws' -%}
  {% set cloud_provider = "--cloud_provider=aws" -%}