From 466aef9523f7110e0af429b82f826b12df2b6c6f Mon Sep 17 00:00:00 2001
From: Valeriy Ponomaryov <vponomaryov@mirantis.com>
Date: Tue, 5 Apr 2016 15:06:13 +0300
Subject: [PATCH] Remove Devstack workaround for Neutron
Feature of Neutron DNS resolvers was disabled as
unsupported by manila-service-image.
Enable it, since, it is supported now [1].
[1] Icf7f189d621e9686c4bb449b5770b83e4bd072ee
Change-Id: I667c811c752864d6d7f239e2dfd4597e8ac98cb1
---
devstack/plugin.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 490ed76973..49c3c3c843 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -663,11 +663,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}