summaryrefslogtreecommitdiff
path: root/openstack/etc
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-26 18:27:25 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-08 18:29:27 +0100
commit1a29011ff2a43b2506c479b3edb959126f225443 (patch)
tree186dbd4805a9194d9d5d9166d3d1654769778f46 /openstack/etc
parent6ac945f70ff8a000087f0d7a54847a435cdff4ab (diff)
downloaddefinitions-1a29011ff2a43b2506c479b3edb959126f225443.tar.gz
keystone: Move setup scripts to Ansible.
Now keystone-setup also configures postgres and rabbitmq. This can be split in different setup scripts, but I think that rabbitmq, postgres, are likely to be in the controller node.
Diffstat (limited to 'openstack/etc')
-rw-r--r--openstack/etc/systemd/system/openstack-keystone-setup.service7
1 files changed, 4 insertions, 3 deletions
diff --git a/openstack/etc/systemd/system/openstack-keystone-setup.service b/openstack/etc/systemd/system/openstack-keystone-setup.service
index fb2793bb..9ea04c1d 100644
--- a/openstack/etc/systemd/system/openstack-keystone-setup.service
+++ b/openstack/etc/systemd/system/openstack-keystone-setup.service
@@ -1,11 +1,12 @@
[Unit]
-Description=Run openstack-keystone-setup (once)
+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/share/openstack/openstack-keystone-setup
-Restart=no
+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