openstack
/
dragonflow
Code Issues Proposed changes

Merge "Fix neutron quota limitation"

This commit is contained in:
Jenkins 2016-03-14 15:49:06 +00:00 committed by Gerrit Code Review
parent b18d7315d5 20f88ae14d
commit 227fd0e699
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/devstackgaterc
View File

@ -18,6 +18,8 @@
#
export OVERRIDE_ENABLED_SERVICES=key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,c-sch,c-api,c-vol,horizon,rabbit,mysql,dstat,df-controller,df-etcd,df-etcd-server,q-svc,q-l3,df-zmq-publisher-service
export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_RUNNING_IN_GATE=True"
if [ -z "${RALLY_SCENARIO}" ] ; then
# Only include tempest if this is not a rally job.
export OVERRIDE_ENABLED_SERVICES=${OVERRIDE_ENABLED_SERVICES},tempest

10
devstack/plugin.sh
View File

@ -116,6 +116,16 @@ function configure_df_plugin {
else
iniset $NEUTRON_CONF DEFAULT dhcp_agent_notification "False"
fi
if [[ "$DF_RUNNING_IN_GATE" == "True" ]]; then
iniset $NEUTRON_CONF quotas default_quota "-1"
iniset $NEUTRON_CONF quotas quota_network "-1"
iniset $NEUTRON_CONF quotas quota_subnet "-1"
iniset $NEUTRON_CONF quotas quota_port "-1"
iniset $NEUTRON_CONF quotas quota_router "-1"
iniset $NEUTRON_CONF quotas quota_floatingip "-1"
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