openstack/rpm-packaging
Code Issues Proposed changes

Add After=mariadb.service postgresql.service rabbitmq-server.service

Browse Source 
Adding theses lines to the systemd .service files will help to order
the boot/shutdown process when the database and/or RabbitMQ are
running on the same node as the service.

Also done:
- for glance-api, explicitly call glance-manage with config-dir to be
  able to add config snippets to /etc/glance/glance-api.conf.d/
- Drop some empty lines in the .service files

Change-Id: Id9c36226289304adb7ef2438f6bc2de1dde9e144
This commit is contained in:
Thomas Bechtold
2019-09-12 10:51:36 +02:00
parent f8ec5449a7
commit b9408d5a27
73 changed files with 80 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/barbican/openstack-barbican-keystone-listener.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack key and secret management (Barbican) - keystone-service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/barbican/openstack-barbican-retry.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack key and secret management (Barbican) - retry
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/barbican/openstack-barbican-worker.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack key and secret management (Barbican) - worker
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/cinder/openstack-cinder-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Cinder API Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service tgtd.service
[Service]
Type=notify

1
openstack/cinder/openstack-cinder-backup.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Cinder Backup Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/cinder/openstack-cinder-scheduler.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Cinder Scheduler Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/cinder/openstack-cinder-volume.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Cinder Volume Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
LimitNOFILE=131072

1
openstack/designate/openstack-designate-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate agent service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/designate/openstack-designate-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate API service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/designate/openstack-designate-central.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate central service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/designate/openstack-designate-mdns.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate mdns service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/designate/openstack-designate-pool-manager.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate pool manager service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/designate/openstack-designate-producer.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate producer service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/designate/openstack-designate-sink.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate sink service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/designate/openstack-designate-worker.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate worker service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/designate/openstack-designate-zone-manager.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack designate zone manager service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/ec2-api/openstack-ec2-api-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack EC2 API service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/ec2-api/openstack-ec2-api-metadata.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack EC2 metadata service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/ec2-api/openstack-ec2-api-s3.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack EC2 s3 service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/freezer/openstack-freezer-scheduler.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Freezer scheduler agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

4
openstack/glance/openstack-glance-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Image Service API server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple
@@ -10,7 +11,8 @@ LimitNOFILE=131072
LimitNPROC=131072
WorkingDirectory=/var/lib/glance
PrivateTmp=yes
ExecStartPre=-/usr/bin/glance-manage db sync
# the connection parameter might be stored in the glace-api related config files
ExecStartPre=-/usr/bin/glance-manage --config-dir=/etc/glance/glance.conf.d/ --config-dir=/etc/glance/glance-api.conf.d/ db sync
ExecStart=/usr/bin/glance-api
[Install]

1
openstack/glance/openstack-glance-registry.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Image Service registry server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/heat/openstack-heat-api-cfn.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Heat CFN API
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/heat/openstack-heat-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Heat API
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/heat/openstack-heat-engine.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Heat Engine
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/ironic/openstack-ironic-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Ironic - API
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/ironic/openstack-ironic-conductor.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Ironic - Conductor
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/karbor/openstack-karbor-operationengine.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Data Protection Operationengine service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/karbor/openstack-karbor-protection.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Data Protection Protection service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/manila/openstack-manila-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack shared file system service (Manila) - API
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/manila/openstack-manila-data.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack shared file system service (Manila) - Data
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/manila/openstack-manila-scheduler.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack shared file system service (Manila) - Scheduler
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/manila/openstack-manila-share.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack shared file system service (Manila) - Share
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/mistral/openstack-mistral-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Mistral API Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/mistral/openstack-mistral-engine.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Mistral Engine Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/mistral/openstack-mistral-executor.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Mistral Executor Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/neutron-vpnaas/openstack-neutron-vyatta-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Neutron VPN as a Service - Brocade Vyatte agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/neutron/openstack-neutron-dhcp-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron DHCP Agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/neutron/openstack-neutron-l3-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron Layer 3 Agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/neutron/openstack-neutron-linuxbridge-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron Linux Bridge Agent
After=syslog.target network.target network.service
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/neutron/openstack-neutron-linuxbridge-cleanup.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron Linux Bridge Cleanup Utility
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
Before=openstack-neutron-linuxbridge-agent.service openstack-neutron-dhcp-agent.service openstack-neutron-l3-agent.service
Before=openstack-nova-compute.service

1
openstack/neutron/openstack-neutron-macvtap-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron macvtap L2 agent
After=syslog.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/neutron/openstack-neutron-metadata-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron Metadata Agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/neutron/openstack-neutron-metering-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron Metering Agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

4
openstack/neutron/openstack-neutron-netns-cleanup.service
View File

@@ -1,6 +1,8 @@
Unit]
Description=OpenStack Neutron Netns Cleanup Utility
After=syslog.target network.target openvswitch.service
After=syslog.target network.target
After=openvswitch.service
After=mariadb.service postgresql.service rabbitmq-server.service
Before=openstack-neutron-openvswitch-agent.service openstack-neutron-dhcp-agent.service openstack-neutron-l3-agent.service
Before=openstack-nova-compute.service

4
openstack/neutron/openstack-neutron-openvswitch-agent.service
View File

