Fixes related to WEBROOT

 * add manage.py collectstaic call in postinst
 * removed python-unittest2 from build-confilcts

Change-Id: Ieb71dc366f47b4fea2fe0d18aad9800b8b4f9c93

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 9f5e7fdc118afd7a3c31905a42ea5ddeaccb35ce..568a8c0a80db1312367aed132233266c9501661b 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+horizon (1:2015.1.0-1~u14.04+mos6) mos7.0; urgency=medium
+ 
+  * Removed python-unittest2 from build-conflicts
+  * Add manage.py collectstatic
+
+ -- Igor Yozhikov <iyozhikov@mirantis.com>  Thu, 4 Aug 2015 22:42:51 +0300
+
 horizon (1:2015.1.0-1~u14.04+mos5) mos7.0; urgency=medium
 
   [ Daniil Trishkin ]

diff --git a/trusty/debian/control b/trusty/debian/control
index f718e99f627e8655836d54a94f29deb4f6db9269..22aafc288253d08dac9d239d89f536b9cdd2aa7e 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -78,7 +78,6 @@ Build-Depends-Indep: gettext,
                      python-xstatic-term.js,
                      python-yaml,
 Build-Conflicts: python-rednose,
-                 python-unittest2,
 Standards-Version: 3.9.3
 Homepage: http://launchpad.net/horizon
 

diff --git a/trusty/debian/openstack-dashboard.postinst b/trusty/debian/openstack-dashboard.postinst
index 688c967c4750f069968d4c4562d2e7778fc68c33..d941c7169d290a5c864fc8699adb62411a46a9d8 100644 (file)
--- a/trusty/debian/openstack-dashboard.postinst
+++ b/trusty/debian/openstack-dashboard.postinst
@@ -45,7 +45,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        chown -R horizon /var/lib/openstack-dashboard/secret-key
        chmod 775 /var/lib/openstack-dashboard
 
-       /usr/share/openstack-dashboard/manage.py compress --force
+       /usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput && /usr/share/openstack-dashboard/manage.py compress --force
 
        A22_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
 
@@ -74,7 +74,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 fi
 
 if [ "$1" = "triggered" ] ; then
-       /usr/share/openstack-dashboard/manage.py compress --force
+       /usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput && /usr/share/openstack-dashboard/manage.py compress --force
 fi
 
 #DEBHELPER#