36 files changed, 40 insertions, 41 deletions
diff --git a/openstack/manifest b/openstack/manifest
index 1d2763d5..b260da2f 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -29,8 +29,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
@@ -40,9 +40,9 @@
 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
 0040755 0 0 /etc/nova
 0100644 0 0 /etc/nova/logging.conf
@@ -52,22 +52,21 @@
 0100644 0 0 /etc/nova/cells.json
 0100644 0 0 /etc/nova/api-paste.ini
 0100755 0 0 /usr/share/openstack/openstack-nova-setup
-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-serialproxy.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
 0040755 0 0 /var/lib/neutron
 0100644 0 0 /etc/neutron/neutron.conf
@@ -135,25 +134,25 @@
 0040755 0 0 /etc/neutron/plugins/vmware
 0100644 0 0 /etc/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
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 bac80b6b..bac80b6b 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 9ec3197a..9ec3197a 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 083cf701..083cf701 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 c8e816a5..c8e816a5 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 858e76e9..858e76e9 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 aa332251..aa332251 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-serialproxy.service b/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service
index 2557dc2b..2557dc2b 100644
--- a/openstack/etc/systemd/system/openstack-nova-serialproxy.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-serialproxy.service
diff --git a/openstack/etc/systemd/system/openstack-nova-setup.service b/openstack/usr/lib/systemd/system/openstack-nova-setup.service
index e7a9136f..e7a9136f 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-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 6f1a93a8..6f1a93a8 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 829c5848..829c5848 100644
--- a/openstack/etc/systemd/system/rabbitmq-server.service
+++ b/openstack/usr/lib/systemd/system/rabbitmq-server.service