Move systemd units to /usr/lib/systemd/system as defined in systemd documentationbaserock/pedroalvarez/openstack-ansible-v4

See http://www.freedesktop.org/software/systemd/man/systemd.unit.html for more
information

35 files changed, 0 insertions, 429 deletions

diff --git a/openstack/etc/systemd/system/apache-httpd.service b/openstack/etc/systemd/system/apache-httpd.service
deleted file mode 100644
index f1211ac9..00000000
--- a/openstack/etc/systemd/system/apache-httpd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Apache Web Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/httpd.pid
-ExecStart=/usr/sbin/apachectl start
-ExecStop=/usr/sbin/apachectl graceful-stop
-ExecReload=/usr/sbin/apachectl graceful
-PrivateTmp=true
-LimitNOFILE=infinity
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-cinder-api.service b/openstack/etc/systemd/system/openstack-cinder-api.service
deleted file mode 100644
index a4a100f8..00000000
--- a/openstack/etc/systemd/system/openstack-cinder-api.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Volume Service (code-named Cinder) API server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=cinder
-ExecStart=/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-cinder-backup.service b/openstack/etc/systemd/system/openstack-cinder-backup.service
deleted file mode 100644
index a8f09ae0..00000000
--- a/openstack/etc/systemd/system/openstack-cinder-backup.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Cinder backup server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=cinder
-ExecStart=/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-backup.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-cinder-scheduler.service b/openstack/etc/systemd/system/openstack-cinder-scheduler.service
deleted file mode 100644
index feff70f4..00000000
--- a/openstack/etc/systemd/system/openstack-cinder-scheduler.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Cinder scheduler server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=cinder
-ExecStart=/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-cinder-setup.service b/openstack/etc/systemd/system/openstack-cinder-setup.service
deleted file mode 100644
index b166674b..00000000
--- a/openstack/etc/systemd/system/openstack-cinder-setup.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run cinder-setup Ansile scripts
-After=local-fs.target openstack-keystone-setup.service postgres-server.service
-
-[Service]
-ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/cinder.yml
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-cinder-volume.service b/openstack/etc/systemd/system/openstack-cinder-volume.service
deleted file mode 100644
index 8852c90f..00000000
--- a/openstack/etc/systemd/system/openstack-cinder-volume.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Cinder volume server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=cinder
-ExecStart=/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-glance-api.service b/openstack/etc/systemd/system/openstack-glance-api.service
deleted file mode 100644
index 7958f84c..00000000
--- a/openstack/etc/systemd/system/openstack-glance-api.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=OpenStack Image Service (code-named Glance) API server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=glance
-ExecStart=/usr/bin/glance-api --config-file /etc/glance/glance-api.conf
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/openstack/etc/systemd/system/openstack-glance-registry.service b/openstack/etc/systemd/system/openstack-glance-registry.service
deleted file mode 100644
index 18a60ae1..00000000
--- a/openstack/etc/systemd/system/openstack-glance-registry.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=OpenStack Image Service (code-named Glance) Registry server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=glance
-ExecStart=/usr/bin/glance-registry --config-file /etc/glance/glance-registry.conf
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/openstack/etc/systemd/system/openstack-glance-setup.service b/openstack/etc/systemd/system/openstack-glance-setup.service
deleted file mode 100644
index c00c520c..00000000
--- a/openstack/etc/systemd/system/openstack-glance-setup.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run glance-setup Ansible scripts
-After=local-fs.target openstack-keystone-setup.service postgres-server.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
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-horizon-setup.service b/openstack/etc/systemd/system/openstack-horizon-setup.service
deleted file mode 100644
index 9805a38f..00000000
--- a/openstack/etc/systemd/system/openstack-horizon-setup.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run horizon-setup Ansible scripts
-After=local-fs.target
-
-[Service]
-ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/horizon.yml
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-keystone-setup.service b/openstack/etc/systemd/system/openstack-keystone-setup.service
deleted file mode 100644
index 9ea04c1d..00000000
--- a/openstack/etc/systemd/system/openstack-keystone-setup.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Run keystone-setup Ansible scripts
-After=local-fs.target postgres-server.service
-ConditionPathExists=/etc/openstack/keystone.conf
-
-[Service]
-# Oneshot, since others setup have to wait until this service finishes
-Type=oneshot
-ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/keystone.yml
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-keystone.service b/openstack/etc/systemd/system/openstack-keystone.service
deleted file mode 100644
index 82b2d078..00000000
--- a/openstack/etc/systemd/system/openstack-keystone.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=OpenStack Identity Service (code-named Keystone)
-After=syslog.target network.target
-
-[Service]
-Type=notify
-Restart=always
-User=keystone
-ExecStart=/usr/bin/keystone-all --config-file /etc/keystone/keystone.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service b/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service
deleted file mode 100644
index a86b7a0a..00000000
--- a/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Neutron DHCP Agent
-After=network-online.target openstack-neutron-ovs-cleanup.service
-
-[Service]
-Type=simple
-User=neutron
-ExecStart=/usr/bin/neutron-dhcp-agent \
-  --config-file=/etc/neutron/neutron.conf \
-  --config-file=/etc/neutron/dhcp_agent.ini \
-  --log-file=/var/log/neutron/dhcp-agent.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-neutron-l3-agent.service b/openstack/etc/systemd/system/openstack-neutron-l3-agent.service
deleted file mode 100644
index 7fe12f46..00000000
--- a/openstack/etc/systemd/system/openstack-neutron-l3-agent.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Neutron Layer 3 Agent
-After=network-online.target openstack-neutron-ovs-cleanup.service
-
-[Service]
-Type=simple
-User=neutron
-ExecStart=/usr/bin/neutron-l3-agent \
-  --config-file=/etc/neutron/neutron.conf \
-  --config-file=/etc/neutron/l3_agent.ini \
-  --config-file=/etc/neutron/fwaas_driver.ini \
-  --log-file=/var/log/neutron/l3-agent.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service b/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service
deleted file mode 100644
index 15fd406f..00000000
--- a/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Neutron Metadata Plugin Agent
-After=network-online.target openstack-neutron-setup.service
-
-[Service]
-Type=simple
-User=neutron
-ExecStart=/usr/bin/neutron-metadata-agent \
-  --config-file=/etc/neutron/neutron.conf \
-  --config-file=/etc/neutron/metadata_agent.ini \
-  --log-file=/var/log/neutron/metadata-agent.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service
deleted file mode 100644
index 2b1d168b..00000000
--- a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Configuration script to set Openstack in one node networking
-Wants=network-online.target
-After=network-online.target openvswitch.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
-Restart=no
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
deleted file mode 100644
index 5eaf8a30..00000000
--- a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Neutron OVS cleanup
-After=network-online.target openstack-neutron-setup.service
-ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup
-
-[Service]
-Type=simple
-User=neutron
-ExecStart=/usr/bin/neutron-ovs-cleanup \
-  --log-file /var/log/neutron/ovs-cleanup.log \
-  --config-file /etc/neutron/neutron.conf --verbose
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service b/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
deleted file mode 100644
index 12498cc9..00000000
--- a/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Neutron OpenvSwitch Plugin Agent
-After=network-online.target openstack-neutron-setup.service
-
-[Service]
-Type=simple
-User=neutron
-ExecStart=/usr/bin/neutron-openvswitch-agent \
-  --config-file=/etc/neutron/neutron.conf \
-  --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \
-  --log-file=/var/log/neutron/openvswitch-agent.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-neutron-server.service b/openstack/etc/systemd/system/openstack-neutron-server.service
deleted file mode 100644
index b9484b94..00000000
--- a/openstack/etc/systemd/system/openstack-neutron-server.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Neutron Api Server
-Wants=openvswitch-create-links-one-node.service
-After=network-online.target openstack-neutron-setup.service openvswitch-create-links-one-node.service
-
-[Service]
-Type=simple
-User=neutron
-ExecStart=/usr/bin/neutron-server \
-  --config-file=/etc/neutron/neutron.conf \
-  --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \
-  --log-file=/var/log/neutron/neutron-server.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-neutron-setup.service b/openstack/etc/systemd/system/openstack-neutron-setup.service
deleted file mode 100644
index 4c09907e..00000000
--- a/openstack/etc/systemd/system/openstack-neutron-setup.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Run openstack-neutron-setup (once)
-Wants=openvswitch-create-links-one-node.service
-After=network-online.target openstack-keystone-setup.service openvswitch-create-links-one-node.service postgres-server.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/openstack-neutron-setup
-Restart=no
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-nova-api.service b/openstack/etc/systemd/system/openstack-nova-api.service
deleted file mode 100644
index de7412ee..00000000
--- a/openstack/etc/systemd/system/openstack-nova-api.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Compute Service (code-named Nova) API server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nova
-ExecStart=/usr/bin/nova-api --config-file /etc/nova/nova.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-nova-cert.service b/openstack/etc/systemd/system/openstack-nova-cert.service
deleted file mode 100644
index c21246bf..00000000
--- a/openstack/etc/systemd/system/openstack-nova-cert.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Nova Cert
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nova
-ExecStart=/usr/bin/nova-cert --config-file /etc/nova/nova.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-nova-compute.service b/openstack/etc/systemd/system/openstack-nova-compute.service
deleted file mode 100644
index dc18f225..00000000
--- a/openstack/etc/systemd/system/openstack-nova-compute.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=OpenStack Compute Service (code-named Nova) API server
-After=syslog.target network.target libvirtd.service
-Requires=libvirtd.service
-
-[Service]
-Type=simple
-User=nova
-ExecStart=/usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/nova-compute.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-nova-conductor.service b/openstack/etc/systemd/system/openstack-nova-conductor.service
deleted file mode 100644
index 68e0a6ed..00000000
--- a/openstack/etc/systemd/system/openstack-nova-conductor.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Database-access support for Compute nodes (nova-conductor)
-After=syslog.target network.target libvirtd.service
-Requires=libvirtd.service
-
-[Service]
-Type=simple
-User=nova
-ExecStart=/usr/bin/nova-conductor --config-file /etc/nova/nova.conf --logfile /var/log/nova/conductor.log
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-nova-consoleauth.service b/openstack/etc/systemd/system/openstack-nova-consoleauth.service
deleted file mode 100644
index 2c582518..00000000
--- a/openstack/etc/systemd/system/openstack-nova-consoleauth.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Openstack Console Auth (nova-consoleauth)
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nova
-ExecStart=/usr/bin/nova-consoleauth --config-file /etc/nova/nova.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-nova-novncproxy.service b/openstack/etc/systemd/system/openstack-nova-novncproxy.service
deleted file mode 100644
index 069e0751..00000000
--- a/openstack/etc/systemd/system/openstack-nova-novncproxy.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Nova NoVNC proxy
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nova
-ExecStart=/usr/bin/nova-novncproxy --config-file /etc/nova/nova.conf --web /usr/share/novnc
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-nova-scheduler.service b/openstack/etc/systemd/system/openstack-nova-scheduler.service
deleted file mode 100644
index 519ef5eb..00000000
--- a/openstack/etc/systemd/system/openstack-nova-scheduler.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Nova Scheduler
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=nova
-ExecStart=/usr/bin/nova-scheduler --config-file /etc/nova/nova.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-nova-setup.service b/openstack/etc/systemd/system/openstack-nova-setup.service
deleted file mode 100644
index a4ad6ae7..00000000
--- a/openstack/etc/systemd/system/openstack-nova-setup.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run nova-setup Ansible scripts
-After=local-fs.target libvirtd.service openstack-keystone-setup.service postgres-server.service
-
-[Service]
-ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/nova.yml
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
deleted file mode 100644
index bacfc433..00000000
--- a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Create Veth pairs
-Wants=openstack-neutron-network-configuration-one-node.service
-After=network-online.target openstack-neutron-network-configuration-one-node.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs
-RemainAfterExit=yes
-Restart=no
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/openstack/etc/systemd/system/openvswitch-db-server.service b/openstack/etc/systemd/system/openvswitch-db-server.service
deleted file mode 100644
index e1cd2042..00000000
--- a/openstack/etc/systemd/system/openvswitch-db-server.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Open vSwitch Database Server Daemon
-After=local-fs.target openvswitch-setup.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --pidfile --detach
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/openstack/etc/systemd/system/openvswitch-initialize-db.service b/openstack/etc/systemd/system/openvswitch-initialize-db.service
deleted file mode 100644
index 3c564c5a..00000000
--- a/openstack/etc/systemd/system/openvswitch-initialize-db.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Run openvswitch-initialize-db (once)
-After=local-fs.target openvswitch-db-server.service
-
-ConditionPathExists=!/usr/local/var/run/openvswitch/openvswitch-initialize-db-flag
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/ovs-vsctl --no-wait init
-ExecStart=/bin/touch /usr/local/var/run/openvswitch/openvswitch-initialize-db-flag
diff --git a/openstack/etc/systemd/system/openvswitch-setup.service b/openstack/etc/systemd/system/openvswitch-setup.service
deleted file mode 100644
index bfe67002..00000000
--- a/openstack/etc/systemd/system/openvswitch-setup.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Run openvswitch-setup (once)
-After=local-fs.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/openvswitch-setup
-Restart=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openvswitch.service b/openstack/etc/systemd/system/openvswitch.service
deleted file mode 100644
index 446c0f95..00000000
--- a/openstack/etc/systemd/system/openvswitch.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Open vSwitch Daemon
-After=openvswitch-initialize-db.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/ovs-vswitchd --pidfile --detach
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/postgres-server.service b/openstack/etc/systemd/system/postgres-server.service
deleted file mode 100644
index 42e88042..00000000
--- a/openstack/etc/systemd/system/postgres-server.service
+++ /dev/null
@@ -1,24 +0,0 @@
-[Unit]
-Description=PostgreSQL database server
- 
-[Service]
-Type=forking
-TimeoutSec=120
-User=postgres
-Group=postgres
- 
-Environment=PGROOT=/var/lib/pgsql
- 
-SyslogIdentifier=postgres
-PIDFile=/var/lib/pgsql/data/postmaster.pid
- 
-ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120
-ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload
-ExecStop= /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast
- 
-# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in
-# killing Postgres, so adjust it downward
-OOMScoreAdjust=-200
- 
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/rabbitmq-server.service b/openstack/etc/systemd/system/rabbitmq-server.service
deleted file mode 100644
index f0d60f51..00000000
--- a/openstack/etc/systemd/system/rabbitmq-server.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=RabbitMQ broker
-After=syslog.target network.target
-
-[Service]
-Type=notify
-User=rabbitmq
-Group=rabbitmq
-Environment="HOME=/var/lib/rabbitmq"
-WorkingDirectory=/var/lib/rabbitmq
-ExecStart=/usr/sbin/rabbitmq-server
-ExecStop=/usr/sbin/rabbitmqctl stop
-
-[Install]
-WantedBy=multi-user.target