Merge "The policy file did not take effect in devstack env"

This commit is contained in:
Jenkins 2016-07-11 05:53:00 +00:00 committed by Gerrit Code Review
commit 7fd495e730
2 changed files with 6 additions and 0 deletions

View File

@ -55,6 +55,9 @@ function neutron_plugin_configure_common {
(cd $DEST/$VMWARE_NSX_DIR && exec ./tools/generate_config_file_samples.sh) (cd $DEST/$VMWARE_NSX_DIR && exec ./tools/generate_config_file_samples.sh)
mkdir -p /$Q_PLUGIN_CONF_PATH mkdir -p /$Q_PLUGIN_CONF_PATH
cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/nsx.ini.sample /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME 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_DB_NAME="neutron_nsx"
Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxVPlugin" Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxVPlugin"
} }

View File

@ -68,6 +68,9 @@ function neutron_plugin_configure_common {
(cd $DEST/$VMWARE_NSX_DIR && exec ./tools/generate_config_file_samples.sh) (cd $DEST/$VMWARE_NSX_DIR && exec ./tools/generate_config_file_samples.sh)
mkdir -p /$Q_PLUGIN_CONF_PATH mkdir -p /$Q_PLUGIN_CONF_PATH
cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/nsx.ini.sample /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME 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" Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxV3Plugin"
} }