Commit 8d769fc4 authored by Michal Arbet's avatar Michal Arbet

Merge branch 'debian/rocky' into 'debian/rocky'

Debian/rocky

See merge request !3
parents dee78fb1 79dd7585
neutron-vpnaas-dashboard (1.4.0-2) unstable; urgency=medium
* Redesign neutron-vpnaas-dashboard:
- Enabled files now in /etc/openstack-dashboard/
- Removed post scripts which is now achieved by a trigger
- Update copyright
-- Michal Arbet <michal.arbet@ultimum.io> Thu, 17 Jan 2019 18:55:56 +0100
neutron-vpnaas-dashboard (1.4.0-1) unstable; urgency=medium
* Initial release (Closes: #912558).
......
......@@ -12,7 +12,7 @@ Copyright: (c) 2012, Nebula, Inc.
License: Apache-2.0
Files: debian/*
Copyright: (c) 2018, Michal Arbet <michal.arbet@ultimum.io>
Copyright: (c) 2018-2019, Michal Arbet <michal.arbet@ultimum.io>
License: Apache-2.0
License: Apache-2.0
......
/usr/*
/etc/openstack-dashboard/*
#!/bin/sh
set -e
if [ "${1}" = "configure" ] ; then
/usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput
/usr/share/openstack-dashboard/manage.py compress --force
if [ -f /var/lib/openstack-dashboard/secret-key/.secret_key_store ]; then
rm /var/lib/openstack-dashboard/secret-key/.secret_key_store
fi
chown -R www-data /var/lib/openstack-dashboard/secret-key /var/lib/openstack-dashboard/static
fi
#DEBHELPER#
#!/bin/sh
set -e
if [ "$1" = "remove" ] || [ "$1" = "disappear" ] || [ "$1" = "purge" ] ; then
if [ -x /usr/share/openstack-dashboard/manage.py ] ; then
/usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput
/usr/share/openstack-dashboard/manage.py compress --force
if [ -f /var/lib/openstack-dashboard/secret-key/.secret_key_store ]; then
rm /var/lib/openstack-dashboard/secret-key/.secret_key_store
fi
chown -R www-data /var/lib/openstack-dashboard/secret-key /var/lib/openstack-dashboard/static
fi
fi
#DEBHELPER#
......@@ -5,19 +5,9 @@ include /usr/share/openstack-pkg-tools/pkgos.make
%:
dh $@ --buildsystem=python_distutils --with python3
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
for i in $(PYTHON3S) ; do \
PYTHON=python$$i NOSE_WITH_OPENSTACK=1 \
NOSE_OPENSTACK_COLOR=1 \
NOSE_OPENSTACK_RED=0.05 \
NOSE_OPENSTACK_YELLOW=0.025 \
NOSE_OPENSTACK_SHOW_ELAPSED=1 \
DJANGO_SETTINGS_MODULE=neutron_vpnaas_dashboard.test.settings \
python3 -m coverage run \
$(CURDIR)/manage.py test neutron_vpnaas_dashboard --settings=neutron_vpnaas_dashboard.test.settings ; \
done
endif
override_dh_clean:
dh_clean
rm -rf .coverage*
override_dh_auto_clean:
python3 setup.py clean
......@@ -25,29 +15,38 @@ override_dh_auto_clean:
override_dh_auto_build:
echo "Do nothing..."
override_dh_clean:
dh_clean -O--buildsystem=python_distutils
find . -name '*pyc' -delete
rm -f neutron_vpnaas_dashboard/test/.secret_key_store
rm -rf .coverage*
rm -rf build
rm -f AUTHORS ChangeLog
override_dh_auto_install:
echo "Do nothing..."
override_dh_install:
for i in $(PYTHON3S) ; do \
python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-neutron-vpnaas-dashboard ; \
python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp ; \
done
# Copy the dashboard static files on a webroot accessible path
mkdir -p $(CURDIR)/usr/share/openstack-dashboard/openstack_dashboard/dashboards/project
cp -auxf neutron_vpnaas_dashboard/dashboards/project/vpn $(CURDIR)/usr/share/openstack-dashboard/openstack_dashboard/dashboards/project
# Move config files to standard location
install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard/enabled
# Move config enabled
mv -f $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/neutron_vpnaas_dashboard/enabled/_[0-9]*.py $(CURDIR)/debian/tmp/etc/openstack-dashboard/enabled/
# Activates the neutron_vpnaas_dashboard plugin in Horizon
# ./neutron_vpnaas_dashboard/enabled/_*
mkdir -p $(CURDIR)/debian/python3-neutron-vpnaas-dashboard/usr/lib/python3/dist-packages/openstack_dashboard/enabled
cp -r $(CURDIR)/neutron_vpnaas_dashboard/enabled/_*.py $(CURDIR)/debian/python3-neutron-vpnaas-dashboard/usr/lib/python3/dist-packages/openstack_dashboard/enabled
rm -f $(CURDIR)/debian/python3-neutron-vpnaas-dashboard/usr/lib/python3/dist-packages/openstack_dashboard/enabled/__init__.py
# Remove configs from /usr/lib/python3/dist-packages
rm -rf $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/neutron_vpnaas_dashboard/enabled
mkdir -p $(CURDIR)/debian/python3-neutron-vpnaas-dashboard/usr/share/openstack-dashboard/openstack_dashboard/enabled
cp -r $(CURDIR)/neutron_vpnaas_dashboard/enabled/_*.py $(CURDIR)/debian/python3-neutron-vpnaas-dashboard/usr/share/openstack-dashboard/openstack_dashboard/enabled
rm -f $(CURDIR)/debian/python3-neutron-vpnaas-dashboard/usr/share/openstack-dashboard/openstack_dashboard/enabled/__init__.py
dh_install
dh_missing --fail-missing
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
for i in $(PYTHON3S) ; do \
PYTHON=python$$i NOSE_WITH_OPENSTACK=1 \
NOSE_OPENSTACK_COLOR=1 \
NOSE_OPENSTACK_RED=0.05 \
NOSE_OPENSTACK_YELLOW=0.025 \
NOSE_OPENSTACK_SHOW_ELAPSED=1 \
DJANGO_SETTINGS_MODULE=neutron_vpnaas_dashboard.test.settings \
python3 -m coverage run \
$(CURDIR)/manage.py test neutron_vpnaas_dashboard --settings=neutron_vpnaas_dashboard.test.settings ; \
done
## Delete __pycache__
find . -name __pycache__ -prune -exec rm -rf {} +;
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment