@@ -18,6 +18,7 @@ declare -r -g _DEVSTACK_FUNCTIONS=1

 FUNC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)

 source ${FUNC_DIR}/functions-common

 source ${FUNC_DIR}/inc/ini-config

+source ${FUNC_DIR}/inc/meta-config

 source ${FUNC_DIR}/inc/python

 source ${FUNC_DIR}/inc/rootwrap

@@ -861,7 +861,10 @@ function start_nova_compute {

     local compute_cell_conf=$NOVA_CONF

+    # Bug #1802143: $NOVA_CPU_CONF is constructed by first copying $NOVA_CONF...

     cp $compute_cell_conf $NOVA_CPU_CONF

+    # ...and then adding/overriding anything explicitly set in $NOVA_CPU_CONF

+    merge_config_file $TOP_DIR/local.conf post-config '$NOVA_CPU_CONF'

     if [[ "${CELLSV2_SETUP}" == "singleconductor" ]]; then

         # NOTE(danms): Grenade doesn't setup multi-cell rabbit, so

@@ -167,9 +167,6 @@ LAST_SPINNER_PID=""

 # Import common functions

 source $TOP_DIR/functions

-# Import config functions

-source $TOP_DIR/inc/meta-config

-

 # Import 'public' stack.sh functions

 source $TOP_DIR/lib/stack