summaryrefslogtreecommitdiff
path: root/openstack/manifest
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-04-24 15:29:41 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-04-24 18:06:18 +0100
commited3db26045041c2e5f25f7a60154740bd93cbd48 (patch)
treec278d32ceb54f555286c6c57b86e15b4ca251f7f /openstack/manifest
parent0f89f20d72ee11de35ad6c4471a1ce3071c57ad4 (diff)
downloaddefinitions-ed3db26045041c2e5f25f7a60154740bd93cbd48.tar.gz
Move postgres-server configuration out of keystone-setup
Otherwise postgres-server and keystone-setup services will initially fail, as keystone-setup needs a postgres-server running to succeed, but the postgres-server can only run after some configuration, which was previously being done by keystone-setup. Change-Id: I2d649d494cb54119e3b9bd3d9f6deb46bfb2dd12
Diffstat (limited to 'openstack/manifest')
-rw-r--r--openstack/manifest2
1 files changed, 2 insertions, 0 deletions
diff --git a/openstack/manifest b/openstack/manifest
index 4812c6c3..f4620f8e 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -120,6 +120,7 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0100644 0 0 /usr/share/openstack/nova/api-paste.ini
0100644 0 0 /usr/share/openstack/openvswitch.yml
0040755 0 0 /usr/share/openstack/postgres
+0100644 0 0 /usr/share/openstack/postgres.yml
0100644 0 0 /usr/share/openstack/postgres/pg_hba.conf
0100644 0 0 /usr/share/openstack/postgres/postgresql.conf
0040755 0 0 /usr/share/openstack/rabbitmq
@@ -177,6 +178,7 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0100644 0 0 /usr/lib/systemd/system/openvswitch-db-server.service
0100644 0 0 /usr/lib/systemd/system/openvswitch.service
0100644 0 0 /usr/lib/systemd/system/postgres-server.service
+0100644 0 0 /usr/lib/systemd/system/postgres-server-setup.service
0100644 0 0 /usr/share/openstack/swift-controller.yml
0100644 0 0 /usr/lib/systemd/system/swift-controller-setup.service
0100644 0 0 /usr/lib/systemd/system/swift-proxy.service