summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-16 15:12:14 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-16 17:36:03 +0000
commit46ea33a2fe458a5970332db03da0afe381149c6a (patch)
treef157de1b2ac48f1bb62eda58d74d55702243db5d
parenta4ded4f7310eeb4fb097c204898de7507d7f2814 (diff)
downloaddefinitions-baserock/pedroalvarez/openstack-ansible-v4.tar.gz
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
-rw-r--r--openstack-cinder.configure2
-rw-r--r--openstack-glance.configure2
-rw-r--r--openstack-keystone.configure4
-rw-r--r--openstack-neutron.configure2
-rw-r--r--openstack-nova.configure2
-rw-r--r--openstack/manifest70
-rw-r--r--openstack/usr/lib/systemd/system/apache-httpd.service (renamed from openstack/etc/systemd/system/apache-httpd.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-api.service (renamed from openstack/etc/systemd/system/openstack-cinder-api.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-backup.service (renamed from openstack/etc/systemd/system/openstack-cinder-backup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service (renamed from openstack/etc/systemd/system/openstack-cinder-scheduler.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-setup.service (renamed from openstack/etc/systemd/system/openstack-cinder-setup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-volume.service (renamed from openstack/etc/systemd/system/openstack-cinder-volume.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-glance-api.service (renamed from openstack/etc/systemd/system/openstack-glance-api.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-glance-registry.service (renamed from openstack/etc/systemd/system/openstack-glance-registry.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-glance-setup.service (renamed from openstack/etc/systemd/system/openstack-glance-setup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-horizon-setup.service (renamed from openstack/etc/systemd/system/openstack-horizon-setup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-keystone-setup.service (renamed from openstack/etc/systemd/system/openstack-keystone-setup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-keystone.service (renamed from openstack/etc/systemd/system/openstack-keystone.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service (renamed from openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service (renamed from openstack/etc/systemd/system/openstack-neutron-l3-agent.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service (renamed from openstack/etc/systemd/system/openstack-neutron-metadata-agent.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service (renamed from openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service (renamed from openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service (renamed from openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-server.service (renamed from openstack/etc/systemd/system/openstack-neutron-server.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-setup.service (renamed from openstack/etc/systemd/system/openstack-neutron-setup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-api.service (renamed from openstack/etc/systemd/system/openstack-nova-api.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-cert.service (renamed from openstack/etc/systemd/system/openstack-nova-cert.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-compute.service (renamed from openstack/etc/systemd/system/openstack-nova-compute.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-conductor.service (renamed from openstack/etc/systemd/system/openstack-nova-conductor.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service (renamed from openstack/etc/systemd/system/openstack-nova-consoleauth.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service (renamed from openstack/etc/systemd/system/openstack-nova-novncproxy.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-scheduler.service (renamed from openstack/etc/systemd/system/openstack-nova-scheduler.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-setup.service (renamed from openstack/etc/systemd/system/openstack-nova-setup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch-create-links-one-node.service (renamed from openstack/etc/systemd/system/openvswitch-create-links-one-node.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch-db-server.service (renamed from openstack/etc/systemd/system/openvswitch-db-server.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch-initialize-db.service (renamed from openstack/etc/systemd/system/openvswitch-initialize-db.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch-setup.service (renamed from openstack/etc/systemd/system/openvswitch-setup.service)0
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch.service (renamed from openstack/etc/systemd/system/openvswitch.service)0
-rw-r--r--openstack/usr/lib/systemd/system/postgres-server.service (renamed from openstack/etc/systemd/system/postgres-server.service)12
-rw-r--r--openstack/usr/lib/systemd/system/rabbitmq-server.service (renamed from openstack/etc/systemd/system/rabbitmq-server.service)0
41 files changed, 47 insertions, 47 deletions
diff --git a/openstack-cinder.configure b/openstack-cinder.configure
index f3d07477..79d2f6f4 100644
--- a/openstack-cinder.configure
+++ b/openstack-cinder.configure
@@ -21,7 +21,7 @@ ROOT="$1"
##########################################################################
-ln -sf "/etc/systemd/system/openstack-cinder-setup.service" \
+ln -sf "/usr/lib/systemd/system/openstack-cinder-setup.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openstack-cinder-setup.service"
##########################################################################
diff --git a/openstack-glance.configure b/openstack-glance.configure
index 7051f156..69020f10 100644
--- a/openstack-glance.configure
+++ b/openstack-glance.configure
@@ -21,7 +21,7 @@ ROOT="$1"
##########################################################################
-ln -s "/etc/systemd/system/openstack-glance-setup.service" \
+ln -s "/usr/lib/systemd/system/openstack-glance-setup.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openstack-glance-setup.service"
##########################################################################
diff --git a/openstack-keystone.configure b/openstack-keystone.configure
index 73dbd7e0..992ef0f8 100644
--- a/openstack-keystone.configure
+++ b/openstack-keystone.configure
@@ -21,10 +21,10 @@ ROOT="$1"
##########################################################################
-ln -s "/etc/systemd/system/openstack-keystone-setup.service" \
+ln -s "/usr/lib/systemd/system/openstack-keystone-setup.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openstack-keystone-setup.service"
-ln -s "/etc/systemd/system/openstack-horizon-setup.service" \
+ln -s "/usr/lib/systemd/system/openstack-horizon-setup.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openstack-horizon-setup.service"
##########################################################################
diff --git a/openstack-neutron.configure b/openstack-neutron.configure
index 71b29713..d0f425dc 100644
--- a/openstack-neutron.configure
+++ b/openstack-neutron.configure
@@ -54,6 +54,6 @@ services=("openstack-neutron-network-configuration-one-node.service" \
"openstack-neutron-setup.service")
for service in ${services[@]}; do
- ln -sf "/etc/systemd/system/$service" \
+ ln -sf "/usr/lib/systemd/system/$service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/$service"
done
diff --git a/openstack-nova.configure b/openstack-nova.configure
index 0c231198..e04527cc 100644
--- a/openstack-nova.configure
+++ b/openstack-nova.configure
@@ -21,7 +21,7 @@ ROOT="$1"
##########################################################################
-ln -s "/etc/systemd/system/openstack-nova-setup.service" \
+ln -s "/usr/lib/systemd/system/openstack-nova-setup.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openstack-nova-setup.service"
##########################################################################
diff --git a/openstack/manifest b/openstack/manifest
index 8d4b6cf8..7eb9bcb5 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -54,8 +54,8 @@
0100644 0 0 /usr/share/openstack/rabbitmq/rabbitmq-env.conf
0100644 0 0 /usr/share/openstack/rabbitmq/rabbitmq.config
0100644 0 0 /etc/logrotate.d/openstack-keystone
-0100644 0 0 /etc/systemd/system/openstack-keystone.service
-0100644 0 0 /etc/systemd/system/openstack-keystone-setup.service
+0100644 0 0 /usr/lib/systemd/system/openstack-keystone.service
+0100644 0 0 /usr/lib/systemd/system/openstack-keystone-setup.service
0040755 0 0 /etc/glance
0040755 0 0 /var/lib/glance
0040755 0 0 /var/lib/glance/image-cache
@@ -65,25 +65,25 @@
0040755 0 0 /var/lib/glance/images
0100644 0 0 /etc/logrotate.d/openstack-glance-api
0100644 0 0 /etc/logrotate.d/openstack-glance-registry
-0100644 0 0 /etc/systemd/system/openstack-glance-setup.service
-0100644 0 0 /etc/systemd/system/openstack-glance-api.service
-0100644 0 0 /etc/systemd/system/openstack-glance-registry.service
+0100644 0 0 /usr/lib/systemd/system/openstack-glance-setup.service
+0100644 0 0 /usr/lib/systemd/system/openstack-glance-api.service
+0100644 0 0 /usr/lib/systemd/system/openstack-glance-registry.service
0040755 0 0 /var/lib/nova
-0100644 0 0 /etc/systemd/system/openstack-nova-setup.service
-0100644 0 0 /etc/systemd/system/openstack-nova-compute.service
-0100644 0 0 /etc/systemd/system/openstack-nova-conductor.service
-0100644 0 0 /etc/systemd/system/openstack-nova-api.service
-0100644 0 0 /etc/systemd/system/openstack-nova-scheduler.service
-0100644 0 0 /etc/systemd/system/openstack-nova-consoleauth.service
-0100644 0 0 /etc/systemd/system/openstack-nova-novncproxy.service
-0100644 0 0 /etc/systemd/system/openstack-nova-cert.service
-0100644 0 0 /etc/systemd/system/rabbitmq-server.service
+0100644 0 0 /usr/lib/systemd/system/openstack-nova-setup.service
+0100644 0 0 /usr/lib/systemd/system/openstack-nova-compute.service
+0100644 0 0 /usr/lib/systemd/system/openstack-nova-conductor.service
+0100644 0 0 /usr/lib/systemd/system/openstack-nova-api.service
+0100644 0 0 /usr/lib/systemd/system/openstack-nova-scheduler.service
+0100644 0 0 /usr/lib/systemd/system/openstack-nova-consoleauth.service
+0100644 0 0 /usr/lib/systemd/system/openstack-nova-novncproxy.service
+0100644 0 0 /usr/lib/systemd/system/openstack-nova-cert.service
+0100644 0 0 /usr/lib/systemd/system/rabbitmq-server.service
0040755 0 0 /var/lib/cinder
-0100644 0 0 /etc/systemd/system/openstack-cinder-setup.service
-0100644 0 0 /etc/systemd/system/openstack-cinder-api.service
-0100644 0 0 /etc/systemd/system/openstack-cinder-scheduler.service
-0100644 0 0 /etc/systemd/system/openstack-cinder-volume.service
-0100644 0 0 /etc/systemd/system/openstack-cinder-backup.service
+0100644 0 0 /usr/lib/systemd/system/openstack-cinder-setup.service
+0100644 0 0 /usr/lib/systemd/system/openstack-cinder-api.service
+0100644 0 0 /usr/lib/systemd/system/openstack-cinder-scheduler.service
+0100644 0 0 /usr/lib/systemd/system/openstack-cinder-volume.service
+0100644 0 0 /usr/lib/systemd/system/openstack-cinder-backup.service
0040755 0 0 /etc/neutron
0100644 0 0 /usr/share/openstack/neutron/neutron.conf
0100644 0 0 /usr/share/openstack/neutron/api-paste.ini
@@ -150,29 +150,29 @@
0040755 0 0 /usr/share/openstack/neutron/plugins/vmware
0100644 0 0 /usr/share/openstack/neutron/plugins/vmware/nsx.ini
0100755 0 0 /usr/share/openstack/openstack-neutron-setup
-0100644 0 0 /etc/systemd/system/openstack-neutron-setup.service
-0100644 0 0 /etc/systemd/system/openstack-neutron-server.service
-0100644 0 0 /etc/systemd/system/openstack-neutron-metadata-agent.service
-0100644 0 0 /etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
-0100644 0 0 /etc/systemd/system/openstack-neutron-ovs-cleanup.service
-0100644 0 0 /etc/systemd/system/openstack-neutron-dhcp-agent.service
-0100644 0 0 /etc/systemd/system/openstack-neutron-l3-agent.service
+0100644 0 0 /usr/lib/systemd/system/openstack-neutron-setup.service
+0100644 0 0 /usr/lib/systemd/system/openstack-neutron-server.service
+0100644 0 0 /usr/lib/systemd/system/openstack-neutron-metadata-agent.service
+0100644 0 0 /usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
+0100644 0 0 /usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
+0100644 0 0 /usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
+0100644 0 0 /usr/lib/systemd/system/openstack-neutron-l3-agent.service
0100755 0 0 /usr/share/openstack/openvswitch-setup
-0100644 0 0 /etc/systemd/system/openvswitch-setup.service
-0100644 0 0 /etc/systemd/system/openvswitch-db-server.service
-0100644 0 0 /etc/systemd/system/openvswitch.service
+0100644 0 0 /usr/lib/systemd/system/openvswitch-setup.service
+0100644 0 0 /usr/lib/systemd/system/openvswitch-db-server.service
+0100644 0 0 /usr/lib/systemd/system/openvswitch.service
0100755 0 0 /usr/share/openstack/openstack-neutron-network-configuration-for-one-node
-0100644 0 0 /etc/systemd/system/openstack-neutron-network-configuration-one-node.service
-0100644 0 0 /etc/systemd/system/openvswitch-initialize-db.service
-0100644 0 0 /etc/systemd/system/postgres-server.service
-0100644 0 0 /etc/systemd/system/apache-httpd.service
+0100644 0 0 /usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service
+0100644 0 0 /usr/lib/systemd/system/openvswitch-initialize-db.service
+0100644 0 0 /usr/lib/systemd/system/postgres-server.service
+0100644 0 0 /usr/lib/systemd/system/apache-httpd.service
0040755 0 0 /etc/horizon
0040755 0 0 /etc/horizon/openstack_dashboard
-0100644 0 0 /etc/systemd/system/openstack-horizon-setup.service
+0100644 0 0 /usr/lib/systemd/system/openstack-horizon-setup.service
0100755 0 0 /usr/share/openstack/horizon.yml
0100644 0 0 /etc/horizon/apache-horizon.conf
0100644 0 0 /etc/horizon/openstack_dashboard/local_settings.py
0100644 0 0 /etc/sysctl.conf
-0100644 0 0 /etc/systemd/system/openvswitch-create-links-one-node.service
+0100644 0 0 /usr/lib/systemd/system/openvswitch-create-links-one-node.service
0100755 0 0 /usr/share/openstack/create_openvswitch_veth_pairs
0100644 0 0 /etc/hosts
diff --git a/openstack/etc/systemd/system/apache-httpd.service b/openstack/usr/lib/systemd/system/apache-httpd.service
index f1211ac9..f1211ac9 100644
--- a/openstack/etc/systemd/system/apache-httpd.service
+++ b/openstack/usr/lib/systemd/system/apache-httpd.service
diff --git a/openstack/etc/systemd/system/openstack-cinder-api.service b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
index a4a100f8..a4a100f8 100644
--- a/openstack/etc/systemd/system/openstack-cinder-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-api.service
diff --git a/openstack/etc/systemd/system/openstack-cinder-backup.service b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
index a8f09ae0..a8f09ae0 100644
--- a/openstack/etc/systemd/system/openstack-cinder-backup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service
diff --git a/openstack/etc/systemd/system/openstack-cinder-scheduler.service b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
index feff70f4..feff70f4 100644
--- a/openstack/etc/systemd/system/openstack-cinder-scheduler.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service
diff --git a/openstack/etc/systemd/system/openstack-cinder-setup.service b/openstack/usr/lib/systemd/system/openstack-cinder-setup.service
index b166674b..b166674b 100644
--- a/openstack/etc/systemd/system/openstack-cinder-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-setup.service
diff --git a/openstack/etc/systemd/system/openstack-cinder-volume.service b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
index 8852c90f..8852c90f 100644
--- a/openstack/etc/systemd/system/openstack-cinder-volume.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service
diff --git a/openstack/etc/systemd/system/openstack-glance-api.service b/openstack/usr/lib/systemd/system/openstack-glance-api.service
index 7958f84c..7958f84c 100644
--- a/openstack/etc/systemd/system/openstack-glance-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-api.service
diff --git a/openstack/etc/systemd/system/openstack-glance-registry.service b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
index 18a60ae1..18a60ae1 100644
--- a/openstack/etc/systemd/system/openstack-glance-registry.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
diff --git a/openstack/etc/systemd/system/openstack-glance-setup.service b/openstack/usr/lib/systemd/system/openstack-glance-setup.service
index c00c520c..c00c520c 100644
--- a/openstack/etc/systemd/system/openstack-glance-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-setup.service
diff --git a/openstack/etc/systemd/system/openstack-horizon-setup.service b/openstack/usr/lib/systemd/system/openstack-horizon-setup.service
index 9805a38f..9805a38f 100644
--- a/openstack/etc/systemd/system/openstack-horizon-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-horizon-setup.service
diff --git a/openstack/etc/systemd/system/openstack-keystone-setup.service b/openstack/usr/lib/systemd/system/openstack-keystone-setup.service
index 9ea04c1d..9ea04c1d 100644
--- a/openstack/etc/systemd/system/openstack-keystone-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-keystone-setup.service
diff --git a/openstack/etc/systemd/system/openstack-keystone.service b/openstack/usr/lib/systemd/system/openstack-keystone.service
index 82b2d078..82b2d078 100644
--- a/openstack/etc/systemd/system/openstack-keystone.service
+++ b/openstack/usr/lib/systemd/system/openstack-keystone.service
diff --git a/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
index a86b7a0a..a86b7a0a 100644
--- a/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service
diff --git a/openstack/etc/systemd/system/openstack-neutron-l3-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service
index 7fe12f46..7fe12f46 100644
--- a/openstack/etc/systemd/system/openstack-neutron-l3-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service
diff --git a/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service
index 15fd406f..15fd406f 100644
--- a/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service
diff --git a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service
index 2b1d168b..2b1d168b 100644
--- a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service
diff --git a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
index 5eaf8a30..5eaf8a30 100644
--- a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service
diff --git a/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
index 12498cc9..12498cc9 100644
--- a/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service
diff --git a/openstack/etc/systemd/system/openstack-neutron-server.service b/openstack/usr/lib/systemd/system/openstack-neutron-server.service
index b9484b94..b9484b94 100644
--- a/openstack/etc/systemd/system/openstack-neutron-server.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-server.service
diff --git a/openstack/etc/systemd/system/openstack-neutron-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service
index 4c09907e..4c09907e 100644
--- a/openstack/etc/systemd/system/openstack-neutron-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service
diff --git a/openstack/etc/systemd/system/openstack-nova-api.service b/openstack/usr/lib/systemd/system/openstack-nova-api.service
index de7412ee..de7412ee 100644
--- a/openstack/etc/systemd/system/openstack-nova-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-api.service
diff --git a/openstack/etc/systemd/system/openstack-nova-cert.service b/openstack/usr/lib/systemd/system/openstack-nova-cert.service
index c21246bf..c21246bf 100644
--- a/openstack/etc/systemd/system/openstack-nova-cert.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-cert.service
diff --git a/openstack/etc/systemd/system/openstack-nova-compute.service b/openstack/usr/lib/systemd/system/openstack-nova-compute.service
index dc18f225..dc18f225 100644
--- a/openstack/etc/systemd/system/openstack-nova-compute.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-compute.service
diff --git a/openstack/etc/systemd/system/openstack-nova-conductor.service b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
index 68e0a6ed..68e0a6ed 100644
--- a/openstack/etc/systemd/system/openstack-nova-conductor.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service
diff --git a/openstack/etc/systemd/system/openstack-nova-consoleauth.service b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service
index 2c582518..2c582518 100644
--- a/openstack/etc/systemd/system/openstack-nova-consoleauth.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service
diff --git a/openstack/etc/systemd/system/openstack-nova-novncproxy.service b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service
index 069e0751..069e0751 100644
--- a/openstack/etc/systemd/system/openstack-nova-novncproxy.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service
diff --git a/openstack/etc/systemd/system/openstack-nova-scheduler.service b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service
index 519ef5eb..519ef5eb 100644
--- a/openstack/etc/systemd/system/openstack-nova-scheduler.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service
diff --git a/openstack/etc/systemd/system/openstack-nova-setup.service b/openstack/usr/lib/systemd/system/openstack-nova-setup.service
index a4ad6ae7..a4ad6ae7 100644
--- a/openstack/etc/systemd/system/openstack-nova-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-setup.service
diff --git a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service b/openstack/usr/lib/systemd/system/openvswitch-create-links-one-node.service
index bacfc433..bacfc433 100644
--- a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
+++ b/openstack/usr/lib/systemd/system/openvswitch-create-links-one-node.service
diff --git a/openstack/etc/systemd/system/openvswitch-db-server.service b/openstack/usr/lib/systemd/system/openvswitch-db-server.service
index e1cd2042..e1cd2042 100644
--- a/openstack/etc/systemd/system/openvswitch-db-server.service
+++ b/openstack/usr/lib/systemd/system/openvswitch-db-server.service
diff --git a/openstack/etc/systemd/system/openvswitch-initialize-db.service b/openstack/usr/lib/systemd/system/openvswitch-initialize-db.service
index 3c564c5a..3c564c5a 100644
--- a/openstack/etc/systemd/system/openvswitch-initialize-db.service
+++ b/openstack/usr/lib/systemd/system/openvswitch-initialize-db.service
diff --git a/openstack/etc/systemd/system/openvswitch-setup.service b/openstack/usr/lib/systemd/system/openvswitch-setup.service
index bfe67002..bfe67002 100644
--- a/openstack/etc/systemd/system/openvswitch-setup.service
+++ b/openstack/usr/lib/systemd/system/openvswitch-setup.service
diff --git a/openstack/etc/systemd/system/openvswitch.service b/openstack/usr/lib/systemd/system/openvswitch.service
index 446c0f95..446c0f95 100644
--- a/openstack/etc/systemd/system/openvswitch.service
+++ b/openstack/usr/lib/systemd/system/openvswitch.service
diff --git a/openstack/etc/systemd/system/postgres-server.service b/openstack/usr/lib/systemd/system/postgres-server.service
index 42e88042..d824fc7b 100644
--- a/openstack/etc/systemd/system/postgres-server.service
+++ b/openstack/usr/lib/systemd/system/postgres-server.service
@@ -1,24 +1,24 @@
[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/usr/lib/systemd/system/rabbitmq-server.service
index f0d60f51..f0d60f51 100644
--- a/openstack/etc/systemd/system/rabbitmq-server.service
+++ b/openstack/usr/lib/systemd/system/rabbitmq-server.service