summaryrefslogtreecommitdiff
path: root/openstack/usr/share
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-24 12:30:08 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-05 22:28:10 +0000
commit1c6b5196124208aab4258d43c6e12ca2135cd3a8 (patch)
treea32aea03e111c8e84a863fd9f255332d32efae60 /openstack/usr/share
parent00f34acda059c27215aa83dc7afe59752317831b (diff)
downloaddefinitions-1c6b5196124208aab4258d43c6e12ca2135cd3a8.tar.gz
Collect statics for horizon and move install commands to the chunk
Collecting the static files (css, js, png, ...) for horizon, compressing them and storing them in a folder accessible by horizon, fixes the problem when some css are not found and improves loading and navigating the pages.
Diffstat (limited to 'openstack/usr/share')
-rw-r--r--openstack/usr/share/openstack/openstack-horizon-setup27
1 files changed, 2 insertions, 25 deletions
diff --git a/openstack/usr/share/openstack/openstack-horizon-setup b/openstack/usr/share/openstack/openstack-horizon-setup
index c8b15125..af944477 100644
--- a/openstack/usr/share/openstack/openstack-horizon-setup
+++ b/openstack/usr/share/openstack/openstack-horizon-setup
@@ -22,39 +22,16 @@ if [ -f /var/openstack/horizon-setup ]; then
fi
# Create required system users and groups
-mkdir -p /var/lib/horizon
getent group horizon >/dev/null || groupadd -r --gid 167 horizon
getent passwd neutron >/dev/null || \
useradd --uid 167 -r -g horizon -d /var/lib/horizon -s /sbin/nologin \
-c "Horizon user" horizon
-# Work around to make django.wsgi working with horizon
-# See: https://bugs.launchpad.net/osprofiler/+bug/1361235
-# and: https://git.openstack.org/cgit/openstack/tripleo-image-elements/commit/?id=41c9a1dfad23f8aee366afb6a0b20a6c57ec8f79
-sed -i "s|'../..'|os.path.realpath('../..')|" \
- /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi
-
-# And link this django.wsgi file to the horizon home directory
-ln -sf /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi \
- /var/lib/horizon/django.wsgi
-
-# Link Openstack local_settings where openstack_dashboard is installed.
-ln -sf /etc/horizon/openstack_dashboard/local_settings.py \
- /usr/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
-
-# Create the static directory (STATIC_ROOT) used in local_settings.py to keep
-# the static objects like css files.
-mkdir -p /var/lib/horizon/openstack_dashboard/static
-
-# Create the horizon document root for apache configuration
-mkdir -p /var/lib/horizon/.blackhole
+chown -R horizon:horizon /var/lib/horizon
# Link horizon configuration file for apache to the directory where our apache load
# configurations files
-ln -sf /etc/horizon/apache-horizon.conf \
- /etc/httpd/conf.d/apache-horizon.conf
-
-chown -R horizon:horizon /var/lib/horizon
+ln -sf /etc/horizon/apache-horizon.conf /etc/httpd/conf.d/apache-horizon.conf
install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/horizon-setup
Horizon setup: success