Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge (don't overwrite) $NOVA_CPU_CONF
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
- Loading branch information
Eric Fried
committed
Aug 22, 2019
1 parent
4106e46
commit 2468cea
Showing
3 changed files
with
4 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters