From a5b70a10828455647b8da1b21b3f32a8f651ccd0 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Thu, 24 Jul 2014 12:50:48 +0200
Subject: [PATCH] Remove configuration parameter Q_SRV_EXTRA_DEFAULT_OPTS

According to the comments in stack.sh the configuration parameter
Q_SRV_EXTRA_DEFAULT_OPTS should be removed during the Juno cycle.

Change-Id: I2a00c924cd51dab00b56cdab1e48e32ffa007de4
---
 lib/neutron |  8 --------
 stack.sh    | 17 -----------------
 2 files changed, 25 deletions(-)

diff --git a/lib/neutron b/lib/neutron
index 98ae3accc0..7d80b15818 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -814,14 +814,6 @@ function _configure_neutron_service {
     iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
     _neutron_setup_keystone $NEUTRON_CONF keystone_authtoken
 
-    # Define extra "DEFAULT" configuration options when q-svc is configured by
-    # defining the array ``Q_SRV_EXTRA_DEFAULT_OPTS``.
-    # For Example: ``Q_SRV_EXTRA_DEFAULT_OPTS=(foo=true bar=2)``
-    for I in "${Q_SRV_EXTRA_DEFAULT_OPTS[@]}"; do
-        # Replace the first '=' with ' ' for iniset syntax
-        iniset $NEUTRON_CONF DEFAULT ${I/=/ }
-    done
-
     # Configuration for neutron notifations to nova.
     iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_status_changes $Q_NOTIFY_NOVA_PORT_STATUS_CHANGES
     iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_data_changes $Q_NOTIFY_NOVA_PORT_DATA_CHANGES
diff --git a/stack.sh b/stack.sh
index cdfa3dafc3..b3b8df63ac 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1490,23 +1490,6 @@ if [[ -n "$Q_DHCP_EXTRA_DEFAULT_OPTS" ]]; then
     done
 fi
 
-# TODO(dtroyer): Remove Q_SRV_EXTRA_DEFAULT_OPTS after stable/icehouse branch is cut
-if [[ -n "$Q_SRV_EXTRA_DEFAULT_OPTS" ]]; then
-    echo ""
-    echo_summary "WARNING: Q_SRV_EXTRA_DEFAULT_OPTS is used"
-    echo "You are using Q_SRV_EXTRA_DEFAULT_OPTS to pass configuration into $NEUTRON_CONF."
-    echo "Please convert that configuration in localrc to a $NEUTRON_CONF section in local.conf:"
-    echo "Q_SRV_EXTRA_DEFAULT_OPTS will be removed early in the Juno development cycle"
-    echo "
-[[post-config|\$NEUTRON_CONF]]
-[DEFAULT]
-"
-    for I in "${Q_SRV_EXTRA_DEFAULT_OPTS[@]}"; do
-        # Replace the first '=' with ' ' for iniset syntax
-        echo ${I}
-    done
-fi
-
 # TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut
 if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
     echo ""