From c0a24f1074612bb13024c31121a487d7dd16f5a3 Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Fri, 15 Jan 2016 13:52:39 +0000
Subject: [PATCH] Fix devstack in non-neutron environments

Modifications to neutron config files must be conditional
on neutron actually being enabled.

Change-Id: I89846cbc438210c71278a98f9ffa7fd02c6a718e
Closes-Bug: #1534592
---
 devstack/plugin.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 845dc273d5..f1f25e87d5 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -438,7 +438,9 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
     init_manila
     echo_summary "Installing extra libraries"
     install_libraries
-    iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_local_resolv False
+    if is_service_enabled neutron; then
+        iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_local_resolv False
+    fi
 elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
     echo_summary "Creating Manila entities for auth service"
     create_manila_accounts