summaryrefslogtreecommitdiff
path: root/openstack/etc/systemd/system
diff options
context:
space:
mode:
Diffstat (limited to 'openstack/etc/systemd/system')
-rw-r--r--openstack/etc/systemd/system/apache-httpd.service3
-rw-r--r--openstack/etc/systemd/system/openstack-horizon-setup.service6
2 files changed, 3 insertions, 6 deletions
diff --git a/openstack/etc/systemd/system/apache-httpd.service b/openstack/etc/systemd/system/apache-httpd.service
index 01627e02..f1211ac9 100644
--- a/openstack/etc/systemd/system/apache-httpd.service
+++ b/openstack/etc/systemd/system/apache-httpd.service
@@ -1,7 +1,6 @@
[Unit]
Description=Apache Web Server
-Requires=apache-httpd-server-setup.service openstack-horizon-setup.service
-After=network.target remote-fs.target nss-lookup.target apache-httpd-server-setup.service openstack-horizon-setup.service
+After=network.target remote-fs.target nss-lookup.target
[Service]
Type=forking
diff --git a/openstack/etc/systemd/system/openstack-horizon-setup.service b/openstack/etc/systemd/system/openstack-horizon-setup.service
index 082ec372..9805a38f 100644
--- a/openstack/etc/systemd/system/openstack-horizon-setup.service
+++ b/openstack/etc/systemd/system/openstack-horizon-setup.service
@@ -1,11 +1,9 @@
[Unit]
-Description=Run openstack-horizon-setup (once)
+Description=Run horizon-setup Ansible scripts
After=local-fs.target
[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/openstack-horizon-setup
-Restart=no
+ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/horizon.yml
[Install]
WantedBy=multi-user.target