@@ -1,6 +1,8 @@
[Unit]
Description=OpenStack Neutron Open vSwitch Agent
After=syslog.target network.target openvswitch.service
After=syslog.target network.target
After=openvswitch.service
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/neutron/openstack-neutron-ovs-cleanup.service
View File

@@ -2,6 +2,7 @@
Description=OpenStack Neutron Open vSwitch Cleanup Utility
After=syslog.target network.target
After=openvswitch.service
After=mariadb.service postgresql.service rabbitmq-server.service
Before=openstack-neutron-openvswitch-agent.service openstack-neutron-dhcp-agent.service openstack-neutron-l3-agent.service
Before=openstack-nova-compute.service

1
openstack/neutron/openstack-neutron-rpc-server.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron (RPC only) Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/neutron/openstack-neutron-server.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/neutron/openstack-neutron-sriov-nic-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Neutron SR-IOV NIC Agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

3
openstack/nova/openstack-nova-api-metadata.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Metadata API Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify
@@ -8,8 +9,6 @@ NotifyAccess=all
TimeoutStartSec=0
Restart=on-failure
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-api-metadata

3
openstack/nova/openstack-nova-api-os-compute.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Compute API Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify
@@ -8,8 +9,6 @@ NotifyAccess=all
TimeoutStartSec=0
Restart=on-failure
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-api-os-compute

3
openstack/nova/openstack-nova-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova API Server
After=syslog.target network.target mysql.service postgresql.service rabbitmq-server.service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

4
openstack/nova/openstack-nova-compute.service
View File

@@ -1,7 +1,7 @@
[Unit]
Description=OpenStack Nova Compute Server
After=syslog.target network.target
After=libvirtd.service libvirt-guests.service
After=rabbitmq-server.service libvirtd.service libvirt-guests.service
[Service]
Environment=LIBGUESTFS_ATTACH_METHOD=appliance
@@ -10,8 +10,6 @@ NotifyAccess=all
TimeoutStartSec=0
Restart=on-failure
User=nova
ExecStart=/usr/bin/nova-compute
TasksMax=infinity

3
openstack/nova/openstack-nova-conductor.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Conductor Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify
@@ -8,8 +9,6 @@ NotifyAccess=all
TimeoutStartSec=0
Restart=on-failure
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-conductor

3
openstack/nova/openstack-nova-console.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Console Proxy Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify
@@ -8,8 +9,6 @@ NotifyAccess=all
TimeoutStartSec=0
Restart=on-failure
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-console

4
openstack/nova/openstack-nova-network.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Network Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify
@@ -8,11 +9,8 @@ NotifyAccess=all
TimeoutStartSec=0
Restart=on-failure
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-network
# Don't kill dnsmasq on shutdown (#805947)
KillMode=process

3
openstack/nova/openstack-nova-novncproxy.service
View File

@@ -1,12 +1,11 @@
[Unit]
Description=OpenStack Nova NoVNC Proxy Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-novncproxy
Restart=on-failure

3
openstack/nova/openstack-nova-scheduler.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Nova Scheduler Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify
@@ -8,8 +9,6 @@ NotifyAccess=all
TimeoutStartSec=0
Restart=on-failure
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-scheduler

4
openstack/nova/openstack-nova-serialproxy.service
View File

@@ -1,16 +1,14 @@
[Unit]
Description=OpenStack Nova Serial Proxy Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-serialproxy
Restart=on-failure
[Install]
WantedBy=multi-user.target

4
openstack/nova/openstack-nova-spicehtml5proxy.service
View File

@@ -1,16 +1,14 @@
[Unit]
Description=OpenStack Nova Spice HTML5 Proxy Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-spicehtml5proxy
Restart=on-failure
[Install]
WantedBy=multi-user.target

4
openstack/nova/openstack-nova-xvpvncproxy.service
View File

@@ -1,16 +1,14 @@
[Unit]
Description=OpenStack Nova XVP VncProxy Server
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple
User=nova
PrivateTmp=yes
ExecStart=/usr/bin/nova-xvpvncproxy
Restart=on-failure
[Install]
WantedBy=multi-user.target

1
openstack/octavia/openstack-octavia-amphora-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Provides the OpenStack Octavia amphora agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/octavia/openstack-octavia-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Provides the OpenStack Octavia API service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/octavia/openstack-octavia-driver-agent.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Provides the OpenStack Octavia driver agent
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/octavia/openstack-octavia-health-manager.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Provides the OpenStack Octavia health manager
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/octavia/openstack-octavia-housekeeping.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Provides the OpenStack Octavia housekeeping
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/octavia/openstack-octavia-worker.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=Provides the OpenStack Octavia worker
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=simple

1
openstack/sahara/openstack-sahara-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Sahara API service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/sahara/openstack-sahara-engine.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Sahara engine service
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/watcher/openstack-watcher-api.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Watcher API
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/watcher/openstack-watcher-applier.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Watcher Applier
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify

1
openstack/watcher/openstack-watcher-decision-engine.service
View File

@@ -1,6 +1,7 @@
[Unit]
Description=OpenStack Watcher Decision Engine
After=syslog.target network.target
After=mariadb.service postgresql.service rabbitmq-server.service
[Service]
Type=notify