Add python-neutron-fwaas as a dependency

Add python-neutron-fwaas as a dependency because L3 agent uses fwaas_driver.ini
configuration file which is distributed with python-neutron-fwaas since Kilo

Change-Id: I7a87399f56a0cf2f42a53cadefe4fce8f28f6bcb

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index af1f2fa85e18267fa438504c0f6f1fa8159253ef..0e54c2d64a03448b87e386b90356eab5e341aad0 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,11 @@
+neutron (1:2015.1.0-1~u14.04+mos2) mos7.0; urgency=medium
+
+  * Add python-neutron-fwaas as a dependency because L3 agent uses
+    fwaas_driver.ini configuration file which is distributed with
+    python-neutron-fwaas since Kilo
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Tue, 19 May 2015 17:00:12 +0300
+
 neutron (1:2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium
 
   * Updated specs for master

diff --git a/trusty/debian/control b/trusty/debian/control
index a7dd8a8d07d909df4f60814b7183cad9b11ce56d..e4dd99d3bfb492a2f32b31ce12e54973a2df8e78 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -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},

diff --git a/trusty/debian/neutron-l3-agent.upstart b/trusty/debian/neutron-l3-agent.upstart
index 35dd412883850d2428d3af2011e3cf4e1bac2aec..0b69d138543fb4f16315c48901379084464784fd 100644 (file)
--- a/trusty/debian/neutron-l3-agent.upstart
+++ b/trusty/debian/neutron-l3-agent.upstart
@@ -21,5 +21,4 @@ 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 \
-  --log-file=/var/log/neutron/l3-agent.log
-#  --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log
+  --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log