summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-04-09 15:22:38 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-10 10:55:35 +0000
commit62572324c94d5a943ddc9424f9d7eeddd120afd5 (patch)
treea98514651898f44172ae6cab39025faa7d20ca86
parenteda7502d5180fb61b9289036389c661249bad38d (diff)
downloaddefinitions-62572324c94d5a943ddc9424f9d7eeddd120afd5.tar.gz
openstack: Add Wants=network-online.target to everything that ordered After= on it
network-online.target isn't brought in by default, so we need to explicitly do so. Change-Id: Id2c764a41bd2940ac735fe2fce4fd81210857503
-rw-r--r--openstack/usr/lib/systemd/system/apache-httpd.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-api.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-backup.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-volume.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-glance-api.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-glance-registry.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-keystone.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-server.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-setup.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-api.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-cert.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-compute.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-conductor.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-scheduler.service1
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service1
-rw-r--r--openstack/usr/lib/systemd/system/rabbitmq-server.service1
24 files changed, 24 insertions, 1 deletions
diff --git a/openstack/usr/lib/systemd/system/apache-httpd.service b/openstack/usr/lib/systemd/system/apache-httpd.service
index d562e5a4..adc84f40 100644
--- a/openstack/usr/lib/systemd/system/apache-httpd.service
+++ b/openstack/usr/lib/systemd/system/apache-httpd.service
@@ -1,6 +1,7 @@
[Unit]
Description=Apache Web Server
After=network-online.target remote-fs.target nss-lookup.target
+Wants=network-online.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 3590e0a9..c863f3f5 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Volume Service (code-named Cinder) API server
After=syslog.target network-online.target
+Wants=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 0bc57e22..2f489228 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Cinder backup server
After=syslog.target network-online.target
+Wants=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 a85b6509..025f1f3c 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Cinder scheduler server
After=syslog.target network-online.target
+Wants=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 d5d57f22..4a8da9c3 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Cinder volume server
After=syslog.target network-online.target
+Wants=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 975f91af..e1387118 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-api.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Image Service (code-named Glance) API server
After=syslog.target network-online.target
+Wants=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 ed240ede..f3134352 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-registry.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Image Service (code-named Glance) Registry server
After=syslog.target network-online.target
+Wants=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 303f4dd4..0aa9e1ef 100644
--- a/openstack/usr/lib/systemd/system/openstack-keystone.service
+++ b/openstack/usr/lib/systemd/system/openstack-keystone.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Identity Service (code-named Keystone)
After=syslog.target network-online.target
+Wants=network-online.target
[Service]
Type=notify
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
index a86b7a0a..34a682b6 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
@@ -1,6 +1,7 @@
[Unit]
Description=Neutron DHCP Agent
After=network-online.target openstack-neutron-ovs-cleanup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service
index 7fe12f46..bd514aa1 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service
@@ -1,6 +1,7 @@
[Unit]
Description=Neutron Layer 3 Agent
After=network-online.target openstack-neutron-ovs-cleanup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service
index 15fd406f..22bbf675 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service
@@ -1,6 +1,7 @@
[Unit]
Description=Neutron Metadata Plugin Agent
After=network-online.target openstack-neutron-setup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
index 083cf701..544531ed 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
@@ -1,6 +1,7 @@
[Unit]
Description=Neutron OVS cleanup
After=network-online.target openstack-neutron-setup.service openvswitch.service
+Wants=network-online.target
Before=openstack-neutron-plugin-openvswitch-agent.service
ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
index 12498cc9..894c3a45 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
@@ -1,6 +1,7 @@
[Unit]
Description=Neutron OpenvSwitch Plugin Agent
After=network-online.target openstack-neutron-setup.service
+Wants=network-online.target
[Service]
Type=simple
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-server.service b/openstack/usr/lib/systemd/system/openstack-neutron-server.service
index c8e816a5..05dfb7aa 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-server.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-server.service
@@ -1,6 +1,6 @@
[Unit]
Description=Neutron Api Server
-Wants=openstack-neutron-network-configuration-one-node.service
+Wants=openstack-neutron-network-configuration-one-node.service network-online.target
After=network-online.target openstack-neutron-setup.service openstack-neutron-network-configuration-one-node.service
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service
index 5833eb70..99213b6a 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service
@@ -1,6 +1,7 @@
[Unit]
Description=Run neutron-setup Ansible scripts
After=network-online.target openstack-keystone-setup.service postgres-server.service
+Wants=network-online.target
[Service]
ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/neutron.yml
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-api.service b/openstack/usr/lib/systemd/system/openstack-nova-api.service
index 708b1f60..8ee9cefa 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-api.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Compute Service (code-named Nova) API server
After=syslog.target network-online.target
+Wants=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 69b8fac3..b2a2e1cc 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-cert.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-cert.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Cert
After=syslog.target network-online.target
+Wants=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 a0452c31..95a3a872 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-compute.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-compute.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Compute Service (code-named Nova) compute server
After=syslog.target network-online.target libvirtd.service
+Wants=network-online.target
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 3a755811..1d2ece69 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
@@ -1,6 +1,7 @@
[Unit]
Description=Database-access support for Compute nodes (nova-conductor)
After=syslog.target network-online.target libvirtd.service
+Wants=network-online.target
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 64378438..66442d11 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service
@@ -1,6 +1,7 @@
[Unit]
Description=Openstack Console Auth (nova-consoleauth)
After=syslog.target network-online.target
+Wants=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 32d07f81..597f357a 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova NoVNC proxy
After=syslog.target network-online.target
+Wants=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 ed0c680a..d317b624 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Scheduler
After=syslog.target network-online.target
+Wants=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 a8a86804..2d95c1fa 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service
@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Serial Proxy
After=syslog.target network-online.target
+Wants=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 72be5c32..f161b9d0 100644
--- a/openstack/usr/lib/systemd/system/rabbitmq-server.service
+++ b/openstack/usr/lib/systemd/system/rabbitmq-server.service
@@ -1,6 +1,7 @@
[Unit]
Description=RabbitMQ broker
After=syslog.target network-online.target
+Wants=network-online.target
[Service]
Type=notify