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

convert cluster/ from --flag_name= --flag-name=

Browse Source
This commit is contained in:
Eric Paris
2015-07-04 18:19:37 -05:00
parent cfc9312b7f
commit 86ca88be61
13 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
View File

@@ -9,7 +9,7 @@ kill timeout 30 # wait 30s between SIGTERM and SIGKILL.
exec /usr/local/bin/apiserver \
--address=%(api_bind_address)s \
--etcd_servers=%(etcd_servers)s \
--etcd-servers=%(etcd_servers)s \
--logtostderr=true \
--service-cluster-ip-range=10.244.240.0/20

6
cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl
View File

@@ -9,7 +9,7 @@ kill timeout 60 # wait 60s between SIGTERM and SIGKILL.
exec /usr/local/bin/kubelet \
--address=%(kubelet_bind_addr)s \
--api_servers=%(kubeapi_server)s \
--hostname_override=%(kubelet_bind_addr)s \
--cadvisor_port=4193 \
--api-servers=%(kubeapi_server)s \
--hostname-override=%(kubelet_bind_addr)s \
--cadvisor-port=4193 \
--logtostderr=true