Merge remote-tracking branch 'upstream/master' into titles-updates

2017-01-09 16:37:20 -08:00
parent 0bb7c0fe08 2ace8a3812
commit 4d95032f4e
11 changed files with 12 additions and 17 deletions
@@ -1,7 +1,6 @@
 ---
 assignees:
 - justinsb
- lavalamp
 - clove
 title: Running Kubernetes on AWS EC2
 ---
@@ -1,6 +1,5 @@
 ---
 assignees:
- lavalamp
 - thockin
 title: CentOS
 ---
@@ -131,15 +130,17 @@ $ etcdctl mk /kube-centos/network/config "{ \"Network\": \"172.30.0.0/16\", \"Su
 * Configure flannel to overlay Docker network in /etc/sysconfig/flanneld on the master (also in the nodes as we'll see):

 ```shell
+# Flanneld configuration options
+
 # etcd url location.  Point this to the server where etcd runs
-FLANNEL_ETCD="http://centos-master:2379"
+FLANNEL_ETCD_ENDPOINTS="http://centos-master:2379"

 # etcd config key.  This is the configuration key that flannel queries
 # For address range assignment
-FLANNEL_ETCD_KEY="/kube-centos/network"
+FLANNEL_ETCD_PREFIX="/kube-centos/network"

 # Any additional options that you want to pass
-FLANNEL_OPTIONS=""
+#FLANNEL_OPTIONS=""
 ```

 * Start the appropriate services on master:
@@ -179,15 +180,17 @@ KUBELET_ARGS=""
 * Configure flannel to overlay Docker network in /etc/sysconfig/flanneld (in all the nodes)

 ```shell
+# Flanneld configuration options
+
 # etcd url location.  Point this to the server where etcd runs
-FLANNEL_ETCD="http://centos-master:2379"
+FLANNEL_ETCD_ENDPOINTS="http://centos-master:2379"

 # etcd config key.  This is the configuration key that flannel queries
 # For address range assignment
-FLANNEL_ETCD_KEY="/kube-centos/network"
+FLANNEL_ETCD_PREFIX="/kube-centos/network"

 # Any additional options that you want to pass
-FLANNEL_OPTIONS=""
+#FLANNEL_OPTIONS=""
 ```

 * Start the appropriate services on node (centos-minion-n).
@@ -1,6 +1,5 @@
 ---
 assignees:
- lavalamp
 - thockin
 title: Cloudstack
 ---
@@ -1,6 +1,5 @@
 ---
 assignees:
- lavalamp
 - yifan-gu
 title: Running Kubernetes with rkt
 ---