From 52f066c19982c37ec89a8b32896973167b37ebf6 Mon Sep 17 00:00:00 2001
From: yuyangbj <yangyu@vmware.com>
Date: Fri, 8 Jul 2016 17:19:03 +0800
Subject: [PATCH] The policy file did not take effect in devstack env

We should copy the policy file to /etc/neutron/policy.d to make sure
it takes effect.

Change-Id: I00dc89cffea47d86e22442915e803e8711f58f81
---
 devstack/lib/vmware_nsx_v  | 3 +++
 devstack/lib/vmware_nsx_v3 | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/devstack/lib/vmware_nsx_v b/devstack/lib/vmware_nsx_v
index 7538ef6781..840112c28d 100644
--- a/devstack/lib/vmware_nsx_v
+++ b/devstack/lib/vmware_nsx_v
@@ -55,6 +55,9 @@ function neutron_plugin_configure_common {
     (cd $DEST/$VMWARE_NSX_DIR && exec ./tools/generate_config_file_samples.sh)
     mkdir -p /$Q_PLUGIN_CONF_PATH
     cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/nsx.ini.sample /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
+    sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR/policy.d
+    cp -v $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy/routers.json $NEUTRON_CONF_DIR/policy.d
+    cp -v $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy/network-gateways.json $NEUTRON_CONF_DIR/policy.d
     Q_DB_NAME="neutron_nsx"
     Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxVPlugin"
 }
diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3
index d371f6a2b5..dc1ed61479 100644
--- a/devstack/lib/vmware_nsx_v3
+++ b/devstack/lib/vmware_nsx_v3
@@ -68,6 +68,9 @@ function neutron_plugin_configure_common {
     (cd $DEST/$VMWARE_NSX_DIR && exec ./tools/generate_config_file_samples.sh)
     mkdir -p /$Q_PLUGIN_CONF_PATH
     cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/nsx.ini.sample /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
+    sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR/policy.d
+    cp -v $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy/routers.json $NEUTRON_CONF_DIR/policy.d
+    cp -v $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy/network-gateways.json $NEUTRON_CONF_DIR/policy.d
     Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxV3Plugin"
 }