Update Horizon package

Fix some issues with Horizon package

Closes-Bug: #1470143

Change-Id: I6095cca7607328238b0f2d67f8c14acc5d933a0b

diff --git a/.gitreview b/.gitreview
index 4b68e8430ecd05e5b25f718fd9e0115af4fabf43..85f9267dff2268b4be1c046ef7104867201a965c 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,6 +2,6 @@
 host=review.fuel-infra.org
 port=29418
 project=openstack-build/horizon-build
-defaultbranch=master
+defaultbranch=openstack-ci/fuel-7.0/2015.1.0
 
 

diff --git a/trusty/debian/openstack-dashboard.conf b/trusty/debian/openstack-dashboard.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/trusty/debian/openstack-dashboard.links b/trusty/debian/openstack-dashboard.links
index c5ba66556b6a0a08a6980712dbf253a034daed20..8cee2f49dc3f431704601f4936c855806eaa509e 100644 (file)
--- a/trusty/debian/openstack-dashboard.links
+++ b/trusty/debian/openstack-dashboard.links
@@ -1,6 +1,5 @@
-/usr/bin/lessc /usr/share/openstack-dashboard/bin/less/lessc
-/usr/share/openstack-dashboard/openstack_dashboard/static /usr/share/openstack-dashboard/static
-/var/lib/openstack-dashboard/static/scss       /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss
 /var/lib/openstack-dashboard/static/css                /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css
+/var/lib/openstack-dashboard/static/css                /usr/share/openstack-dashboard/static/dashboard/css
 /var/lib/openstack-dashboard/static/js         /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js
-/usr/share/fonts-font-awesome/fonts         /usr/share/pyshared/horizon/static/horizon/lib/font-awesome/fonts
+/var/lib/openstack-dashboard/static/js         /usr/share/openstack-dashboard/static/dashboard/js
+/usr/bin/lessc /usr/share/openstack-dashboard/bin/less/lessc

diff --git a/trusty/debian/openstack-dashboard.postinst b/trusty/debian/openstack-dashboard.postinst
index a7f47367549dfce3886bbb94ddadb998bf635725..688c967c4750f069968d4c4562d2e7778fc68c33 100644 (file)
--- a/trusty/debian/openstack-dashboard.postinst
+++ b/trusty/debian/openstack-dashboard.postinst
@@ -40,9 +40,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        mkdir -p /var/lib/openstack-dashboard/static/js
        mkdir -p /var/lib/openstack-dashboard/static/css
        mkdir -p /var/lib/openstack-dashboard/secret-key
-       chown horizon:horizon /var/lib/openstack-dashboard/static
-       chown horizon:horizon /var/lib/openstack-dashboard/static/css
-       chown horizon:horizon /var/lib/openstack-dashboard/static/js
+       chown -R horizon:horizon /var/lib/openstack-dashboard/static
        chown horizon:horizon /var/lib/openstack-dashboard/secret-key
        chown -R horizon /var/lib/openstack-dashboard/secret-key
        chmod 775 /var/lib/openstack-dashboard
@@ -70,11 +68,9 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        fi
        if [ -f /etc/openstack-dashboard/secret_key ] && [ ! -f /var/lib/openstack-dashboard/secret_key ] ; then
                ln -s /etc/openstack-dashboard/secret_key /var/lib/openstack-dashboard/secret_key
-               chown  horizon:horizon /var/lib/openstack-dashboard/secret_key
+               chown horizon:horizon /var/lib/openstack-dashboard/secret_key
        fi
        chown -R horizon:horizon /var/lib/openstack-dashboard
-       mkdir -p /usr/lib/python2.7/dist-packages/horizon/static/horizon/lib/font-awesome
-       ln -s /usr/share/fonts-font-awesome/font /usr/lib/python2.7/dist-packages/horizon/static/horizon/lib/font-awesome/fonts || true
 fi
 
 if [ "$1" = "triggered" ] ; then

diff --git a/trusty/debian/rules b/trusty/debian/rules
index c72ffd1af8b7d259a9352ce53b3f307f59deaa2f..ff4becdbee2b6c0271d5bf9f6028325a977572ea 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -36,8 +36,6 @@ override_dh_auto_install:
        install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf-available
 
        cp -a $(CURDIR)/openstack_dashboard/ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
-       install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard
-       cp -a $(CURDIR)/openstack_dashboard/settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
 
        cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example \
                $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
@@ -63,10 +61,11 @@ override_dh_auto_install:
        ln -fs /usr/lib/$(PYVER)/dist-packages/horizon/static/horizon \
                $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/horizon
 
+        # Link to awesome fonts
+       install -d -m 755 $(CURDIR)/debian/tmp/usr/lib/$(PYVER)/dist-packages/horizon/static/horizon/lib/font-awesome
+       ln -fs /usr/share/fonts-font-awesome/fonts $(CURDIR)/debian/tmp/usr/lib/$(PYVER)/dist-packages/horizon/static/horizon/lib/font-awesome/fonts
+
 override_dh_link:
-       mkdir -p $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static/scss
-       mv $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss/* $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static/scss
-       rm -rf $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss
        rm -rf $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js
        rm -rf $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css
        rm -rf $(CURDIR)/debian/openstack-dashboard/usr/share/pyshared/horizon/static/horizon/lib/font-awesome/fonts