Per the referenced bug, $NOVA_CPU_CONF was previously being initialized
by copying $NOVA_CONF, thereby trashing any values already configured in
$NOVA_CPU_CONF.
With this commit, we merge the values from $NOVA_CPU_CONF in after the
copy.
Note that this makes use of the merge_config_file function, which is
defined in inc/meta-config, which wasn't being sourced from every code
path that hit start_nova_compute; so this commit also moves that import
from stack.sh to functions (next to the other imports from inc/, which
makes sense anyway).
Change-Id: Id3e2baa2221e13f512f8dcf1248e1e15b6a7597f
Closes-Bug: #1802143
... | ... |
@@ -18,6 +18,7 @@ declare -r -g _DEVSTACK_FUNCTIONS=1 |
18 | 18 |
FUNC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd) |
19 | 19 |
source ${FUNC_DIR}/functions-common |
20 | 20 |
source ${FUNC_DIR}/inc/ini-config |
21 |
+source ${FUNC_DIR}/inc/meta-config |
|
21 | 22 |
source ${FUNC_DIR}/inc/python |
22 | 23 |
source ${FUNC_DIR}/inc/rootwrap |
23 | 24 |
|
... | ... |
@@ -838,7 +838,10 @@ function start_nova_compute { |
838 | 838 |
|
839 | 839 |
local compute_cell_conf=$NOVA_CONF |
840 | 840 |
|
841 |
+ # Bug #1802143: $NOVA_CPU_CONF is constructed by first copying $NOVA_CONF... |
|
841 | 842 |
cp $compute_cell_conf $NOVA_CPU_CONF |
843 |
+ # ...and then adding/overriding anything explicitly set in $NOVA_CPU_CONF |
|
844 |
+ merge_config_file $TOP_DIR/local.conf post-config '$NOVA_CPU_CONF' |
|
842 | 845 |
|
843 | 846 |
if [[ "${CELLSV2_SETUP}" == "singleconductor" ]]; then |
844 | 847 |
# NOTE(danms): Grenade doesn't setup multi-cell rabbit, so |