@@ -1116,20 +1116,15 @@ if is_service_enabled quantum; then

             echo "OVS 1.4+ is required for tunneling between multiple hosts."

             exit 1

         fi

-        sudo sed -i -e "s/.*enable-tunneling = .*$/enable-tunneling = $OVS_ENABLE_TUNNELING/g" /$Q_PLUGIN_CONF_FILE

+        sudo sed -i -e "s/.*enable_tunneling = .*$/enable_tunneling = $OVS_ENABLE_TUNNELING/g" /$Q_PLUGIN_CONF_FILE

     fi

 fi

 # Quantum service (for controller node)

 if is_service_enabled q-svc; then

-    # must remove this file from existing location, otherwise Quantum will prefer it

-    if [[ -e $QUANTUM_DIR/etc/plugins.ini ]]; then

-        # Support prior to common config

-        Q_PLUGIN_INI_FILE=/etc/quantum/plugins.ini

-        sudo mv $QUANTUM_DIR/etc/plugins.ini $Q_PLUGIN_INI_FILE

-    fi

     Q_CONF_FILE=/etc/quantum/quantum.conf

     Q_API_PASTE_FILE=/etc/quantum/api-paste.ini

+    Q_POLICY_FILE=/etc/quantum/policy.json

     if [[ -e $QUANTUM_DIR/etc/quantum.conf ]]; then

       sudo mv $QUANTUM_DIR/etc/quantum.conf $Q_CONF_FILE

@@ -1139,6 +1134,10 @@ if is_service_enabled q-svc; then

       sudo mv $QUANTUM_DIR/etc/api-paste.ini $Q_API_PASTE_FILE

     fi

+    if [[ -e $QUANTUM_DIR/etc/policy.json ]]; then

+      sudo mv $QUANTUM_DIR/etc/policy.json $Q_POLICY_FILE

+    fi

+

     if is_service_enabled mysql; then

             mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e "DROP DATABASE IF EXISTS $Q_DB_NAME;"

             mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e "CREATE DATABASE IF NOT EXISTS $Q_DB_NAME CHARACTER SET utf8;"

@@ -1147,14 +1146,8 @@ if is_service_enabled q-svc; then

             exit 1

     fi

-    # Update either configuration file with plugin or old plugin file

-    # file checked below exists only in common config version

-    if [[ -e $QUANTUM_DIR/quantum/tests/etc/quantum.conf.test ]]; then

-        sudo sed -i -e "s/^core_plugin =.*$/core_plugin = $Q_PLUGIN_CLASS/g" $Q_CONF_FILE

-    else

-        sudo sed -i -e "s/^provider =.*$/provider = $Q_PLUGIN_CLASS/g" $Q_PLUGIN_INI_FILE

-    fi

-

+    # Update either configuration file with plugin

+    sudo sed -i -e "s/^core_plugin =.*$/core_plugin = $Q_PLUGIN_CLASS/g" $Q_CONF_FILE

     screen_it q-svc "cd $QUANTUM_DIR && python $QUANTUM_DIR/bin/quantum-server --config-file $Q_CONF_FILE"

 fi

@@ -1179,7 +1172,7 @@ if is_service_enabled q-agt; then

         sudo ovs-vsctl --no-wait -- --if-exists del-br $OVS_BRIDGE

         sudo ovs-vsctl --no-wait add-br $OVS_BRIDGE

         sudo ovs-vsctl --no-wait br-set-external-id $OVS_BRIDGE bridge-id br-int

-        sudo sed -i -e "s/.*local-ip = .*/local-ip = $HOST_IP/g" /$Q_PLUGIN_CONF_FILE

+        sudo sed -i -e "s/.*local_ip = .*/local_ip = $HOST_IP/g" /$Q_PLUGIN_CONF_FILE

         AGENT_BINARY=$QUANTUM_DIR/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py

     elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then

        # Start up the quantum <-> linuxbridge agent