@@ -480,18 +480,6 @@ function create_nova_conf {

         iniset $NOVA_CONF DEFAULT notification_driver "messaging"

     fi

-    # Provide some transition from ``EXTRA_FLAGS`` to ``EXTRA_OPTS``

-    if [[ -z "$EXTRA_OPTS" && -n "$EXTRA_FLAGS" ]]; then

-        EXTRA_OPTS=$EXTRA_FLAGS

-    fi

-

-    # Define extra nova conf flags by defining the array ``EXTRA_OPTS``.

-    # For Example: ``EXTRA_OPTS=(foo=true bar=2)``

-    for I in "${EXTRA_OPTS[@]}"; do

-        # Replace the first '=' with ' ' for iniset syntax

-        iniset $NOVA_CONF DEFAULT ${I/=/ }

-    done

-

     # All nova-compute workers need to know the vnc configuration options

     # These settings don't hurt anything if n-xvnc and n-novnc are disabled

     if is_service_enabled n-cpu; then

@@ -1395,24 +1395,6 @@ if [[ -n "$DEPRECATED_TEXT" ]]; then

     echo_summary "WARNING: $DEPRECATED_TEXT"

 fi

-# TODO(dtroyer): Remove EXTRA_OPTS after stable/icehouse branch is cut

-# Specific warning for deprecated configs

-if [[ -n "$EXTRA_OPTS" ]]; then

-    echo ""

-    echo_summary "WARNING: EXTRA_OPTS is used"

-    echo "You are using EXTRA_OPTS to pass configuration into nova.conf."

-    echo "Please convert that configuration in localrc to a nova.conf section in local.conf:"

-    echo "EXTRA_OPTS will be removed early in the Juno development cycle"

-    echo "

-[[post-config|\$NOVA_CONF]]

-[DEFAULT]

-"

-    for I in "${EXTRA_OPTS[@]}"; do

-        # Replace the first '=' with ' ' for iniset syntax

-        echo ${I}

-    done

-fi

-

 # TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut

 if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then

     echo ""