From 68b756cae5c8b58bc13b31ebe3d6f882a7bae579 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 17 2017 20:35:52 +0000
Subject: import flannel-0.5.5-2.el7


---

diff --git a/SOURCES/flanneld-start b/SOURCES/flanneld-start
new file mode 100644
index 0000000..e119b6b
--- /dev/null
+++ b/SOURCES/flanneld-start
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+exec /usr/bin/flanneld \
+	-etcd-endpoints=${FLANNEL_ETCD_ENDPOINTS:-${FLANNEL_ETCD}} \
+	-etcd-prefix=${FLANNEL_ETCD_PREFIX:-${FLANNEL_ETCD_KEY}} \
+	"$@"
+
diff --git a/SOURCES/flanneld.service b/SOURCES/flanneld.service
index f945928..968e4ea 100644
--- a/SOURCES/flanneld.service
+++ b/SOURCES/flanneld.service
@@ -10,7 +10,7 @@ Before=docker.service
 Type=notify
 EnvironmentFile=/etc/sysconfig/flanneld
 EnvironmentFile=-/etc/sysconfig/docker-network
-ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD_ENDPOINTS} -etcd-prefix=${FLANNEL_ETCD_PREFIX} $FLANNEL_OPTIONS
+ExecStart=/usr/bin/flanneld-start $FLANNEL_OPTIONS
 ExecStartPost=/usr/libexec/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS -d /run/flannel/docker
 Restart=on-failure
 
diff --git a/SPECS/flannel.spec b/SPECS/flannel.spec
index 762a14f..7c6e983 100644
--- a/SPECS/flannel.spec
+++ b/SPECS/flannel.spec
@@ -21,7 +21,7 @@
 
 Name:           flannel 
 Version:        0.5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Etcd address management agent for overlay networks
 License:        ASL 2.0 
 URL:            https://%{import_path}
@@ -31,6 +31,7 @@ Source1:        flanneld.sysconf
 Source2:        flanneld.service
 Source3:        flannel-docker.conf
 Source4:        flannel-tmpfiles.conf
+Source5:        flanneld-start
 
 Patch0:         change-4001-to-2379-in-help-and-README.patch
 Patch1:         change-coreos.com-network-to-atomic.io-network-in-he.patch
@@ -153,6 +154,7 @@ gobuild -o bin/flanneld .
 %install
 # package with binary
 install -D -p -m 755 bin/flanneld %{buildroot}%{_bindir}/flanneld
+install -D -p -m 755 %{SOURCE5} %{buildroot}%{_bindir}/flanneld-start
 install -D -p -m 644 %{SOURCE1} %{buildroot}/etc/sysconfig/flanneld
 install -D -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/flanneld.service
 install -D -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/docker.service.d/flannel.conf
@@ -189,6 +191,7 @@ go test %{import_path}/subnet
 %files
 %doc CONTRIBUTING.md  LICENSE MAINTAINERS README.md  DCO NOTICE
 %{_bindir}/flanneld
+%{_bindir}/flanneld-start
 %{_unitdir}/flanneld.service
 %{_unitdir}/docker.service.d/flannel.conf
 %{_libexecdir}/flannel/mk-docker-opts.sh
@@ -206,6 +209,10 @@ go test %{import_path}/subnet
 %endif
 
 %changelog
+* Tue Dec 13 2016 Jan Chaloupka <jchaloup@redhat.com> - 0.5.5-2
+- Use non-canonicalized etcd endpoints and prefix if canonicalized are not set
+  resolves: #1341223
+
 * Wed Sep 07 2016 jchaloup <jchaloup@redhat.com> - 0.5.5-1
 - Update to flannel v5.5.0
   resolves: #1373915