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

Merge pull request #7158 from crossorigin/azure-0.15.0

Browse Source 
Set Weave To 0.9.0 And Update Etcd Configuration For Azure
This commit is contained in:
Robert Bailey
2015-04-22 08:33:02 -07:00
parent 914a6febfb eb2cf2f904
commit 7854954fc2
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-etcd-node-template.yml
View File

@@ -37,6 +37,7 @@ coreos:
Environment=ETCD_INITIAL_ADVERTISE_PEER_URLS=http://%host%:2380 Environment=ETCD_INITIAL_ADVERTISE_PEER_URLS=http://%host%:2380
Environment=ETCD_LISTEN_PEER_URLS=http://%host%:2380 Environment=ETCD_LISTEN_PEER_URLS=http://%host%:2380
Environment=ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379,http://0.0.0.0:4001 Environment=ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379,http://0.0.0.0:4001
Environment=ETCD_ADVERTISE_CLIENT_URLS=http://%host%:2379,http://%host%:4001
Environment=ETCD_INITIAL_CLUSTER=%cluster% Environment=ETCD_INITIAL_CLUSTER=%cluster%
Environment=ETCD_INITIAL_CLUSTER_STATE=new Environment=ETCD_INITIAL_CLUSTER_STATE=new
ExecStart=/opt/bin/etcd2 ExecStart=/opt/bin/etcd2

2
docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml
View File

@@ -129,7 +129,7 @@ coreos:
ExecStartPre=/usr/bin/curl \ ExecStartPre=/usr/bin/curl \
--silent \ --silent \
--location \ --location \
https://github.com/zettio/weave/releases/download/latest_release/weave \ https://github.com/weaveworks/weave/releases/download/v0.9.0/weave \
--output /opt/bin/weave --output /opt/bin/weave
ExecStartPre=/usr/bin/curl \ ExecStartPre=/usr/bin/curl \
--silent \ --silent \