openstack/training-guides
Code Issues Proposed changes

Merge "labs: add init_node command"

Browse Source
This commit is contained in:
Jenkins 2014-08-20 11:42:43 +00:00 committed by Gerrit Code Review
commit 5ebbffd351
8 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
labs/config/scripts.compute
View File

@ -1,4 +1,13 @@
# Scripts for compute node
cmd init_node
scripts etc_hosts.sh
osbash enable_vagrant_ssh_keys.sh
#osbash wait_debug.sh
# Using scripts/osbash/shutdown.sh because we want Vagrant to ignore this
osbash shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "network_configured"
scripts setup_nova_compute.sh
scripts setup_neutron_compute.sh
scripts shutdown.sh

9
labs/config/scripts.controller
View File

@ -1,4 +1,13 @@
# Scripts for controller node
cmd init_node
scripts etc_hosts.sh
osbash enable_vagrant_ssh_keys.sh
#osbash wait_debug.sh
# Using scripts/osbash/shutdown.sh because we want Vagrant to ignore this
osbash shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "network_configured"
scripts apt_install_mysql.sh
scripts install_rabbitmq.sh
scripts setup_keystone.sh

9
labs/config/scripts.network
View File

@ -1,4 +1,13 @@
# Scripts for network node
cmd init_node
scripts etc_hosts.sh
osbash enable_vagrant_ssh_keys.sh
#osbash wait_debug.sh
# Using scripts/osbash/shutdown.sh because we want Vagrant to ignore this
osbash shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "network_configured"
scripts setup_neutron_network.sh
scripts shutdown.sh
cmd boot

8
labs/config/scripts.nodeinit_osbash
View File

@ -1,8 +0,0 @@
# Scripts for all nodes built by osbash
scripts etc_hosts.sh
osbash enable_vagrant_ssh_keys.sh
#osbash wait_debug.sh
scripts shutdown.sh
cmd boot
cmd wait_for_shutdown
cmd snapshot "network_configured"

2
labs/config/scripts.nodeinit_vagrant
View File

@ -1,2 +0,0 @@
# Scripts for all nodes built using Vagrant
scripts etc_hosts.sh

4
labs/lib/osbash/functions.host
View File

@ -276,6 +276,10 @@ function command_from_config {
echo >&2 vm_wait_for_shutdown "$NODE_NAME"
vm_wait_for_shutdown "$NODE_NAME"
;;
init_node)
echo >&2 vm_init_node "$NODE_NAME"
vm_init_node "$NODE_NAME"
;;
*)
echo >&2 "Error: invalid cmd: $cmd"
exit 1

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

@ -39,8 +39,6 @@ function _vbox_boot_with_autostart {
function vm_init_node {
NODE_NAME=$1
${WBATCH:-:} wbatch_begin_node "$NODE_NAME"
vm_create "$NODE_NAME"
# Set VM_MEM in config/config.NODE_NAME to override
@ -62,10 +60,8 @@ function vm_init_node {
vm_add_share "$NODE_NAME" "$SHARE_DIR" "$SHARE_NAME"
vm_attach_disk_multi "$NODE_NAME" "$BASE_DISK"
#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
autostart_reset
# 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 {
@ -76,7 +72,7 @@ function vm_build_node {
NODE_NAME=$1
source "$CONFIG_DIR/config.$NODE_NAME"
vm_init_node "$NODE_NAME"
${WBATCH:-:} wbatch_begin_node "$NODE_NAME"
#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
autostart_reset
autostart_from_config "scripts.$NODE_NAME"

2
labs/scripts/vagrant/run_scripts.sh
View File

@ -37,7 +37,7 @@ function vagrant_start_from_config {
}
# The Vagrantfile uses Ubuntu
for config_file in "scripts.nodeinit_vagrant" "scripts.ubuntu" "scripts.$HOSTNAME"; do
for config_file in "scripts.ubuntu" "scripts.$HOSTNAME"; do
echo "Config file $config_file"
vagrant_start_from_config "$config_file"
done