Enable nosdn-fdio scenarios for Fraser release

- Update neutron NSDriver patch
- Update os-net-config to fix config errors for vpp uio-driver
- Update puppet-tripleo to add configuration of physnets and type_driver
  in vpp agent
- Update THT to change VPP environment file for vpp-agent, and add common.yaml
  for vpp interface mapping
- Update VPP and networking-vpp version to 18.01
- Fix networking-vpp rpm build to enable proper uninstall.
- Update networking settings file to use ovs_bridge as default external interface type

JIRA: APEX-578
JIRA: APEX-568
JIRA: APEX-576
JIRA: APEX-577

apex-os-net-config: I915d5455acb8d496438b9c9e851639d3a43e6fa9
apex-puppet-tripleo: I472879b8f67e64b571638a0385943597a9120e6c
apex-tripleo-heat-templates: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4

Change-Id: I369bee232bfafef260d2ef19ac32614fdc487271
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 0cd3c6cef32adb1bf9d26414ed73bd9373b0c407)

1 files changed, 10 insertions, 3 deletions

diff --git a/build/rpm_specs/networking-vpp.spec b/build/rpm_specs/networking-vpp.spec
index 80687836..75466f94 100644
--- a/build/rpm_specs/networking-vpp.spec
+++ b/build/rpm_specs/networking-vpp.spec
@@ -2,7 +2,7 @@
 
 Summary:   OpenStack Networking for VPP
 Name:      python-networking-vpp
-Version:   17.07
+Version:   18.01
 Release:   %{release}%{?git}%{?dist}
 
 License:   Apache 2.0
@@ -12,7 +12,7 @@ Url:       https://github.com/openstack/networking-vpp/
 
 BuildArch: noarch
 AutoReq:   no
-Requires:  vpp
+Requires:  vpp python-jwt
 Vendor:    OpenStack <openstack-dev@lists.openstack.org>
 Packager:  Feng Pan <fpan@redhat.com>
 
@@ -27,7 +27,7 @@ Description=Networking VPP ML2 Agent
 
 [Service]
 ExecStartPre=/usr/bin/systemctl is-active vpp
-ExecStart=/usr/bin/vpp-agent --config-file /etc/neutron/plugins/ml2/vpp_agent.ini
+ExecStart=/usr/bin/vpp-agent --config-file /etc/neutron/plugins/ml2/vpp_agent.ini --log-file /var/log/neutron/vpp-agent.log
 Type=simple
 Restart=on-failure
 RestartSec=5s
@@ -37,6 +37,13 @@ WantedBy=multi-user.target
 
 EOF
 
+%preun
+%systemd_preun neutron-vpp-agent.service
+
+%postun
+%systemd_postun
+rm -rf %{python2_sitelib}/networking_vpp*
+
 %install
 python setup.py install -O1 --root=%{buildroot} --record=INSTALLED_FILES
 mkdir -p %{buildroot}%{_libdir}/systemd/system