openstack/training-guides
Code Issues Proposed changes

labs: split out vm_init_node

Browse Source 
Move the initial creation and configuration of a node into a separate
function. Follow-up patches give the option to omit a call to this
function, which allows osbash to continue work on a node rather than
having to recreate it for each run.

Change-Id: Id58a5f572de0b6453cf24533b2b4e2337f35803f
Implements: blueprint openstack-training-labs
This commit is contained in:
Roger Luethi 2014-08-19 16:49:39 +02:00
parent 9f9b691bc8
commit fac92f615e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
labs/lib/osbash/virtualbox.install_node
View File

@ -35,13 +35,9 @@ function _vbox_boot_with_autostart {
echo >&2 "VM \"$VM\": autostart files executed"
}
function vm_build_node {
# XXX Run this function in sub-shell to protect our caller's environment
# (which might be _our_ enviroment if we get called again)
(
# Create a new node VM and run basic configuration scripts
function vm_init_node {
NODE_NAME=$1
source "$CONFIG_DIR/config.$NODE_NAME"
${WBATCH:-:} wbatch_begin_node "$NODE_NAME"
@ -70,7 +66,17 @@ function vm_build_node {
# Rename to pass the node name to the script
autostart_and_rename osbash init_xxx_node.sh "init_${NODE_NAME}_node.sh"
autostart_from_config scripts.nodeinit_osbash
}
function vm_build_node {
# XXX Run this function in sub-shell to protect our caller's environment
# (which might be _our_ enviroment if we get called again)
(
NODE_NAME=$1
source "$CONFIG_DIR/config.$NODE_NAME"
vm_init_node "$NODE_NAME"
#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
autostart_reset
autostart_from_config "scripts.$NODE_NAME"