From a42d83a2e927765c076e2b15a8edcb33cd1872d5 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Thu, 28 May 2015 15:06:23 +0300 Subject: [PATCH] Fix building rules for Neutron - Replace python-oslo- with python-oslo. - Removed ger-orig-source from rules Change-Id: I73c9b030ec6cc2573c552f84eab622347b773a60 Related-Bug: #1459494 Related-bug: #1461467 --- trusty/debian/changelog | 9 +++++ trusty/debian/control | 48 +++++++++++++------------- trusty/debian/neutron-l3-agent.upstart | 3 +- trusty/debian/pydist-overrides | 17 ++------- trusty/debian/rules | 20 +++++------ 5 files changed, 46 insertions(+), 51 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 0e54c2d64..6522cae88 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,12 @@ +neutron (1:2015.1.0-1~u14.04+mos3) mos7.0; urgency=medium + + * Fix python-oslo-* naming scheme + #LP 1459494 + * Remove ger-orig-source from rules + #LP 1461467 + + -- Sergey Kolekonov Thu, 28 May 2015 15:05:54 +0300 + neutron (1:2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium * Add python-neutron-fwaas as a dependency because L3 agent uses diff --git a/trusty/debian/control b/trusty/debian/control index e4dd99d3b..6f54a91a6 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -23,17 +23,17 @@ Build-Depends-Indep: python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.3.11), python-novaclient (>= 1:2.22.0), - python-oslo-concurrency (>= 1.8.0), - python-oslo-config (>= 1:1.9.3), - python-oslo-context (>= 0.2.0), - python-oslo-db (>= 1.7.0), - python-oslo-i18n (>= 1.5.0), - python-oslo-log (>= 1.0.0), - python-oslo-messaging (>= 1.8.0), - python-oslo-middleware (>= 1.0.0), - python-oslo-rootwrap (>= 1.6.0), - python-oslo-serialization (>= 1.4.0), - python-oslo-utils (>= 1.4.0), + python-oslo.concurrency (>= 1.8.0), + python-oslo.config (>= 1:1.9.3), + python-oslo.context (>= 0.2.0), + python-oslo.db (>= 1.7.0), + python-oslo.i18n (>= 1.5.0), + python-oslo.log (>= 1.0.0), + python-oslo.messaging (>= 1.8.0), + python-oslo.middleware (>= 1.0.0), + python-oslo.rootwrap (>= 1.6.0), + python-oslo.serialization (>= 1.4.0), + python-oslo.utils (>= 1.4.0), python-oslosphinx (>= 2.5.0), python-oslotest (>= 1.5.1), python-paste, @@ -87,7 +87,7 @@ Architecture: all Depends: adduser, python-neutron (= ${source:Version}), - python-neutron-fwaas, +# python-neutron-fwaas, ${misc:Depends}, ${python:Depends} Breaks: @@ -323,7 +323,7 @@ Depends: keepalived, neutron-common (= ${source:Version}), neutron-metadata-agent (= ${source:Version}), - python-neutron-fwaas, +# python-neutron-fwaas, radvd, ${misc:Depends}, ${python:Depends}, @@ -406,17 +406,17 @@ Depends: python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.3.11), python-novaclient (>= 1:2.22.0), - python-oslo-concurrency (>= 1.8.0), - python-oslo-config (>= 1:1.9.3), - python-oslo-context (>= 0.2.0), - python-oslo-db (>= 1.7.0), - python-oslo-i18n (>= 1.5.0), - python-oslo-log (>= 1.0.0), - python-oslo-messaging (>= 1.8.0), - python-oslo-middleware (>= 1.0.0), - python-oslo-rootwrap (>= 1.6.0), - python-oslo-serialization (>= 1.4.0), - python-oslo-utils (>= 1.4.0), + python-oslo.concurrency (>= 1.8.0), + python-oslo.config (>= 1:1.9.3), + python-oslo.context (>= 0.2.0), + python-oslo.db (>= 1.7.0), + python-oslo.i18n (>= 1.5.0), + python-oslo.log (>= 1.0.0), + python-oslo.messaging (>= 1.8.0), + python-oslo.middleware (>= 1.0.0), + python-oslo.rootwrap (>= 1.6.0), + python-oslo.serialization (>= 1.4.0), + python-oslo.utils (>= 1.4.0), python-paste, python-pastedeploy (>= 1.5.0), python-pbr (>= 0.10), diff --git a/trusty/debian/neutron-l3-agent.upstart b/trusty/debian/neutron-l3-agent.upstart index 0b69d1385..21cf49b64 100644 --- a/trusty/debian/neutron-l3-agent.upstart +++ b/trusty/debian/neutron-l3-agent.upstart @@ -21,4 +21,5 @@ end script exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \ --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini \ - --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log + --log-file=/var/log/neutron/l3-agent.log +# --config-file=/etc/neutron/fwaas_driver.ini diff --git a/trusty/debian/pydist-overrides b/trusty/debian/pydist-overrides index eca0d3b6b..9d009d294 100644 --- a/trusty/debian/pydist-overrides +++ b/trusty/debian/pydist-overrides @@ -1,16 +1,3 @@ -quantum_server quantum-server -quantum_common quantum-common +neutron_server neutron-server +neutron_common neutron-common setuptools-git -oslo.context python-oslo-context -oslo.concurrency python-oslo-concurrency -oslo.config python-oslo-config -oslo.messaging python-oslo-messaging -oslo.vmware python-oslo-vmware -oslo.utils python-oslo-utils -oslo.serialization python-oslo-serialization -oslo.db python-oslo-db -oslo.i18n python-oslo-i18n -oslo.utils python-oslo-utils -oslo.rootwrap python-oslo-rootwrap -oslo.log python-oslo-log -oslo.middleware python-oslo-middleware diff --git a/trusty/debian/rules b/trusty/debian/rules index 1bb4557a8..748eaad56 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -16,16 +16,14 @@ override_dh_installinit: override_dh_auto_clean: dh_clean -get-orig-source: - uscan --verbose --force-download --rename --destdir=../build-area - -ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - # 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 (,$(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 endif + -- 2.32.3