summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-04-09 15:21:37 +0000
committerRichard Ipsum <richardipsum@fastmail.co.uk>2015-04-10 20:17:47 +0100
commitb969f18675ae53fd8efd5ecf0603abce839c78cd (patch)
treeeb86c1a5c86b3e30489ce70acdb03e881f3cde19
parent19eee9be8f481cd02572486595c41eef96891ebe (diff)
downloaddefinitions-b969f18675ae53fd8efd5ecf0603abce839c78cd.tar.gz
openstack: order services after network-online.target instead of network.target
We always meant the latter, and it just happened that we previously depended on something that also meant that. Change-Id: I7371e0974a0e02f3a92a6ebc174b6d372b8068f1
-rw-r--r--openstack/usr/lib/systemd/system/apache-httpd.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-api.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-backup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-volume.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-glance-api.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-glance-registry.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-keystone.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-api.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-cert.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-compute.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-conductor.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-scheduler.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service2
-rw-r--r--openstack/usr/lib/systemd/system/rabbitmq-server.service2
17 files changed, 17 insertions, 17 deletions
diff --git a/openstack/usr/lib/systemd/system/apache-httpd.service b/openstack/usr/lib/systemd/system/apache-httpd.service
index f1211ac9..d562e5a4 100644
--- a/openstack/usr/lib/systemd/system/apache-httpd.service
+++ b/openstack/usr/lib/systemd/system/apache-httpd.service
@@ -1,6 +1,6 @@
[Unit]
Description=Apache Web Server
-After=network.target remote-fs.target nss-lookup.target
+After=network-online.target remote-fs.target nss-lookup.target
[Service]
Type=forking
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-api.service b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
index a4a100f8..3590e0a9 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Volume Service (code-named Cinder) API server
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-backup.service b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
index a8f09ae0..0bc57e22 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Cinder backup server
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
index feff70f4..a85b6509 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Cinder scheduler server
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-volume.service b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
index 8852c90f..d5d57f22 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Cinder volume server
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-api.service b/openstack/usr/lib/systemd/system/openstack-glance-api.service
index 7958f84c..975f91af 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-api.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Image Service (code-named Glance) API server
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-registry.service b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
index 18a60ae1..ed240ede 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-registry.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Image Service (code-named Glance) Registry server
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-keystone.service b/openstack/usr/lib/systemd/system/openstack-keystone.service
index 82b2d078..303f4dd4 100644
--- a/openstack/usr/lib/systemd/system/openstack-keystone.service
+++ b/openstack/usr/lib/systemd/system/openstack-keystone.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Identity Service (code-named Keystone)
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=notify
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-api.service b/openstack/usr/lib/systemd/system/openstack-nova-api.service
index de7412ee..708b1f60 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-api.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Compute Service (code-named Nova) API server
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-cert.service b/openstack/usr/lib/systemd/system/openstack-nova-cert.service
index c21246bf..69b8fac3 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-cert.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-cert.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Nova Cert
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-compute.service b/openstack/usr/lib/systemd/system/openstack-nova-compute.service
index aa332251..a0452c31 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-compute.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-compute.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Compute Service (code-named Nova) compute server
-After=syslog.target network.target libvirtd.service
+After=syslog.target network-online.target libvirtd.service
Requires=libvirtd.service
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-conductor.service b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
index 68e0a6ed..3a755811 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
@@ -1,6 +1,6 @@
[Unit]
Description=Database-access support for Compute nodes (nova-conductor)
-After=syslog.target network.target libvirtd.service
+After=syslog.target network-online.target libvirtd.service
Requires=libvirtd.service
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service
index 2c582518..64378438 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service
@@ -1,6 +1,6 @@
[Unit]
Description=Openstack Console Auth (nova-consoleauth)
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service
index 069e0751..32d07f81 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Nova NoVNC proxy
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service
index 519ef5eb..ed0c680a 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Nova Scheduler
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service b/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service
index 2557dc2b..a8a86804 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Nova Serial Proxy
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/rabbitmq-server.service b/openstack/usr/lib/systemd/system/rabbitmq-server.service
index 829c5848..72be5c32 100644
--- a/openstack/usr/lib/systemd/system/rabbitmq-server.service
+++ b/openstack/usr/lib/systemd/system/rabbitmq-server.service
@@ -1,6 +1,6 @@
[Unit]
Description=RabbitMQ broker
-After=syslog.target network.target
+After=syslog.target network-online.target
[Service]
Type=notify