From bda43eaa480f74de52ea90156000cb823743296a Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hpe.com>
Date: Thu, 15 Sep 2016 13:20:43 -0400
Subject: [PATCH] Copy new dhcp.filters into place for newton

On upgrading from mitaka, dhcp.filters needs an upgrade
due to a recent neutron change in the newton release. See
[1,2] for more details.

[1] https://review.openstack.org/301747
[2] https://review.openstack.org/364131

Partial-bug: #1622002
Change-Id: Id36552fde5bbfdf57df8e9c57ffcd3b678cbc748
---
 projects/50_neutron/from-mitaka/upgrade-neutron | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 projects/50_neutron/from-mitaka/upgrade-neutron

diff --git a/projects/50_neutron/from-mitaka/upgrade-neutron b/projects/50_neutron/from-mitaka/upgrade-neutron
new file mode 100644
index 00000000..9cebb4e3
--- /dev/null
+++ b/projects/50_neutron/from-mitaka/upgrade-neutron
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# ``upgrade-neutron``
+
+function configure_neutron_upgrade {
+    local xtrace
+    xtrace=$(set +o | grep xtrace)
+    set -o xtrace
+
+    # Apply new rootwrap dhcp.filters because of dnsmasq dhcp_release6 change
+    sudo cp -f $TARGET_RELEASE_DIR/neutron/etc/neutron/rootwrap.d/dhcp.filters $NEUTRON_CONF_DIR/rootwrap.d/
+
+    $xtrace
+}