Fix building rules for Neutron

- Replace python-oslo-<lib> with python-oslo.<lib>
- Removed ger-orig-source from rules

Change-Id: I73c9b030ec6cc2573c552f84eab622347b773a60
Related-Bug: #1459494
Related-bug: #1461467

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 0e54c2d64a03448b87e386b90356eab5e341aad0..6522cae88f1a7179b02f0e0bf6accdf83171a150 100644 (file)
--- 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 <skolekonov@mirantis.com>  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 e4dd99d3bfb492a2f32b31ce12e54973a2df8e78..6f54a91a6a2b6ee3c618c4da01670a388576d833 100644 (file)
--- 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 0b69d138543fb4f16315c48901379084464784fd..21cf49b64f2c382ee7f99c8ef2c101886774c264 100644 (file)
--- 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 eca0d3b6b40a962b0d0ab2e129c3cea2b440f87e..9d009d2946a701912db10ed8922240dfaf5a1d6f 100644 (file)
--- 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 1bb4557a8156f0e7182420e028cc41d363655548..748eaad56f19aeb7dadeee14f866506128ea2d19 100755 (executable)
--- 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
+