summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-04-29 14:08:26 (GMT)
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-01 17:08:52 (GMT)
commitb3665368d3b4532d6afeba58b72e07118f8a07ba (patch)
tree0b4493af5fd0bab861a1bb9609ab056e4302a36e
parentff676897c79908f9147d8508e3d674d5b127186e (diff)
downloaddefinitions-b3665368d3b4532d6afeba58b72e07118f8a07ba.tar.gz
openstack: finishing tidy up systemd unit files
* Add db-setup to the 'Afters' for ceilometer * Improve order of units in 'Afters' * Remove deprecated syslog.target * Add missing Wants=network-online.target Change-Id: I4936126b78946dbdfe77213cc5202b39ea6a50cb
-rw-r--r--openstack/usr/lib/systemd/system/iscsi-setup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-api.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-central.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-notification.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-db-setup.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-glance-setup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ironic-api.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ironic-conductor.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ironic-setup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-keystone.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-network-setup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.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/openvswitch.service2
-rw-r--r--openstack/usr/lib/systemd/system/postgres-server.service1
-rw-r--r--openstack/usr/lib/systemd/system/rabbitmq-server.service2
-rw-r--r--openstack/usr/lib/systemd/system/swift-proxy.service2
29 files changed, 29 insertions, 28 deletions
diff --git a/openstack/usr/lib/systemd/system/iscsi-setup.service b/openstack/usr/lib/systemd/system/iscsi-setup.service
index c9e5ee5..4cb1004 100644
--- a/openstack/usr/lib/systemd/system/iscsi-setup.service
+++ b/openstack/usr/lib/systemd/system/iscsi-setup.service
@@ -1,7 +1,7 @@
[Unit]
Description=Run iscsi-setup Ansible scripts
Before=iscsid.service target.service
-Wants= iscsid.service target.service
+Wants=iscsid.service target.service
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service
index a5228e4..6e3ada5 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack ceilometer alarm evaluation service
ConditionPathExists=/etc/ceilometer/ceilometer.conf
-After=syslog.target network-online.target openstack-ceilometer-config-setup.service
+After=network-online.target openstack-ceilometer-config-setup.service openstack-ceilometer-db-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service
index fc074b0..7a3e1c9 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack ceilometer alarm notification service
ConditionPathExists=/etc/ceilometer/ceilometer.conf
-After=syslog.target network-online.target openstack-ceilometer-config-setup.service
+After=network-online.target openstack-ceilometer-config-setup.service openstack-ceilometer-db-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
index 31bb78a..eb0293b 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack ceilometer API service
ConditionPathExists=/etc/ceilometer/ceilometer.conf
-After=syslog.target network-online.target openstack-ceilometer-config-setup.service
+After=network-online.target openstack-ceilometer-config-setup.service openstack-ceilometer-db-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service
index daa91c1..a1bc11e 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack ceilometer central agent
ConditionPathExists=/etc/ceilometer/ceilometer.conf
-After=syslog.target network-online.target openstack-ceilometer-collector.service
+After=network-online.target openstack-ceilometer-config-setup.service openstack-ceilometer-db-setup.service openstack-ceilometer-collector.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
index e510285..dafc3ac 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack ceilometer collection service
ConditionPathExists=/etc/ceilometer/ceilometer.conf
-After=syslog.target network-online.target openstack-ceilometer-config-setup.service
+After=network-online.target openstack-ceilometer-config-setup.service openstack-ceilometer-db-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
index ccb78e2..9fe8a1e 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack ceilometer compute agent
ConditionPathExists=/etc/ceilometer/ceilometer.conf
-After=syslog.target network-online.target openstack-ceilometer-config-setup.service
+After=network-online.target openstack-ceilometer-config-setup.service openstack-ceilometer-db-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service
index fcd210f..6696116 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack ceilometer notification agent
ConditionPathExists=/etc/ceilometer/ceilometer.conf
-After=syslog.target network-online.target openstack-ceilometer-collector.service
+After=network-online.target openstack-ceilometer-config-setup.service openstack-ceilometer-db-setup.service openstack-ceilometer-collector.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-api.service b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
index d932f86..a284f31 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Volume Service (code-named Cinder) API server
ConditionPathExists=/etc/cinder/cinder.conf
-After=postgres-server-setup.service network-online.target openstack-cinder-db-setup.service openstack-cinder-config-setup.service
+After=network-online.target openstack-cinder-config-setup.service openstack-cinder-db-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-backup.service b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
index c2c44dd..c14e13a 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Cinder backup server
ConditionPathExists=/etc/cinder/cinder.conf
-After=network-online.target openstack-cinder-volume.service openstack-cinder-db-setup.service openstack-cinder-config-setup.service
+After=network-online.target openstack-cinder-config-setup.service openstack-cinder-db-setup.service openstack-cinder-volume.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service b/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
index 0e42bbc..a3c66d6 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
@@ -1,7 +1,7 @@
[Unit]
Description=Run cinder-db-setup Ansible scripts
ConditionPathExists=/etc/openstack/cinder.conf
-After=network-online.target postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service
+After=network-online.target postgres-server-setup.service openstack-keystone-setup.service openstack-cinder-config-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
index 9e14ead..f205aaf 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Cinder scheduler server
ConditionPathExists=/etc/cinder/cinder.conf
-After=network-online.target openstack-cinder-volume.service openstack-cinder-db-setup.service openstack-cinder-config-setup.service
+After=network-online.target openstack-cinder-config-setup.service openstack-cinder-db-setup.service openstack-cinder-volume.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-volume.service b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
index e080b6b..c56ee69 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Cinder volume server
ConditionPathExists=/etc/cinder/cinder.conf
-After=network-online.target openstack-cinder-lv-setup.service openstack-cinder-config-setup.service openstack-cinder-db-setup.service lvm2-lvmetad.service iscsid.service target.service
+After=network-online.target openstack-cinder-config-setup.service openstack-cinder-db-setup.service openstack-cinder-lv-setup.service lvm2-lvmetad.service iscsid.service target.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-api.service b/openstack/usr/lib/systemd/system/openstack-glance-api.service
index 810e096..4c34ff1 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-api.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Image Service (code-named Glance) API server
ConditionPathExists=/etc/glance/glance-api.conf
-After=syslog.target network-online.target
+After=network-online.target
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-registry.service b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
index 02b062c..d53c8b3 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-registry.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Image Service (code-named Glance) Registry server
ConditionPathExists=/etc/glance/glance-registry.conf
-After=syslog.target network-online.target
+After=network-online.target
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-setup.service b/openstack/usr/lib/systemd/system/openstack-glance-setup.service
index 9507787..4381079 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-setup.service
@@ -1,7 +1,7 @@
[Unit]
Description=Run glance-setup Ansible scripts
ConditionPathExists=/etc/openstack/glance.conf
-After=local-fs.target network-online.target openstack-keystone-setup.service postgres-server-setup.service
+After=local-fs.target network-online.target postgres-server-setup.service openstack-keystone-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-api.service b/openstack/usr/lib/systemd/system/openstack-ironic-api.service
index 7b9357f..5a286a9 100644
--- a/openstack/usr/lib/systemd/system/openstack-ironic-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-ironic-api.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Bare Metal Provisioning Service (code-named Ironic) API server
ConditionPathExists=/etc/ironic/ironic.conf
-After=syslog.target network-online.target
+After=network-online.target
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service b/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service
index b18f4ab..b3b226e 100644
--- a/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service
+++ b/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Bare Metal Provisioning Service (code-named Ironic) Conductor server
ConditionPathExists=/etc/ironic/ironic.conf
-After=syslog.target network-online.target
+After=network-online.target
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-setup.service b/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
index 626c1fb..e3a58eb 100644
--- a/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
@@ -1,7 +1,7 @@
[Unit]
Description=Run ironic-setup Ansible scripts
ConditionPathExists=/etc/openstack/ironic.conf
-After=local-fs.target network-online.target openstack-keystone-setup.service postgres-server-setup.service
+After=local-fs.target network-online.target postgres-server-setup.service openstack-keystone-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-keystone.service b/openstack/usr/lib/systemd/system/openstack-keystone.service
index f9cc66f..6f6ff64 100644
--- a/openstack/usr/lib/systemd/system/openstack-keystone.service
+++ b/openstack/usr/lib/systemd/system/openstack-keystone.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Identity Service (code-named Keystone)
-After=syslog.target network-online.target
ConditionPathExists=/etc/keystone/keystone.conf
+After=network-online.target
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-network-setup.service b/openstack/usr/lib/systemd/system/openstack-network-setup.service
index bf79aaa..021370d 100644
--- a/openstack/usr/lib/systemd/system/openstack-network-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-network-setup.service
@@ -1,6 +1,6 @@
[Unit]
Description=Run Ansible scripts to configure internal network for OpenStack
-After=openvswitch.service openvswitch-setup.service
+After=openvswitch-setup.service openvswitch.service
Before=systemd-networkd.service
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
index 9eff9ea..5d07da2 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
@@ -6,8 +6,8 @@ Wants=network-online.target
[Service]
Type=oneshot
-ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/neutron-db.yml
RemainAfterExit=yes
+ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/neutron-db.yml
[Install]
WantedBy=multi-user.target
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 b968232..f570902 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
@@ -1,10 +1,10 @@
[Unit]
Description=Neutron OVS cleanup
ConditionPathExists=/etc/neutron/neutron.conf
+ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup
After=network-online.target openstack-neutron-config-setup.service openstack-neutron-db-setup.service openvswitch.service
Before=openstack-neutron-plugin-openvswitch-agent.service
Wants=network-online.target
-ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-compute.service b/openstack/usr/lib/systemd/system/openstack-nova-compute.service
index b1e7622..4f9b819 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-compute.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-compute.service
@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Compute Service (code-named Nova) compute server
ConditionPathExists=/etc/nova/nova.conf
-After=network-online.target libvirtd.service openstack-nova-config-setup.service openstack-nova-db-setup.service
+After=network-online.target openstack-nova-config-setup.service openstack-nova-db-setup.service libvirtd.service
Wants=network-online.target
Requires=libvirtd.service
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-conductor.service b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
index 91021b5..4c0d7d4 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
@@ -1,7 +1,7 @@
[Unit]
Description=Database-access support for Compute nodes (nova-conductor)
ConditionPathExists=/etc/nova/nova.conf
-After=network-online.target libvirtd.service openstack-nova-config-setup.service openstack-nova-db-setup.service
+After=network-online.target openstack-nova-config-setup.service openstack-nova-db-setup.service libvirtd.service
Wants=network-online.target
Requires=libvirtd.service
diff --git a/openstack/usr/lib/systemd/system/openvswitch.service b/openstack/usr/lib/systemd/system/openvswitch.service
index 6f1a93a..70a640d 100644
--- a/openstack/usr/lib/systemd/system/openvswitch.service
+++ b/openstack/usr/lib/systemd/system/openvswitch.service
@@ -1,8 +1,8 @@
[Unit]
Description=Open vSwitch Daemon
-Wants=network-pre.target
After=openvswitch-initialize-db.service
Before=network-pre.target
+Wants=network-pre.target
[Service]
Type=forking
diff --git a/openstack/usr/lib/systemd/system/postgres-server.service b/openstack/usr/lib/systemd/system/postgres-server.service
index af0e962..9e11f26 100644
--- a/openstack/usr/lib/systemd/system/postgres-server.service
+++ b/openstack/usr/lib/systemd/system/postgres-server.service
@@ -1,6 +1,7 @@
[Unit]
Description=PostgreSQL database server
After=network-online.target
+Wants=network-online.target
[Service]
Type=forking
diff --git a/openstack/usr/lib/systemd/system/rabbitmq-server.service b/openstack/usr/lib/systemd/system/rabbitmq-server.service
index f161b9d..1a20f3e 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-online.target
+After=network-online.target
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/swift-proxy.service b/openstack/usr/lib/systemd/system/swift-proxy.service
index 3735436..7b0a2e1 100644
--- a/openstack/usr/lib/systemd/system/swift-proxy.service
+++ b/openstack/usr/lib/systemd/system/swift-proxy.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Swift Proxy Server
-After=syslog.target network-online.target network.target memcached.service openstack-keystone-setup.service swift-controller-setup.service
+After=network-online.target swift-controller-setup.service memcached.service
Wants=network-online.target
[Service]