Update Horizon package [MOS 9.0]

* d/openstack-dashboard-apache.postinst: Disable all non-default sites in
    non-interactive mode.

Change-Id: I834dded23958bcb6cfe7afd95bb701fa94f6753c

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 640c7f7e7b8863a8499e65bfa9550bf7aa0bc8ef..689f271b3110d374b211b38f9631c08b2f23b59f 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -31,7 +31,9 @@ case $1 in
 
       service $apache restart
       if [ "$DISTR" = "Ubuntu" ] || [ "$DISTR" = "Debian" ] ; then
-       curl http://127.0.0.1/horizon/auth/login/ 2>&1 | grep '<title>Login - OpenStack Dashboard</title>'
+        # Disabled due to changes in postinstall scripts.
+       #curl http://127.0.0.1/horizon/auth/login/ 2>&1 | grep '<title>Login - OpenStack Dashboard</title>'
+        echo 'Enable sites manually.'
       elif [ "$DISTR" = "CentOS" ]; then
        curl http://127.0.0.1/dashboard/auth/login/ 2>&1 | grep '<title>Login - OpenStack Dashboard</title>'
       else

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index ccb666be2aa37fa0cfda82d61fd104455204bd0a..d6e1efff822a67678012d8214e7c704ba38a7793 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+horizon (2:9.0.0~b2-2~u14.04+mos1) mos9.0; urgency=medium
+
+  * d/openstack-dashboard-apache.postinst: Disable all non-default sites in
+      non-interactive mode.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Tue, 16 Feb 2016 19:47:41 +0200
+
 horizon (2:9.0.0~b2-1~u14.04+mos1) mos9.0; urgency=medium
 
   * Source: https://anonscm.debian.org/git/openstack/horizon.git

diff --git a/trusty/debian/openstack-dashboard-apache.postinst b/trusty/debian/openstack-dashboard-apache.postinst
index 3fa81e067dd5910e12840445998fc7ea5ccaccfd..691e0077b3e9ecbabc6c4023834a46e2fc17c7c2 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.postinst
+++ b/trusty/debian/openstack-dashboard-apache.postinst
@@ -71,7 +71,7 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache
                a2dissite openstack-dashboard.conf
                a2dissite openstack-dashboard-ssl-redirect.conf
                a2dissite openstack-dashboard-ssl.conf
-               a2ensite openstack-dashboard-alias-only.conf
+               a2dissite openstack-dashboard-alias-only.conf
                if [ -d '/usr/share/openstack-dashboard/static' ] ; then
                        rm -rf /usr/share/openstack-dashboard/static
                fi