diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-27 11:26:17 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-08 18:29:29 +0100 |
commit | 367614e9f1dcc5c136df6df758d6ac5e85258f5f (patch) | |
tree | d5babc97d8ed3dbf8b18a22d136e31fade7c0699 /openstack/etc/systemd/system | |
parent | e688fc66d9b310195d27736028c18af11dd16efc (diff) | |
download | definitions-367614e9f1dcc5c136df6df758d6ac5e85258f5f.tar.gz |
horizon: Move setup scripts to Ansible.
Now horizon-setup also configures Apache, given that they will be in
the same host. This can be split in different setup scripts.
Diffstat (limited to 'openstack/etc/systemd/system')
-rw-r--r-- | openstack/etc/systemd/system/apache-httpd.service | 3 | ||||
-rw-r--r-- | openstack/etc/systemd/system/openstack-horizon-setup.service | 6 |
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 |