From 1c0b3c2b8aa11e545703d3ce3f74f4993c0d38af Mon Sep 17 00:00:00 2001 From: Michal Kelner Mishali Date: Tue, 9 Jan 2018 11:27:41 +0200 Subject: [PATCH] BUG_FIX: policy.d copy over for devstack For devstack: Content of policy.d should be copied over and not the entire folder, or it creates dup of policy.d and breaks things. Change-Id: I8666d88d04c7a320922edcd4f7b03f588becdbc1 Signed-off-by: Michal Kelner Mishali --- devstack/lib/vmware_nsx_tvd | 2 +- devstack/lib/vmware_nsx_v | 2 +- devstack/lib/vmware_nsx_v3 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/lib/vmware_nsx_tvd b/devstack/lib/vmware_nsx_tvd index e9140a2d25..e1c060fd2d 100644 --- a/devstack/lib/vmware_nsx_tvd +++ b/devstack/lib/vmware_nsx_tvd @@ -127,7 +127,7 @@ function neutron_plugin_configure_common { 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 -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d $NEUTRON_CONF_DIR/policy.d + cp -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d/* $NEUTRON_CONF_DIR/policy.d/ Q_PLUGIN_CLASS="vmware_nsxtvd" } diff --git a/devstack/lib/vmware_nsx_v b/devstack/lib/vmware_nsx_v index 8bdd122cbd..ea90c2c349 100644 --- a/devstack/lib/vmware_nsx_v +++ b/devstack/lib/vmware_nsx_v @@ -58,7 +58,7 @@ function neutron_plugin_configure_common { 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 -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d $NEUTRON_CONF_DIR/policy.d + cp -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d/* $NEUTRON_CONF_DIR/policy.d/ Q_DB_NAME="neutron_nsx" Q_PLUGIN_CLASS="vmware_nsxv" } diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3 index e78a10ee80..90e83929db 100644 --- a/devstack/lib/vmware_nsx_v3 +++ b/devstack/lib/vmware_nsx_v3 @@ -124,7 +124,7 @@ function neutron_plugin_configure_common { 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 -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d $NEUTRON_CONF_DIR/policy.d + cp -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d/* $NEUTRON_CONF_DIR/policy.d/ Q_PLUGIN_CLASS="vmware_nsxv3" }