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

move vagrant to masterless salt

Browse Source
This commit is contained in:
Mike Danese
2015-11-29 19:33:53 -08:00
parent 11574ee990
commit e2c5c898fb
8 changed files with 239 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
View File

@@ -27,7 +27,9 @@
{% set cloud_config_volume = "" -%}
{% if grains.cloud is defined -%}
{% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
{% if grains.cloud != 'vagrant' -%}
{% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
{% endif -%}
{% set service_account_key = " --service-account-private-key-file=/srv/kubernetes/server.key " -%}
{% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%}