From c61da590b5063a59de168e0338ef2de8dd9c8726 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Sep 10 2015 14:39:54 +0000 Subject: Change 4001 port in flannel --help and README.md as well --- diff --git a/change-4001-to-2379-in-help-and-README.patch b/change-4001-to-2379-in-help-and-README.patch new file mode 100644 index 0000000..4716763 --- /dev/null +++ b/change-4001-to-2379-in-help-and-README.patch @@ -0,0 +1,39 @@ +From 3bc5bbbee3fdedcd26047c5aaaa8c6b3d68503b9 Mon Sep 17 00:00:00 2001 +From: Jan Chaloupka +Date: Thu, 10 Sep 2015 16:38:02 +0200 +Subject: [PATCH] change 4001 to 2379 in help and README + +--- + README.md | 2 +- + main.go | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/README.md b/README.md +index 65b0c1f..d27d954 100644 +--- a/README.md ++++ b/README.md +@@ -178,7 +178,7 @@ $ flanneld --remote=10.0.0.3:8888 --networks=blue,green + + ``` + --public-ip="": IP accessible by other nodes for inter-host communication. Defaults to the IP of the interface being used for communication. +---etcd-endpoints=http://127.0.0.1:4001: a comma-delimited list of etcd endpoints. ++--etcd-endpoints=http://127.0.0.1:2379: a comma-delimited list of etcd endpoints. + --etcd-prefix=/coreos.com/network: etcd prefix. + --etcd-keyfile="": SSL key file used to secure etcd communication. + --etcd-certfile="": SSL certification file used to secure etcd communication. +diff --git a/main.go b/main.go +index 9e10455..88298bc 100644 +--- a/main.go ++++ b/main.go +@@ -62,7 +62,7 @@ var opts CmdLineOpts + + func init() { + flag.StringVar(&opts.publicIP, "public-ip", "", "IP accessible by other nodes for inter-host communication") +- flag.StringVar(&opts.etcdEndpoints, "etcd-endpoints", "http://127.0.0.1:4001,http://127.0.0.1:2379", "a comma-delimited list of etcd endpoints") ++ flag.StringVar(&opts.etcdEndpoints, "etcd-endpoints", "http://127.0.0.1:2379", "a comma-delimited list of etcd endpoints") + flag.StringVar(&opts.etcdPrefix, "etcd-prefix", "/coreos.com/network", "etcd prefix") + flag.StringVar(&opts.etcdKeyfile, "etcd-keyfile", "", "SSL key file used to secure etcd communication") + flag.StringVar(&opts.etcdCertfile, "etcd-certfile", "", "SSL certification file used to secure etcd communication") +-- +1.9.3 + diff --git a/flannel.spec b/flannel.spec index ac64f08..6a7fade 100644 --- a/flannel.spec +++ b/flannel.spec @@ -28,7 +28,7 @@ Name: flannel Version: 0.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Etcd address management agent for overlay networks License: ASL 2.0 URL: https://%{import_path} @@ -37,6 +37,9 @@ Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}. Source1: flanneld.sysconf Source2: flanneld.service Source3: flannel-docker.conf + +Patch0: change-4001-to-2379-in-help-and-README.patch + ExclusiveArch: %{ix86} x86_64 %{arm} BuildRequires: golang >= 1.2.7 @@ -127,6 +130,7 @@ building other packages which use %{project}/%{repo}. %prep %setup -q -n %{repo}-%{commit} +%patch0 -p1 %if ! 0%{?with_bundled} find . -name "*.go" \ @@ -205,6 +209,9 @@ go test %{import_path}/subnet %endif %changelog +* Thu Sep 10 2015 jchaloup - 0.5.3-2 +- Change 4001 port in flannel --help and README.md as well + * Mon Aug 31 2015 jchaloup - 0.5.3-1 - Update to 0.5.3 resolves: #1258876