scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2026-01-08 16:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vagrant regression

Browse Source
This commit is contained in:
derekwaynecarr
2014-11-19 21:59:07 -05:00
parent 99260aaf51
commit 1a894741b2
6 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,12 @@
{% set address = "-address=127.0.0.1" %}
{% set publicAddressOverride = "" %}
{% if grains.publicAddressOverride is defined %}
{% set publicAddressOverride = "-public_address_override=" + grains.publicAddressOverride %}
{% endif %}
{% if grains.etcd_servers is defined %}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %}
{% else %}
@@ -40,4 +46,4 @@
{% endif %}
{% endif %}
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}}"
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}}"