x/vmware-nsx
Code Issues Proposed changes

Devstack: Fix failed of ml2 directory creation

Browse Source 
Create an empty ml2 config, becasue the neutron code might not exist yet

Change-Id: Ifa4b38c6d652765b33b3b6c10c680f5eceabdf28
This commit is contained in:
Adit Sarfaty 2019-01-27 09:00:38 +02:00
parent f4ae18ea6c
commit e509b30e5e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -134,14 +134,12 @@ if [[ "$1" == "stack" && ("$2" == "install" || "$2" == "post-config") ]]; then
if is_service_enabled q-fwaas-v2; then if is_service_enabled q-fwaas-v2; then
# make sure ml2 config exists for FWaaS-v2 # make sure ml2 config exists for FWaaS-v2
if [ ! -f "/etc/neutron/plugins/ml2/ml2_conf.ini" ]; then if [ ! -f "/etc/neutron/plugins/ml2/ml2_conf.ini" ]; then
if [ -f "$DEST/neutron/etc/neutron/plugins/ml2/ml2_conf.ini.sample" ]; then
if [[ ! -f "/etc/neutron" ]]; then if [[ ! -f "/etc/neutron" ]]; then
# Create /etc/neutron with the right ownership # Create /etc/neutron with the right ownership
sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR
fi fi
mkdir -p /etc/neutron/plugins/ml2 mkdir -p /etc/neutron/plugins/ml2
cp $DEST/neutron/etc/neutron/plugins/ml2/ml2_conf.ini.sample /etc/neutron/plugins/ml2/ml2_conf.ini touch /etc/neutron/plugins/ml2/ml2_conf.ini
fi
fi fi
fi fi
fi fi