From fe422c395e0819f11a0341ebba3250228e9f99b5 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 21 May 2015 14:44:07 +0000
Subject: Horizon: Install the openstack_dashboard django project in
 /var/lib/horizon

With this patch we avoid some problems:
- Horizon trying to write in /usr/lib/python2.7/site-packages/static
- We won't have to maintain a copy of local_settings.py
- The workaround of creating a symlink for django.wsgi is not needed
  now.

This patch also changes apache-horizon.conf to
- Change the path of django.wsgi file
- Load the horizon server with the url 'http://<IP-of-OpenStack>' (the
  'horizon/' suffix is removed)
- Grant permissions to access to /var/lib/horizon/static

Also changes 'tempest.conf' to change Horizon urls.
---
 strata/openstack-services/horizon.morph | 66 +++++++++++++++++----------------
 1 file changed, 35 insertions(+), 31 deletions(-)

(limited to 'strata')

diff --git a/strata/openstack-services/horizon.morph b/strata/openstack-services/horizon.morph
index ae6399b1..74930a1e 100644
--- a/strata/openstack-services/horizon.morph
+++ b/strata/openstack-services/horizon.morph
@@ -4,16 +4,12 @@ configure-commands:
 # Remove unnecessary .mo files they will be generated
 # later during package build.
 - find . -name "django*.mo" -exec rm -f '{}' \;
-# Set COMPRESS_OFFLINE=True
-- |
-  sed -i 's:COMPRESS_OFFLINE.=.False:COMPRESS_OFFLINE = True:' \
-         openstack_dashboard/settings.py
 build-commands:
 # Compile message strings
-- cd horizon && django-admin.py compilemessages && cd ..
-- cd openstack_dashboard && django-admin.py compilemessages && cd ..
+- cd horizon && django-admin.py compilemessages
+- cd openstack_dashboard && django-admin.py compilemessages
 - python setup.py build
-post-build-commands:
+
 # Use the local_settings.py example to compile and compress the css, js, etc files.
 # This is a hack to make SECRET_KEY work.
 - |
@@ -23,37 +19,45 @@ post-build-commands:
 - python manage.py collectstatic --noinput
 - python manage.py compress --force
 install-commands:
-# Undo hack
+# Install horizon in a temporary folder first, and then move things to the
+# right place in $DESTDIR
+- mkdir temproot
+- python setup.py install -O1 --skip-build --prefix "$PREFIX" --root temproot
+# Remove unnecessary .po files
+- find temproot -name django.po -exec rm '{}' \;
+- find temproot -name djangojs.po -exec rm '{}' \;
+
+# Move openstack_dashboard to /var/lib/horizon
+- mkdir -p "$DESTDIR"/var/lib/horizon/
+- |
+  mv temproot/"$PREFIX"/lib/python*/site-packages/openstack_dashboard \
+      "$DESTDIR"/var/lib/horizon/
+- cp manage.py "$DESTDIR"/var/lib/horizon/openstack_dashboard/
+
+# Copy the rest to $DESTDIR
+- cp -a temproot/* "$DESTDIR"
+
+# Copy local_settings to /etc/horizon/openstack_dashboard, so that they
+# can be modified, and link them where openstack_dashboard is installed.
+- mkdir -p "$DESTDIR"/etc/horizon/openstack_dashboard/
 - |
   cp openstack_dashboard/local/local_settings.py.example \
-     openstack_dashboard/local/local_settings.py
-# Install horizon
-- python setup.py install -O1 --skip-build --prefix "$PREFIX" --root "$DESTDIR"
-post-install-commands:
-# Remove unnecessary .po files
-- find "$DESTDIR" -name django.po -exec rm '{}' \;
-- find "$DESTDIR" -name djangojs.po -exec rm '{}' \;
-# Link Openstack local_settings where openstack_dashboard is installed.
+      "$DESTDIR"/etc/horizon/openstack_dashboard/local_settings.py
+# Set COMPRESS_OFFLINE=True
+- |
+  echo "COMPRESS_OFFLINE=True" >> \
+    "$DESTDIR"/etc/horizon/openstack_dashboard/local_settings.py
+
 - mkdir -p "$DESTDIR"/var/lib/horizon/openstack_dashboard/local
 - |
   ln -sf /etc/horizon/openstack_dashboard/local_settings.py \
-         "$DESTDIR$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
+         "$DESTDIR"/var/lib/horizon/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 "$DESTDIR"/var/lib/horizon/openstack_dashboard/static
+- mkdir -p "$DESTDIR"/var/lib/horizon/static
 # Copy the compressed static files to horizon.
-- cp -a openstack_dashboard/static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static
-- cp -a horizon/static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static
-- cp -a static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static
-# 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('../..')|" \
-      "$DESTDIR$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi
-# And link this django.wsgi file to the horizon home directory
-- |
-  ln -sf "$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi \
-         "$DESTDIR"/var/lib/horizon/openstack_dashboard/django.wsgi
+- cp -a static/* "$DESTDIR"/var/lib/horizon/static
+
 # Create the horizon document root for apache configuration
 - mkdir -p "$DESTDIR"/var/lib/horizon/.blackhole
-- 
cgit v1.2.1