diff --git a/openstack/barbican/openstack-barbican-keystone-listener.service b/openstack/barbican/openstack-barbican-keystone-listener.service index c754e2010..4ee6da6bc 100644 --- a/openstack/barbican/openstack-barbican-keystone-listener.service +++ b/openstack/barbican/openstack-barbican-keystone-listener.service @@ -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 diff --git a/openstack/barbican/openstack-barbican-retry.service b/openstack/barbican/openstack-barbican-retry.service index edf8800c4..cfb570da1 100644 --- a/openstack/barbican/openstack-barbican-retry.service +++ b/openstack/barbican/openstack-barbican-retry.service @@ -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 diff --git a/openstack/barbican/openstack-barbican-worker.service b/openstack/barbican/openstack-barbican-worker.service index 20d28a4a8..85244051d 100644 --- a/openstack/barbican/openstack-barbican-worker.service +++ b/openstack/barbican/openstack-barbican-worker.service @@ -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 diff --git a/openstack/cinder/openstack-cinder-api.service b/openstack/cinder/openstack-cinder-api.service index 8e3a9f293..b76d3704a 100644 --- a/openstack/cinder/openstack-cinder-api.service +++ b/openstack/cinder/openstack-cinder-api.service @@ -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 diff --git a/openstack/cinder/openstack-cinder-backup.service b/openstack/cinder/openstack-cinder-backup.service index b18643daf..d9cc48c0b 100644 --- a/openstack/cinder/openstack-cinder-backup.service +++ b/openstack/cinder/openstack-cinder-backup.service @@ -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 diff --git a/openstack/cinder/openstack-cinder-scheduler.service b/openstack/cinder/openstack-cinder-scheduler.service index 7a4bc89bf..ac33af232 100644 --- a/openstack/cinder/openstack-cinder-scheduler.service +++ b/openstack/cinder/openstack-cinder-scheduler.service @@ -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 diff --git a/openstack/cinder/openstack-cinder-volume.service b/openstack/cinder/openstack-cinder-volume.service index 4b0ce3638..5aa161c99 100644 --- a/openstack/cinder/openstack-cinder-volume.service +++ b/openstack/cinder/openstack-cinder-volume.service @@ -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 diff --git a/openstack/designate/openstack-designate-agent.service b/openstack/designate/openstack-designate-agent.service index bebe8484a..514ecabfd 100644 --- a/openstack/designate/openstack-designate-agent.service +++ b/openstack/designate/openstack-designate-agent.service @@ -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 diff --git a/openstack/designate/openstack-designate-api.service b/openstack/designate/openstack-designate-api.service index 422223a78..432e08a98 100644 --- a/openstack/designate/openstack-designate-api.service +++ b/openstack/designate/openstack-designate-api.service @@ -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 diff --git a/openstack/designate/openstack-designate-central.service b/openstack/designate/openstack-designate-central.service index 7808fa69c..848a0f729 100644 --- a/openstack/designate/openstack-designate-central.service +++ b/openstack/designate/openstack-designate-central.service @@ -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 diff --git a/openstack/designate/openstack-designate-mdns.service b/openstack/designate/openstack-designate-mdns.service index 28082bb9d..9470c316f 100644 --- a/openstack/designate/openstack-designate-mdns.service +++ b/openstack/designate/openstack-designate-mdns.service @@ -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 diff --git a/openstack/designate/openstack-designate-pool-manager.service b/openstack/designate/openstack-designate-pool-manager.service index 47995af83..ff4a207f1 100644 --- a/openstack/designate/openstack-designate-pool-manager.service +++ b/openstack/designate/openstack-designate-pool-manager.service @@ -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 diff --git a/openstack/designate/openstack-designate-producer.service b/openstack/designate/openstack-designate-producer.service index 7c6ace746..bb296f35e 100644 --- a/openstack/designate/openstack-designate-producer.service +++ b/openstack/designate/openstack-designate-producer.service @@ -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 diff --git a/openstack/designate/openstack-designate-sink.service b/openstack/designate/openstack-designate-sink.service index adfe813d9..932887907 100644 --- a/openstack/designate/openstack-designate-sink.service +++ b/openstack/designate/openstack-designate-sink.service @@ -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 diff --git a/openstack/designate/openstack-designate-worker.service b/openstack/designate/openstack-designate-worker.service index 416040ebf..1b0300698 100644 --- a/openstack/designate/openstack-designate-worker.service +++ b/openstack/designate/openstack-designate-worker.service @@ -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 diff --git a/openstack/designate/openstack-designate-zone-manager.service b/openstack/designate/openstack-designate-zone-manager.service index be9f85dfa..6eaa9f48f 100644 --- a/openstack/designate/openstack-designate-zone-manager.service +++ b/openstack/designate/openstack-designate-zone-manager.service @@ -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 diff --git a/openstack/ec2-api/openstack-ec2-api-api.service b/openstack/ec2-api/openstack-ec2-api-api.service index 4d9a8bb7a..98e88a88c 100644 --- a/openstack/ec2-api/openstack-ec2-api-api.service +++ b/openstack/ec2-api/openstack-ec2-api-api.service @@ -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 diff --git a/openstack/ec2-api/openstack-ec2-api-metadata.service b/openstack/ec2-api/openstack-ec2-api-metadata.service index e37d03277..7e936c2fa 100644 --- a/openstack/ec2-api/openstack-ec2-api-metadata.service +++ b/openstack/ec2-api/openstack-ec2-api-metadata.service @@ -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 diff --git a/openstack/ec2-api/openstack-ec2-api-s3.service b/openstack/ec2-api/openstack-ec2-api-s3.service index ae4c3f392..f2c7a2c2c 100644 --- a/openstack/ec2-api/openstack-ec2-api-s3.service +++ b/openstack/ec2-api/openstack-ec2-api-s3.service @@ -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 diff --git a/openstack/freezer/openstack-freezer-scheduler.service b/openstack/freezer/openstack-freezer-scheduler.service index f3022c138..e28e96f46 100644 --- a/openstack/freezer/openstack-freezer-scheduler.service +++ b/openstack/freezer/openstack-freezer-scheduler.service @@ -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 diff --git a/openstack/glance/openstack-glance-api.service b/openstack/glance/openstack-glance-api.service index b0f51be57..6af890ea8 100644 --- a/openstack/glance/openstack-glance-api.service +++ b/openstack/glance/openstack-glance-api.service @@ -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] diff --git a/openstack/glance/openstack-glance-registry.service b/openstack/glance/openstack-glance-registry.service index d1bee81dd..74b734bf2 100644 --- a/openstack/glance/openstack-glance-registry.service +++ b/openstack/glance/openstack-glance-registry.service @@ -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 diff --git a/openstack/heat/openstack-heat-api-cfn.service b/openstack/heat/openstack-heat-api-cfn.service index 48897327b..993a20b6b 100644 --- a/openstack/heat/openstack-heat-api-cfn.service +++ b/openstack/heat/openstack-heat-api-cfn.service @@ -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 diff --git a/openstack/heat/openstack-heat-api.service b/openstack/heat/openstack-heat-api.service index fed8a8e39..667b3c267 100644 --- a/openstack/heat/openstack-heat-api.service +++ b/openstack/heat/openstack-heat-api.service @@ -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 diff --git a/openstack/heat/openstack-heat-engine.service b/openstack/heat/openstack-heat-engine.service index 170dffc2e..e5745f414 100644 --- a/openstack/heat/openstack-heat-engine.service +++ b/openstack/heat/openstack-heat-engine.service @@ -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 diff --git a/openstack/ironic/openstack-ironic-api.service b/openstack/ironic/openstack-ironic-api.service index 539968533..4d89d039f 100644 --- a/openstack/ironic/openstack-ironic-api.service +++ b/openstack/ironic/openstack-ironic-api.service @@ -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 diff --git a/openstack/ironic/openstack-ironic-conductor.service b/openstack/ironic/openstack-ironic-conductor.service index 2684487b3..93bffba23 100644 --- a/openstack/ironic/openstack-ironic-conductor.service +++ b/openstack/ironic/openstack-ironic-conductor.service @@ -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 diff --git a/openstack/karbor/openstack-karbor-operationengine.service b/openstack/karbor/openstack-karbor-operationengine.service index 1a10fede5..69c569369 100644 --- a/openstack/karbor/openstack-karbor-operationengine.service +++ b/openstack/karbor/openstack-karbor-operationengine.service @@ -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 diff --git a/openstack/karbor/openstack-karbor-protection.service b/openstack/karbor/openstack-karbor-protection.service index 989b736d3..800215272 100644 --- a/openstack/karbor/openstack-karbor-protection.service +++ b/openstack/karbor/openstack-karbor-protection.service @@ -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 diff --git a/openstack/manila/openstack-manila-api.service b/openstack/manila/openstack-manila-api.service index 1f3c8c8f3..120677a19 100644 --- a/openstack/manila/openstack-manila-api.service +++ b/openstack/manila/openstack-manila-api.service @@ -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 diff --git a/openstack/manila/openstack-manila-data.service b/openstack/manila/openstack-manila-data.service index b754f3622..347c2813a 100644 --- a/openstack/manila/openstack-manila-data.service +++ b/openstack/manila/openstack-manila-data.service @@ -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 diff --git a/openstack/manila/openstack-manila-scheduler.service b/openstack/manila/openstack-manila-scheduler.service index 1b937c8e3..40129a4e8 100644 --- a/openstack/manila/openstack-manila-scheduler.service +++ b/openstack/manila/openstack-manila-scheduler.service @@ -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 diff --git a/openstack/manila/openstack-manila-share.service b/openstack/manila/openstack-manila-share.service index 048a98f92..96212baa4 100644 --- a/openstack/manila/openstack-manila-share.service +++ b/openstack/manila/openstack-manila-share.service @@ -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 diff --git a/openstack/mistral/openstack-mistral-api.service b/openstack/mistral/openstack-mistral-api.service index 02e3a3b98..ba4d3a275 100644 --- a/openstack/mistral/openstack-mistral-api.service +++ b/openstack/mistral/openstack-mistral-api.service @@ -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 diff --git a/openstack/mistral/openstack-mistral-engine.service b/openstack/mistral/openstack-mistral-engine.service index 4592453d4..4a1563981 100644 --- a/openstack/mistral/openstack-mistral-engine.service +++ b/openstack/mistral/openstack-mistral-engine.service @@ -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 diff --git a/openstack/mistral/openstack-mistral-executor.service b/openstack/mistral/openstack-mistral-executor.service index 7c3fa241e..04a986083 100644 --- a/openstack/mistral/openstack-mistral-executor.service +++ b/openstack/mistral/openstack-mistral-executor.service @@ -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 diff --git a/openstack/neutron-vpnaas/openstack-neutron-vyatta-agent.service b/openstack/neutron-vpnaas/openstack-neutron-vyatta-agent.service index 146559df8..bea7ec2b8 100644 --- a/openstack/neutron-vpnaas/openstack-neutron-vyatta-agent.service +++ b/openstack/neutron-vpnaas/openstack-neutron-vyatta-agent.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-dhcp-agent.service b/openstack/neutron/openstack-neutron-dhcp-agent.service index e7bc142dd..b3f956288 100644 --- a/openstack/neutron/openstack-neutron-dhcp-agent.service +++ b/openstack/neutron/openstack-neutron-dhcp-agent.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-l3-agent.service b/openstack/neutron/openstack-neutron-l3-agent.service index a355bbac1..cecfc5ee0 100644 --- a/openstack/neutron/openstack-neutron-l3-agent.service +++ b/openstack/neutron/openstack-neutron-l3-agent.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-linuxbridge-agent.service b/openstack/neutron/openstack-neutron-linuxbridge-agent.service index dc3790e87..386b2d9c0 100644 --- a/openstack/neutron/openstack-neutron-linuxbridge-agent.service +++ b/openstack/neutron/openstack-neutron-linuxbridge-agent.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-linuxbridge-cleanup.service b/openstack/neutron/openstack-neutron-linuxbridge-cleanup.service index 7eaea927b..0f941fd31 100644 --- a/openstack/neutron/openstack-neutron-linuxbridge-cleanup.service +++ b/openstack/neutron/openstack-neutron-linuxbridge-cleanup.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-macvtap-agent.service b/openstack/neutron/openstack-neutron-macvtap-agent.service index 8c295b287..14d17e232 100644 --- a/openstack/neutron/openstack-neutron-macvtap-agent.service +++ b/openstack/neutron/openstack-neutron-macvtap-agent.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-metadata-agent.service b/openstack/neutron/openstack-neutron-metadata-agent.service index 37b6d75b4..e81bed40d 100644 --- a/openstack/neutron/openstack-neutron-metadata-agent.service +++ b/openstack/neutron/openstack-neutron-metadata-agent.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-metering-agent.service b/openstack/neutron/openstack-neutron-metering-agent.service index d07386730..f2a79d074 100644 --- a/openstack/neutron/openstack-neutron-metering-agent.service +++ b/openstack/neutron/openstack-neutron-metering-agent.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-netns-cleanup.service b/openstack/neutron/openstack-neutron-netns-cleanup.service index ec5b6c71f..8b6af7403 100644 --- a/openstack/neutron/openstack-neutron-netns-cleanup.service +++ b/openstack/neutron/openstack-neutron-netns-cleanup.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-openvswitch-agent.service b/openstack/neutron/openstack-neutron-openvswitch-agent.service index 999e730f0..f3bb1b90c 100644 --- a/openstack/neutron/openstack-neutron-openvswitch-agent.service +++ b/openstack/neutron/openstack-neutron-openvswitch-agent.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-ovs-cleanup.service b/openstack/neutron/openstack-neutron-ovs-cleanup.service index 6f8d38609..5fb37ae44 100644 --- a/openstack/neutron/openstack-neutron-ovs-cleanup.service +++ b/openstack/neutron/openstack-neutron-ovs-cleanup.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-rpc-server.service b/openstack/neutron/openstack-neutron-rpc-server.service index 72591c350..411f4c399 100644 --- a/openstack/neutron/openstack-neutron-rpc-server.service +++ b/openstack/neutron/openstack-neutron-rpc-server.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-server.service b/openstack/neutron/openstack-neutron-server.service index 5143f62f2..3f7f94b6f 100644 --- a/openstack/neutron/openstack-neutron-server.service +++ b/openstack/neutron/openstack-neutron-server.service @@ -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 diff --git a/openstack/neutron/openstack-neutron-sriov-nic-agent.service b/openstack/neutron/openstack-neutron-sriov-nic-agent.service index c8f0a1b73..ee5bde3e9 100644 --- a/openstack/neutron/openstack-neutron-sriov-nic-agent.service +++ b/openstack/neutron/openstack-neutron-sriov-nic-agent.service @@ -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 diff --git a/openstack/nova/openstack-nova-api-metadata.service b/openstack/nova/openstack-nova-api-metadata.service index 7f9717ab5..2c9697232 100644 --- a/openstack/nova/openstack-nova-api-metadata.service +++ b/openstack/nova/openstack-nova-api-metadata.service @@ -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 diff --git a/openstack/nova/openstack-nova-api-os-compute.service b/openstack/nova/openstack-nova-api-os-compute.service index bf143170b..0d8eb79ad 100644 --- a/openstack/nova/openstack-nova-api-os-compute.service +++ b/openstack/nova/openstack-nova-api-os-compute.service @@ -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 diff --git a/openstack/nova/openstack-nova-api.service b/openstack/nova/openstack-nova-api.service index 244886b26..f74f7f2a3 100644 --- a/openstack/nova/openstack-nova-api.service +++ b/openstack/nova/openstack-nova-api.service @@ -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 diff --git a/openstack/nova/openstack-nova-compute.service b/openstack/nova/openstack-nova-compute.service index a9004bd42..562ecba67 100644 --- a/openstack/nova/openstack-nova-compute.service +++ b/openstack/nova/openstack-nova-compute.service @@ -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 diff --git a/openstack/nova/openstack-nova-conductor.service b/openstack/nova/openstack-nova-conductor.service index c2d8370f0..f3c06d59b 100644 --- a/openstack/nova/openstack-nova-conductor.service +++ b/openstack/nova/openstack-nova-conductor.service @@ -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 diff --git a/openstack/nova/openstack-nova-console.service b/openstack/nova/openstack-nova-console.service index 9912ddca3..1a0823d83 100644 --- a/openstack/nova/openstack-nova-console.service +++ b/openstack/nova/openstack-nova-console.service @@ -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 diff --git a/openstack/nova/openstack-nova-network.service b/openstack/nova/openstack-nova-network.service index c27699168..4f6766d2a 100644 --- a/openstack/nova/openstack-nova-network.service +++ b/openstack/nova/openstack-nova-network.service @@ -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 diff --git a/openstack/nova/openstack-nova-novncproxy.service b/openstack/nova/openstack-nova-novncproxy.service index 075c29f43..51312eb8b 100644 --- a/openstack/nova/openstack-nova-novncproxy.service +++ b/openstack/nova/openstack-nova-novncproxy.service @@ -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 diff --git a/openstack/nova/openstack-nova-scheduler.service b/openstack/nova/openstack-nova-scheduler.service index 43f614f4c..26cb1d530 100644 --- a/openstack/nova/openstack-nova-scheduler.service +++ b/openstack/nova/openstack-nova-scheduler.service @@ -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 diff --git a/openstack/nova/openstack-nova-serialproxy.service b/openstack/nova/openstack-nova-serialproxy.service index 07d95378c..fc28b0d12 100644 --- a/openstack/nova/openstack-nova-serialproxy.service +++ b/openstack/nova/openstack-nova-serialproxy.service @@ -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 - diff --git a/openstack/nova/openstack-nova-spicehtml5proxy.service b/openstack/nova/openstack-nova-spicehtml5proxy.service index 4983cef31..4a569ec2a 100644 --- a/openstack/nova/openstack-nova-spicehtml5proxy.service +++ b/openstack/nova/openstack-nova-spicehtml5proxy.service @@ -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 - diff --git a/openstack/nova/openstack-nova-xvpvncproxy.service b/openstack/nova/openstack-nova-xvpvncproxy.service index d3ce90a91..e3e99225c 100644 --- a/openstack/nova/openstack-nova-xvpvncproxy.service +++ b/openstack/nova/openstack-nova-xvpvncproxy.service @@ -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 - diff --git a/openstack/octavia/openstack-octavia-amphora-agent.service b/openstack/octavia/openstack-octavia-amphora-agent.service index a5362c95c..4e238b23c 100644 --- a/openstack/octavia/openstack-octavia-amphora-agent.service +++ b/openstack/octavia/openstack-octavia-amphora-agent.service @@ -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 diff --git a/openstack/octavia/openstack-octavia-api.service b/openstack/octavia/openstack-octavia-api.service index 9c9b01a9f..f7da41ba8 100644 --- a/openstack/octavia/openstack-octavia-api.service +++ b/openstack/octavia/openstack-octavia-api.service @@ -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 diff --git a/openstack/octavia/openstack-octavia-driver-agent.service b/openstack/octavia/openstack-octavia-driver-agent.service index 542172ff7..53277adc9 100644 --- a/openstack/octavia/openstack-octavia-driver-agent.service +++ b/openstack/octavia/openstack-octavia-driver-agent.service @@ -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 diff --git a/openstack/octavia/openstack-octavia-health-manager.service b/openstack/octavia/openstack-octavia-health-manager.service index 9ef8b912c..b05acc5b0 100644 --- a/openstack/octavia/openstack-octavia-health-manager.service +++ b/openstack/octavia/openstack-octavia-health-manager.service @@ -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 diff --git a/openstack/octavia/openstack-octavia-housekeeping.service b/openstack/octavia/openstack-octavia-housekeeping.service index ed16ea905..b74a99718 100644 --- a/openstack/octavia/openstack-octavia-housekeeping.service +++ b/openstack/octavia/openstack-octavia-housekeeping.service @@ -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 diff --git a/openstack/octavia/openstack-octavia-worker.service b/openstack/octavia/openstack-octavia-worker.service index 64e1426d2..7679b48a6 100644 --- a/openstack/octavia/openstack-octavia-worker.service +++ b/openstack/octavia/openstack-octavia-worker.service @@ -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 diff --git a/openstack/sahara/openstack-sahara-api.service b/openstack/sahara/openstack-sahara-api.service index 8e678ccc3..5cce0ebde 100644 --- a/openstack/sahara/openstack-sahara-api.service +++ b/openstack/sahara/openstack-sahara-api.service @@ -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 diff --git a/openstack/sahara/openstack-sahara-engine.service b/openstack/sahara/openstack-sahara-engine.service index 7f9a81b42..65d2739de 100644 --- a/openstack/sahara/openstack-sahara-engine.service +++ b/openstack/sahara/openstack-sahara-engine.service @@ -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 diff --git a/openstack/watcher/openstack-watcher-api.service b/openstack/watcher/openstack-watcher-api.service index 6fd4e6301..376806de5 100644 --- a/openstack/watcher/openstack-watcher-api.service +++ b/openstack/watcher/openstack-watcher-api.service @@ -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 diff --git a/openstack/watcher/openstack-watcher-applier.service b/openstack/watcher/openstack-watcher-applier.service index a2c258420..187ae7f26 100644 --- a/openstack/watcher/openstack-watcher-applier.service +++ b/openstack/watcher/openstack-watcher-applier.service @@ -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 diff --git a/openstack/watcher/openstack-watcher-decision-engine.service b/openstack/watcher/openstack-watcher-decision-engine.service index 05e7ed58f..edd6a3ae1 100644 --- a/openstack/watcher/openstack-watcher-decision-engine.service +++ b/openstack/watcher/openstack-watcher-decision-engine.service @@ -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