From 363052020c483f13a533775266891eb15ffdaf3d Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 11 Nov 2016 14:19:21 +0000 Subject: [PATCH] getting-started: update to assume port numbers for etcd >= 2.0 The docs still refer to etcd using port 4001, but in all currently released Fedora versions it will be using 2379 Signed-off-by: Daniel P. Berrange --- docs/getting-started-guides/fedora/fedora_manual_config.md | 6 +++--- .../fedora/flannel_multi_node_cluster.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/getting-started-guides/fedora/fedora_manual_config.md b/docs/getting-started-guides/fedora/fedora_manual_config.md index 0086af1d14..52627c9f47 100644 --- a/docs/getting-started-guides/fedora/fedora_manual_config.md +++ b/docs/getting-started-guides/fedora/fedora_manual_config.md @@ -76,7 +76,7 @@ systemctl stop iptables-services firewalld KUBE_API_ADDRESS="--address=0.0.0.0" # Comma separated list of nodes in the etcd cluster -KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:4001" +KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:2379" # Address range to use for services KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" @@ -85,10 +85,10 @@ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" KUBE_API_ARGS="" ``` -* Edit /etc/etcd/etcd.conf to let etcd listen on all available IPs instead of 127.0.0.1; If you have not done this, you might see an error such as "connection refused". Note that Fedora 22 uses etcd 2.0, One of the changes in etcd 2.0 is that now uses port 2379 and 2380 (as opposed to etcd 0.46 which userd 4001 and 7001). +* Edit /etc/etcd/etcd.conf to let etcd listen on all available IPs instead of 127.0.0.1; If you have not done this, you might see an error such as "connection refused". ```shell -ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:4001" +ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:2379" ``` * Create /var/run/kubernetes on master: diff --git a/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md b/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md index 494f7cd343..a7f25b0d14 100644 --- a/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md +++ b/docs/getting-started-guides/fedora/flannel_multi_node_cluster.md @@ -55,7 +55,7 @@ Edit the flannel configuration file /etc/sysconfig/flanneld as follows: # Flanneld configuration options # etcd url location. Point this to the server where etcd runs -FLANNEL_ETCD="http://fed-master:4001" +FLANNEL_ETCD="http://fed-master:2379" # etcd config key. This is the configuration key that flannel queries # For address range assignment @@ -104,7 +104,7 @@ Now check the interfaces on the nodes. Notice there is now a flannel.1 interface From any node in the cluster, check the cluster members by issuing a query to etcd server via curl (only partial output is shown using `grep -E "\{|\}|key|value"`). If you set up a 1 master and 3 nodes cluster, you should see one block for each node showing the subnets they have been assigned. You can associate those subnets to each node by the MAC address (VtepMAC) and IP address (Public IP) that is listed in the output. ```shell -curl -s http://fed-master:4001/v2/keys/coreos.com/network/subnets | python -mjson.tool +curl -s http://fed-master:2379/v2/keys/coreos.com/network/subnets | python -mjson.tool ``` ```json