From 26fe73c9dccaa7a34a450bff4c80e03ed627a996 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Wed, 29 Apr 2015 14:08:26 +0000 Subject: 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 --- openstack/usr/lib/systemd/system/iscsi-setup.service | 2 +- .../usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service | 2 +- .../usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service | 2 +- openstack/usr/lib/systemd/system/openstack-ceilometer-api.service | 2 +- openstack/usr/lib/systemd/system/openstack-ceilometer-central.service | 2 +- openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service | 2 +- openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service | 2 +- .../usr/lib/systemd/system/openstack-ceilometer-notification.service | 2 +- openstack/usr/lib/systemd/system/openstack-cinder-api.service | 2 +- openstack/usr/lib/systemd/system/openstack-cinder-backup.service | 2 +- openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service | 2 +- openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service | 2 +- openstack/usr/lib/systemd/system/openstack-cinder-volume.service | 2 +- openstack/usr/lib/systemd/system/openstack-glance-api.service | 2 +- openstack/usr/lib/systemd/system/openstack-glance-registry.service | 2 +- openstack/usr/lib/systemd/system/openstack-glance-setup.service | 2 +- openstack/usr/lib/systemd/system/openstack-ironic-api.service | 2 +- openstack/usr/lib/systemd/system/openstack-ironic-conductor.service | 2 +- openstack/usr/lib/systemd/system/openstack-ironic-setup.service | 2 +- openstack/usr/lib/systemd/system/openstack-keystone-setup.service | 2 +- openstack/usr/lib/systemd/system/openstack-keystone.service | 2 +- openstack/usr/lib/systemd/system/openstack-network-setup.service | 2 +- openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service | 2 +- openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service | 2 +- openstack/usr/lib/systemd/system/openstack-nova-compute.service | 2 +- openstack/usr/lib/systemd/system/openstack-nova-conductor.service | 2 +- openstack/usr/lib/systemd/system/openvswitch.service | 2 +- openstack/usr/lib/systemd/system/postgres-server.service | 1 + openstack/usr/lib/systemd/system/rabbitmq-server.service | 2 +- openstack/usr/lib/systemd/system/swift-proxy.service | 2 +- 30 files changed, 30 insertions(+), 29 deletions(-) diff --git a/openstack/usr/lib/systemd/system/iscsi-setup.service b/openstack/usr/lib/systemd/system/iscsi-setup.service index c9e5ee59..4cb10045 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 7be35379..b7cc0fa5 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 c74a80fb..b975bdc5 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 fb96319f..b7d034d2 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 b63dbcb4..c29ca255 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 4b5e960c..83b075b1 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 2139ac9d..b3832288 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 8ac12d83..e9e4b21a 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 d932f862..a284f31d 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 c2c44dd5..c14e13aa 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 cc99d0cb..cc5dbfba 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=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service +After=postgres-server-setup.service openstack-keystone-setup.service openstack-cinder-config-setup.service [Service] Type=oneshot diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service index 9e14ead5..f205aaff 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 e080b6b3..c56ee693 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 810e0965..4c34ff10 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 02b062ca..d53c8b33 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 b4ec3f02..97c3a403 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 openstack-keystone-setup.service postgres-server-setup.service +After=local-fs.target postgres-server-setup.service openstack-keystone-setup.service [Service] ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/glance.yml diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-api.service b/openstack/usr/lib/systemd/system/openstack-ironic-api.service index 7b9357f2..5a286a95 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 b18f4abf..b3b226e0 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 6d118f18..45b08e8c 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 openstack-keystone-setup.service postgres-server-setup.service +After=local-fs.target postgres-server-setup.service openstack-keystone-setup.service [Service] ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/ironic.yml diff --git a/openstack/usr/lib/systemd/system/openstack-keystone-setup.service b/openstack/usr/lib/systemd/system/openstack-keystone-setup.service index 2406513c..53d9c99f 100644 --- a/openstack/usr/lib/systemd/system/openstack-keystone-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-keystone-setup.service @@ -1,7 +1,7 @@ [Unit] Description=Run keystone-setup Ansible scripts -After=local-fs.target postgres-server-setup.service ConditionPathExists=/etc/openstack/keystone.conf +After=local-fs.target postgres-server-setup.service [Service] # Oneshot, since others setup have to wait until this service finishes diff --git a/openstack/usr/lib/systemd/system/openstack-keystone.service b/openstack/usr/lib/systemd/system/openstack-keystone.service index f9cc66f4..6f6ff644 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 bf79aaaa..021370d9 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 d1351c2e..4720e037 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service @@ -5,8 +5,8 @@ After=postgres-server-setup.service openstack-keystone-setup.service openstack-n [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 b968232e..f5709028 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 b1e76221..4f9b8196 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 2f7ca7b5..7a73794e 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 6f1a93a8..70a640de 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 af0e9621..9e11f26d 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 f161b9d0..1a20f3e4 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 0b98634a..b5b08f9b 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.target memcached.service openstack-keystone-setup.service swift-controller-setup.service +After=network.target swift-controller-setup.service memcached.service [Service] Type=forking -- cgit v1.2.1