From d6dcf704fe8c47ce423c361f89b7c745417b0a14 Mon Sep 17 00:00:00 2001
From: Sergey Kolekonov <skolekonov@mirantis.com>
Date: Wed, 3 Jun 2015 21:51:54 +0300
Subject: [PATCH] Add python-neutron-fwaas as a dependency

python-neutron-fwaas was removed to avoid cross-dependency conflict when
Neutron packages were updated according to the latest oslo packages naming
policy. Adding python-neutron-fwaas back as a dependency

Change-Id: I407c6cb77850786307cc9055c7a0730bfdad8a9c
---
 trusty/debian/changelog                | 8 ++++++++
 trusty/debian/control                  | 4 ++--
 trusty/debian/neutron-l3-agent.upstart | 3 +--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 6522cae88..2b0d5bded 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,11 @@
+neutron (1:2015.1.0-1~u14.04+mos4) mos7.0; urgency=medium
+
+  * python-neutron-fwaas was removed to avoid cross-dependency conflict when
+    Neutron packages were updated according to the latest oslo packages naming
+    policy. Adding python-neutron-fwaas back as a dependency
+
+ -- Sergey Kolekonov <skolekonov@mirantis.com>  Wed, 03 Jun 2015 21:54:31 +0300
+
 neutron (1:2015.1.0-1~u14.04+mos3) mos7.0; urgency=medium
 
   * Fix python-oslo-* naming scheme
diff --git a/trusty/debian/control b/trusty/debian/control
index 6f54a91a6..428a24443 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 21cf49b64..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
+  --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log
-- 
2.32.3