From 33b50df408d94b1a2a7017d1e48e78c982d9aabb Mon Sep 17 00:00:00 2001
From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
Date: Oct 14 2014 05:17:38 +0000
Subject: Use After=network-online.target


See:
 https://fedoraproject.org/wiki/Networking/Ideas/ServiceOrdering
See also the full discussion:
 https://bugzilla.redhat.com/show_bug.cgi?id=1119787

This bug can be worked around by using bind_ip=0.0.0.0. However,
all our deployment tools use explicit IPs. This is necessary in
cases when a separate replication network is used, for one.

In a completely unrelated change, swifch permissions of SystemD
units to 644, else it complains in /var/log/messages.

Resolves: rhbz#1150590

---

diff --git a/openstack-swift-account.service b/openstack-swift-account.service
index 782b06a..190c4e7 100644
--- a/openstack-swift-account.service
+++ b/openstack-swift-account.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Object Storage (swift) - Account Server
-After=syslog.target network.target
+Wants=network-online.target
+After=syslog.target network-online.target
 
 [Service]
 Type=simple
diff --git a/openstack-swift-account@.service b/openstack-swift-account@.service
index cae48c7..518c72d 100644
--- a/openstack-swift-account@.service
+++ b/openstack-swift-account@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Object Storage (swift) - Account Server instance %I
-After=syslog.target network.target
+Wants=network-online.target
+After=syslog.target network-online.target
 
 [Service]
 Type=simple
diff --git a/openstack-swift-container.service b/openstack-swift-container.service
index 6db2b51..46752a4 100644
--- a/openstack-swift-container.service
+++ b/openstack-swift-container.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Object Storage (swift) - Container Server
-After=syslog.target network.target
+Wants=network-online.target
+After=syslog.target network-online.target
 
 [Service]
 Type=simple
diff --git a/openstack-swift-container@.service b/openstack-swift-container@.service
index 4f51e3f..ff65089 100644
--- a/openstack-swift-container@.service
+++ b/openstack-swift-container@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Object Storage (swift) - Container Server instance %I
-After=syslog.target network.target
+Wants=network-online.target
+After=syslog.target network-online.target
 
 [Service]
 Type=simple
diff --git a/openstack-swift-object.service b/openstack-swift-object.service
index 1cd5020..3e57503 100644
--- a/openstack-swift-object.service
+++ b/openstack-swift-object.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Object Storage (swift) - Object Server
-After=syslog.target network.target
+Wants=network-online.target
+After=syslog.target network-online.target
 
 [Service]
 Type=simple
diff --git a/openstack-swift-object@.service b/openstack-swift-object@.service
index 172e322..4199e68 100644
--- a/openstack-swift-object@.service
+++ b/openstack-swift-object@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Object Storage (swift) - Object Server instance %I
-After=syslog.target network.target
+Wants=network-online.target
+After=syslog.target network-online.target
 
 [Service]
 Type=simple
diff --git a/openstack-swift-proxy.service b/openstack-swift-proxy.service
index 4078f50..d22e882 100644
--- a/openstack-swift-proxy.service
+++ b/openstack-swift-proxy.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Object Storage (swift) - Proxy Server
-After=syslog.target network.target
+Wants=network-online.target
+After=syslog.target network-online.target
 
 [Service]
 Type=simple
diff --git a/openstack-swift.spec b/openstack-swift.spec
index d7eff00..7db109a 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -7,7 +7,7 @@
 
 Name:             openstack-swift
 Version:          2.2.0
-Release:          0.1.rc1%{?dist}
+Release:          0.2.rc1%{?dist}
 Summary:          OpenStack Object Storage (Swift)
 
 Group:            Development/Languages
