openstack/manila
Code Issues Proposed changes

Merge "Remove Devstack workaround for Neutron"

Browse Source
This commit is contained in:
Jenkins 2016-04-07 22:58:02 +00:00 committed by Gerrit Code Review
commit 3e77d58eb6
1 changed files with 0 additions and 5 deletions

5
devstack/plugin.sh

@ -664,11 +664,6 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Installing extra libraries"
install_libraries
# Neutron config update
if is_service_enabled neutron; then
iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_local_resolv False
fi
# Cinder config update
if is_service_enabled cinder && [[ -n "$CINDER_OVERSUBSCRIPTION_RATIO" ]]; then
CINDER_CONF=${CINDER_CONF:-/etc/cinder/cinder.conf}