diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-13 16:10:39 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-14 12:14:38 +0000 |
| commit | e0eb80156f963558e2e60f03cec7a9ed3425c393 (patch) | |
| tree | b1ea2a0ddf593f2b488b1f7293bf11546bb800c1 /openstack/etc/systemd/system | |
| parent | 5a2e33684cdd86174e3b5d969507164a67285ba6 (diff) | |
| download | definitions-e0eb80156f963558e2e60f03cec7a9ed3425c393.tar.gz | |
Horizon to Ansible
Diffstat (limited to 'openstack/etc/systemd/system')
3 files changed, 3 insertions, 17 deletions
diff --git a/openstack/etc/systemd/system/apache-httpd-server-setup.service b/openstack/etc/systemd/system/apache-httpd-server-setup.service deleted file mode 100644 index 17fa301b..00000000 --- a/openstack/etc/systemd/system/apache-httpd-server-setup.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Run apache-httpd-server-setup (once) -After=local-fs.target - -[Service] -Type=oneshot -ExecStart=/usr/share/openstack/apache-httpd-server-setup -Restart=no - -[Install] -WantedBy=multi-user.target 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 |