X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;fp=trusty%2Fdebian%2Frules;h=4eb03b658b72a2a714ff3ba28126d018d3627a7e;hb=33f494780fed13daabda23be6ceef83210e1d403;hp=3712a678badabdc0f9c7667d7eba8a031c00c2a3;hpb=54c2ba6a6661f3214775d91c5755c37c685574a4;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 3712a678b..4eb03b658 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -1,32 +1,78 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/openstack-pkg-tools/pkgos.make
+export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/')
+
+PYTHONS:=$(shell pyversions -vr)
 
 %:
-	dh $@  --with python2,sphinxdoc
+	dh $@ --buildsystem=python_distutils --with python2,systemd,sphinxdoc
+
+override_dh_auto_install:
+	echo "Nothing to do!"
+#	dh_auto_install
+#	find . -type d -name tests | xargs rm -fr
+#	for i in neutron/db/migration/alembic_migrations/versions/*.py ; do \
+#		install -D -m 0664 $$i debian/tmp/usr/lib/python2.6/dist-packages/$$i ; \
+#		install -D -m 0664 $$i debian/tmp/usr/lib/python2.7/dist-packages/$$i ; \
+#	done
 
 override_dh_install:
-	dh_install --fail-missing -X/usr/etc -X/usr/bin/neutron-hyperv-agent
+	set -e ; for pyvers in $(PYTHONS) ; do \
+		python$$pyvers setup.py install --install-layout=deb --root=$(CURDIR)/debian/neutron-common ; \
+		python$$pyvers setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp ; \
+		mkdir -p $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \
+		cp -auxf neutron $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \
+	done
+	dh_install -O--buildsystem=python_distutils --fail-missing -X/usr/etc -X/usr/bin
+	rm -rf $(CURDIR)/debian/neutron-common/usr/lib
+	rm -rf $(CURDIR)/debian/neutron-common/usr/bin/quantum*
+	rm -rf $(CURDIR)/debian/neutron-common/usr/etc
+
+	install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini		$(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
+
+	install -D -m 0640 etc/metadata_agent.ini					$(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini
+	sed -i -e 's|^# nova_metadata_ip = 127.0.0.1|nova_metadata_ip = 127.0.0.1|'	$(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini
 
-override_dh_installinit:
-	dh_installinit
-	dh_installinit -pneutron-plugin-openvswitch-agent --no-start --name=neutron-ovs-cleanup
+	# Move the OVS config file, since we use debconf for it
+	rm $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/openvswitch_agent.ini
+	install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
 
 override_dh_auto_clean:
+	dh_auto_clean
+	rm -f neutron/vcsversion.py
+	find . -type f -name "*.pyc" | xargs rm -fr
+	rm -rf build neutron.egg-info
+	rm -rf setuptools_git-*-py*.egg/
+	rm -f debian/neutron-common.config \
+		debian/neutron-common.postinst \
+		debian/neutron-server.config \
+		debian/neutron-server.postinst \
+		debian/neutron-dhcp-agent.postinst \
+		debian/neutron-metadata-agent.config \
+		debian/neutron-metadata-agent.postinst
+	rm -f debian/*.init debian/*.service debian/*.upstart
+
+override_dh_clean:
 	dh_clean
+	find . -type f -name "*.pyc" -delete
 
 override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-       # Unpatch quantum configuration to fixup tests which conflict
-       # with a core_plugin being set.
-       patch -p1 -R < debian/patches/fix-neutron-configuration.patch
-       # Set a reasonable level of concurrency
-       ./run_tests.sh -N -P --concurrency=4
-       # Patch configuration file after testing
-       patch -p1 < debian/patches/fix-neutron-configuration.patch
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=build/* ./run_tests.sh -N -P || true
 endif
 
+override_dh_auto_build:
+	dh_auto_build -O--buildsystem=python_distutils
+
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-common.config
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-common.postinst
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-server.config
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-server.postinst
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-dhcp-agent.postinst
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-metadata-agent.postinst
+	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-metadata-agent.config
+
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	 python setup.py build_sphinx