From ddde5298a45e7617f353b25909c92ae6ba7a55b4 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Tue, 16 Feb 2016 19:49:42 +0200 Subject: [PATCH] Update Horizon package [MOS 9.0] * d/openstack-dashboard-apache.postinst: Disable all non-default sites in non-interactive mode. Change-Id: I834dded23958bcb6cfe7afd95bb701fa94f6753c --- tests/runtests.sh | 4 +++- trusty/debian/changelog | 7 +++++++ trusty/debian/openstack-dashboard-apache.postinst | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/runtests.sh b/tests/runtests.sh index 640c7f7..689f271 100755 --- 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 'Login - OpenStack Dashboard' + # Disabled due to changes in postinstall scripts. + #curl http://127.0.0.1/horizon/auth/login/ 2>&1 | grep 'Login - OpenStack Dashboard' + echo 'Enable sites manually.' elif [ "$DISTR" = "CentOS" ]; then curl http://127.0.0.1/dashboard/auth/login/ 2>&1 | grep 'Login - OpenStack Dashboard' else diff --git a/trusty/debian/changelog b/trusty/debian/changelog index ccb666b..d6e1eff 100644 --- 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 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 3fa81e0..691e007 100644 --- 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 -- 2.45.2