From 0c27b56658393675988e11ade35f63239e256b10 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Jul 20 2015 18:59:54 +0000
Subject: Change KUBE_ETCD_SERVERS to listen on 2379 ports instead of 4001

- resolves: #1243827

---

diff --git a/Change-etcd-server-port.patch b/Change-etcd-server-port.patch
new file mode 100644
index 0000000..2a8d34b
--- /dev/null
+++ b/Change-etcd-server-port.patch
@@ -0,0 +1,25 @@
+From 6ff601af2b4d2a684f46984ff68673871a6e0859 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Fri, 17 Jul 2015 09:35:35 +0200
+Subject: [PATCH] Change etcd server port
+
+---
+ contrib/init/systemd/environ/apiserver | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/init/systemd/environ/apiserver b/contrib/init/systemd/environ/apiserver
+index d0b1900..328b5c4 100644
+--- a/contrib/init/systemd/environ/apiserver
++++ b/contrib/init/systemd/environ/apiserver
+@@ -14,7 +14,7 @@ KUBE_API_ADDRESS="--address=127.0.0.1"
+ # KUBELET_PORT="--kubelet_port=10250"
+ 
+ # 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"
+-- 
+1.9.3
+
diff --git a/kubernetes.spec b/kubernetes.spec
index 1bf6d2f..092beb2 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -39,8 +39,9 @@ Source0:        https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.
 Source1:        genmanpages.sh
 Patch0:         Update-github.com-elazarl-go-bindata-assetfs-to-at-l.patch
 Patch1:         Fix-Persistent-Volumes-and-Persistent-Volume-Claims.patch
+Patch2:         Change-etcd-server-port.patch
 %if 0%{?with_debug}
-Patch2:         build-with-debug-info.patch
+Patch3:         build-with-debug-info.patch
 %endif
 
 # It obsoletes cadvisor but needs its source code (literally integrated)
@@ -537,7 +538,8 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %changelog
 * Mon Jul 20 2015 jchaloup <jchaloup@redhat.com> - 1.0.0-0.9.git2d88675
 - Bump to upstream 2d88675f2203d316d4bac312c7ccad12991b56c2
-  related: #1211266
+- Change KUBE_ETCD_SERVERS to listen on 2379 ports instead of 4001
+  resolves: #1243827
 
 * Mon Jul 20 2015 jchaloup <jchaloup@redhat.com> - 1.0.0-0.8.gitb2dafda
 - Fix dependency and tests for go-1.5