summaryrefslogtreecommitdiff
path: root/openstack/etc/systemd/system
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-10 14:36:42 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-12 19:36:53 +0000
commitfe9f5fc1bc51e67d4cfe43786e1169861f50d77a (patch)
tree4bc8b7d115a5eb855e00740462fe81cad38d26b7 /openstack/etc/systemd/system
parentb553b60b634bce351006cbdc03af8c590732dc2d (diff)
downloaddefinitions-fe9f5fc1bc51e67d4cfe43786e1169861f50d77a.tar.gz
Install postgres and rabbitmq in keystone.yml
Diffstat (limited to 'openstack/etc/systemd/system')
-rw-r--r--openstack/etc/systemd/system/openstack-rabbitmq-setup.service12
-rw-r--r--openstack/etc/systemd/system/postgres-server.service2
-rw-r--r--openstack/etc/systemd/system/postgres-setup.service11
-rw-r--r--openstack/etc/systemd/system/rabbitmq-server.service (renamed from openstack/etc/systemd/system/openstack-rabbitmq-server.service)3
4 files changed, 1 insertions, 27 deletions
diff --git a/openstack/etc/systemd/system/openstack-rabbitmq-setup.service b/openstack/etc/systemd/system/openstack-rabbitmq-setup.service
deleted file mode 100644
index 85257fd1..00000000
--- a/openstack/etc/systemd/system/openstack-rabbitmq-setup.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Run openstack-rabbitmq-setup (once)
-Requires=local-fs.target
-After=local-fs.target network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/openstack-rabbitmq-setup
-Restart=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/postgres-server.service b/openstack/etc/systemd/system/postgres-server.service
index 6ee25e98..42e88042 100644
--- a/openstack/etc/systemd/system/postgres-server.service
+++ b/openstack/etc/systemd/system/postgres-server.service
@@ -1,7 +1,5 @@
[Unit]
Description=PostgreSQL database server
-Requires=postgres-setup.service
-After=postgres-setup.service
[Service]
Type=forking
diff --git a/openstack/etc/systemd/system/postgres-setup.service b/openstack/etc/systemd/system/postgres-setup.service
deleted file mode 100644
index 281d0d77..00000000
--- a/openstack/etc/systemd/system/postgres-setup.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Run postgres-setup (once)
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/postgres-setup
-Restart=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/openstack-rabbitmq-server.service b/openstack/etc/systemd/system/rabbitmq-server.service
index 91bd6fa7..f0d60f51 100644
--- a/openstack/etc/systemd/system/openstack-rabbitmq-server.service
+++ b/openstack/etc/systemd/system/rabbitmq-server.service
@@ -1,7 +1,6 @@
[Unit]
Description=RabbitMQ broker
-After=syslog.target network.target openstack-rabbitmq-setup.service
-Requires=openstack-rabbitmq-setup.service
+After=syslog.target network.target
[Service]
Type=notify