openstack/dragonflow
Code Issues Proposed changes

Install default neutron config

Browse Source 
Change-Id: I22ba03d5fc0f619458be2352a2f12045830d53fc
Closes-bug: #1662546
This commit is contained in:
yuli 2017-02-09 10:12:13 +02:00
parent 42329b6af1
commit 7536e28798
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
devstack/plugin.sh
View File

@ -164,6 +164,18 @@ function configure_qos {
iniset $NEUTRON_CONF qos notification_drivers "$NOTIFICATION_DRIVER"
}
function init_neutron_sample_config {
# NOTE: We must make sure that neutron config file exists before
# going further with ovs setup
if [ ! -f $NEUTRON_CONF ] ; then
sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR
pushd $NEUTRON_DIR
tools/generate_config_file_samples.sh
popd
cp $NEUTRON_DIR/etc/neutron.conf.sample $NEUTRON_CONF
fi
}
function configure_df_plugin {
echo "Configuring Neutron for Dragonflow"
@ -208,16 +220,6 @@ function configure_df_plugin {
iniset $NEUTRON_CONF quotas quota_security_group_rule "-1"
fi
else
_create_neutron_conf_dir
# NOTE: We need to manually generate the neutron.conf file here. This
# is normally done by a call to _configure_neutron_common in
# neutron-lib, but we don't call that for compute nodes here.
# Uses oslo config generator to generate core sample configuration files
pushd $NEUTRON_DIR
tools/generate_config_file_samples.sh
popd
cp $NEUTRON_DIR/etc/neutron.conf.sample $NEUTRON_CONF
fi
iniset $DRAGONFLOW_CONF df remote_db_ip "$REMOTE_DB_IP"
@ -448,6 +450,7 @@ if [[ "$Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER" == "True" ]]; then
fi
disable_libvirt_apparmor
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
init_neutron_sample_config
configure_ovs
configure_df_plugin
# configure nb db driver