Commit 2ada31db authored by Thomas Goirand's avatar Thomas Goirand

- Revert "Switched package to Python 3."

- Fixed ceilometer-api UWSGI startup.

This reverts commit cc36b00a.
parent 2fa54598
......@@ -15,4 +15,8 @@
DESC="OpenStack Ceilometer API"
PROJECT_NAME=ceilometer
NAME=${PROJECT_NAME}-api
DAEMON_ARGS="--port 8777 --"
DAEMON=/usr/bin/uwsgi_python
DAEMON_ARGS="--master --paste-logger --processes 4 --die-on-term --logto /var/log/ceilometer/ceilometer-api.log --http-socket :8777 --wsgi-file /usr/bin/ceilometer-api"
NO_OPENSTACK_CONFIG_FILE_DAEMON_ARG=yes
NO_OPENSTACK_LOGFILE_DAEMON_ARG=yes
USE_SYSLOG=no
ceilometer (1:9.0.1-3) unstable; urgency=medium
[ Thomas Goirand ]
* Switched package to Python 3.
* Fixed ceilometer-api UWSGI startup.
[ David Rabel ]
* Update fr.po (Closes: #885588).
......
This diff is collapsed.
......@@ -4,7 +4,7 @@ export HOME="$(CURDIR)/debian/test"
include /usr/share/openstack-pkg-tools/pkgos.make
%:
dh $@ --with python3,systemd,sphinxdoc
dh $@ --with python2,systemd,sphinxdoc
override_dh_clean:
dh_clean
......@@ -16,14 +16,14 @@ override_dh_auto_install:
override_dh_install:
rm -rf $(CURDIR)/debian/tmp
python3 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
python2.7 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/usr/etc
dh_install --fail-missing
# Manage ceilometer.conf
mkdir -p $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages oslo-config-generator \
PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
--output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
--wrap-width 140 \
--namespace ceilometer \
......@@ -43,13 +43,14 @@ override_dh_install:
sed -i 's|#connection[ \t]*=.*|connection=mongodb://localhost:27017/ceilometer|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
override_dh_auto_build:
dh_auto_build
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.config
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.postinst
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-api.config
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-api.postinst
override_dh_auto_clean:
python3 setup.py clean -a
dh_auto_clean
rm -rf .testrepository
find . -iname '*.pyc' -delete
rm -f debian/*.init debian/*.service debian/*.upstart
......@@ -57,13 +58,13 @@ override_dh_auto_clean:
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
rm -rf .testrepository
testr-python3 init
testr init
set -e ; \
TEMP_REZ=`mktemp -t` ; \
PYTHON=python3 bash -x ./debian/setup-test-env-mongodb.sh testr-python3 run --subunit --parallel 'tests\.(?!(.*test_bin.*|.*functional.*|.*gabbi\.test_gabbi_prefix.*|.*meter\.test_notifications\.TestMeterProcessing\.test_fallback_meter_path.*|.*agent\.test_manager\.TestRunTasks\.test_batching_polled_samples_false.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
bash -x ./debian/setup-test-env-mongodb.sh testr run --subunit --parallel 'tests\.(?!(.*test_bin.*|.*functional.*|.*gabbi\.test_gabbi_prefix.*|.*meter\.test_notifications\.TestMeterProcessing\.test_fallback_meter_path.*|.*agent\.test_manager\.TestRunTasks\.test_batching_polled_samples_false.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
rm -f $$TEMP_REZ ;
testr-python3 slowest
testr slowest
endif
override_dh_sphinxdoc:
......
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