@@ -58,12 +58,6 @@ function configure_nova_hypervisor {

         sudo cp "$FILES/dnsmasq-for-baremetal-from-nova-network.conf" "$BM_DNSMASQ_CONF"

         iniset $NOVA_CONF DEFAULT dnsmasq_config_file "$BM_DNSMASQ_CONF"

     fi

-

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

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

-        # Attempt to convert flags to options

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

-    done

 }

 # install_nova_hypervisor() - Install external components

@@ -1413,23 +1413,6 @@ if [[ -n "$EXTRA_OPTS" ]]; then

     done

 fi

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

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

-    echo ""

-    echo_summary "WARNING: EXTRA_BAREMETAL_OPTS is used"

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

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

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

-    echo "

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

-[baremetal]

-"

-    for I in "${EXTRA_BAREMETAL_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 ""