Merge pull request #7158 from crossorigin/azure-0.15.0

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
commit 7854954fc2
2 changed files with 2 additions and 1 deletions

View File

@ -37,6 +37,7 @@ coreos:
Environment=ETCD_INITIAL_ADVERTISE_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_ADVERTISE_CLIENT_URLS=http://%host%:2379,http://%host%:4001
Environment=ETCD_INITIAL_CLUSTER=%cluster%
Environment=ETCD_INITIAL_CLUSTER_STATE=new
ExecStart=/opt/bin/etcd2

View File

@ -129,7 +129,7 @@ coreos:
ExecStartPre=/usr/bin/curl \
--silent \
--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
ExecStartPre=/usr/bin/curl \
--silent \