@@ -201,33 +201,33 @@ SPHINX_DEBUG=1 sphinx-1.0-build -b html doc/source doc/build/html
 %install
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 # systemd units
-install -p -D -m 755 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-account.service
-install -p -D -m 755 %{SOURCE21} %{buildroot}%{_unitdir}/%{name}-account@.service
-install -p -D -m 755 %{SOURCE23} %{buildroot}%{_unitdir}/%{name}-account-replicator.service
-install -p -D -m 755 %{SOURCE24} %{buildroot}%{_unitdir}/%{name}-account-replicator@.service
-install -p -D -m 755 %{SOURCE25} %{buildroot}%{_unitdir}/%{name}-account-auditor.service
-install -p -D -m 755 %{SOURCE26} %{buildroot}%{_unitdir}/%{name}-account-auditor@.service
-install -p -D -m 755 %{SOURCE27} %{buildroot}%{_unitdir}/%{name}-account-reaper.service
-install -p -D -m 755 %{SOURCE28} %{buildroot}%{_unitdir}/%{name}-account-reaper@.service
-install -p -D -m 755 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}-container.service
-install -p -D -m 755 %{SOURCE41} %{buildroot}%{_unitdir}/%{name}-container@.service
-install -p -D -m 755 %{SOURCE43} %{buildroot}%{_unitdir}/%{name}-container-replicator.service
-install -p -D -m 755 %{SOURCE44} %{buildroot}%{_unitdir}/%{name}-container-replicator@.service
-install -p -D -m 755 %{SOURCE45} %{buildroot}%{_unitdir}/%{name}-container-auditor.service
-install -p -D -m 755 %{SOURCE46} %{buildroot}%{_unitdir}/%{name}-container-auditor@.service
-install -p -D -m 755 %{SOURCE47} %{buildroot}%{_unitdir}/%{name}-container-updater.service
-install -p -D -m 755 %{SOURCE48} %{buildroot}%{_unitdir}/%{name}-container-updater@.service
-install -p -D -m 755 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-object.service
-install -p -D -m 755 %{SOURCE51} %{buildroot}%{_unitdir}/%{name}-object@.service
-install -p -D -m 755 %{SOURCE53} %{buildroot}%{_unitdir}/%{name}-object-replicator.service
-install -p -D -m 755 %{SOURCE54} %{buildroot}%{_unitdir}/%{name}-object-replicator@.service
-install -p -D -m 755 %{SOURCE55} %{buildroot}%{_unitdir}/%{name}-object-auditor.service
-install -p -D -m 755 %{SOURCE56} %{buildroot}%{_unitdir}/%{name}-object-auditor@.service
-install -p -D -m 755 %{SOURCE57} %{buildroot}%{_unitdir}/%{name}-object-updater.service
-install -p -D -m 755 %{SOURCE58} %{buildroot}%{_unitdir}/%{name}-object-updater@.service
-install -p -D -m 755 %{SOURCE59} %{buildroot}%{_unitdir}/%{name}-object-expirer.service
-install -p -D -m 755 %{SOURCE63} %{buildroot}%{_unitdir}/%{name}-container-reconciler.service
-install -p -D -m 755 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-proxy.service
+install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-account.service
+install -p -D -m 644 %{SOURCE21} %{buildroot}%{_unitdir}/%{name}-account@.service
+install -p -D -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/%{name}-account-replicator.service
+install -p -D -m 644 %{SOURCE24} %{buildroot}%{_unitdir}/%{name}-account-replicator@.service
+install -p -D -m 644 %{SOURCE25} %{buildroot}%{_unitdir}/%{name}-account-auditor.service
+install -p -D -m 644 %{SOURCE26} %{buildroot}%{_unitdir}/%{name}-account-auditor@.service
+install -p -D -m 644 %{SOURCE27} %{buildroot}%{_unitdir}/%{name}-account-reaper.service
+install -p -D -m 644 %{SOURCE28} %{buildroot}%{_unitdir}/%{name}-account-reaper@.service
+install -p -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}-container.service
+install -p -D -m 644 %{SOURCE41} %{buildroot}%{_unitdir}/%{name}-container@.service
+install -p -D -m 644 %{SOURCE43} %{buildroot}%{_unitdir}/%{name}-container-replicator.service
+install -p -D -m 644 %{SOURCE44} %{buildroot}%{_unitdir}/%{name}-container-replicator@.service
+install -p -D -m 644 %{SOURCE45} %{buildroot}%{_unitdir}/%{name}-container-auditor.service
+install -p -D -m 644 %{SOURCE46} %{buildroot}%{_unitdir}/%{name}-container-auditor@.service
+install -p -D -m 644 %{SOURCE47} %{buildroot}%{_unitdir}/%{name}-container-updater.service
+install -p -D -m 644 %{SOURCE48} %{buildroot}%{_unitdir}/%{name}-container-updater@.service
+install -p -D -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-object.service
+install -p -D -m 644 %{SOURCE51} %{buildroot}%{_unitdir}/%{name}-object@.service
+install -p -D -m 644 %{SOURCE53} %{buildroot}%{_unitdir}/%{name}-object-replicator.service
+install -p -D -m 644 %{SOURCE54} %{buildroot}%{_unitdir}/%{name}-object-replicator@.service
+install -p -D -m 644 %{SOURCE55} %{buildroot}%{_unitdir}/%{name}-object-auditor.service
+install -p -D -m 644 %{SOURCE56} %{buildroot}%{_unitdir}/%{name}-object-auditor@.service
+install -p -D -m 644 %{SOURCE57} %{buildroot}%{_unitdir}/%{name}-object-updater.service
+install -p -D -m 644 %{SOURCE58} %{buildroot}%{_unitdir}/%{name}-object-updater@.service
+install -p -D -m 644 %{SOURCE59} %{buildroot}%{_unitdir}/%{name}-object-expirer.service
+install -p -D -m 644 %{SOURCE63} %{buildroot}%{_unitdir}/%{name}-container-reconciler.service
+install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-proxy.service
 # Remove tests
 rm -fr %{buildroot}/%{python_sitelib}/test
 # Misc other
@@ -475,6 +475,10 @@ exit 0
 %doc LICENSE doc/build/html
 
 %changelog
+* Mon Oct 13 2014 Pete Zaitcev <zaitcev@redhat.com> 2.2.0-0.2.rc1
+- Use After=network-online.target (#1150590)
+- Change the permissions of service units to 644, avoid warning messages
+
 * Tue Oct 07 2014 Haikel Guemar <hguemar@fedoraproject.org> 2.2.0-0.1.rc1
 - Update to upstream 2.2.0.rc1