If multiple etcd servers defined, point at all of them

(we still can only set up a single server though)
This commit is contained in:
Eric Paris 2015-05-30 12:05:22 -04:00
parent a95243450e
commit 70b7358d00
2 changed files with 2 additions and 2 deletions

View File

@ -1,7 +1,7 @@
# Flanneld configuration options
# etcd url location. Point this to the server where etcd runs
FLANNEL_ETCD="http://{{ groups['etcd'][0] }}:2379"
FLANNEL_ETCD="{% for node in groups['etcd'] %}http://{{ node }}:2379{% if not loop.last %},{% endif %}{% endfor %}"
# etcd config key. This is the configuration key that flannel queries
# For address range assignment

View File

@ -17,7 +17,7 @@ KUBE_API_ADDRESS="--address=0.0.0.0"
KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range={{ kube_service_addresses }}"
# Location of the etcd cluster
KUBE_ETCD_SERVERS="--etcd_servers=http://{{ groups['etcd'][0] }}:2379"
KUBE_ETCD_SERVERS="--etcd_servers={% for node in groups['etcd'] %}http://{{ node }}:2379{% if not loop.last %},{% endif %}{% endfor %}"
# default admission control policies
KUBE_ADMISSION_CONTROL="--admission_control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"