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

Implement apiserver communication for Vagrant

Browse Source 
This implementation is based on the GCE impementation from
618a367dbb48dbaa9c3b50e877858d854322fd0b.
This commit is contained in:
Richard Larocque
2014-12-04 10:40:00 -08:00
parent 7d3cac35a5
commit 7d37b24cc7
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/kube-apiserver/default
View File

@@ -40,7 +40,7 @@
{% set token_auth_file = "-token_auth_file=/dev/null" -%}
{% if grains.cloud is defined -%}
{% if grains.cloud == 'gce' -%}
{% if grains.cloud == 'gce' or grains.cloud == 'vagrant' -%}
# TODO: generate and distribute tokens for other cloud providers.
{% set token_auth_file = "-token_auth_file=/srv/kubernetes/known_tokens.csv" -%}
{% endif -%}

2
cluster/saltbase/salt/kube-apiserver/init.sls
View File

@@ -39,7 +39,7 @@
{% endif %}
{% if grains.cloud is defined %}
{% if grains.cloud == 'gce' %}
{% if grains.cloud == 'gce' or grains.cloud == 'vagrant' %}
# TODO: generate and distribute tokens on other cloud providers.
/srv/kubernetes/known_tokens.csv:
file.managed: