From: Sergey Kolekonov <skolekonov@mirantis.com>
Date: Tue, 19 May 2015 14:10:39 +0000 (+0300)
Subject: Add python-neutron-fwaas as a dependency
X-Git-Tag: mos-9.0~25
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9475ccc71fba95de7316c83c45ab913066e01a14;p=openstack-build%2Fneutron-build.git

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 af1f2fa85..0e54c2d64 100644
--- 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 a7dd8a8d0..e4dd99d3b 100644
--- 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 35dd41288..0b69d1385 100644
--- 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