summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
diff options
context:
space:
mode:
authorMichael Janczyk2010-05-09 21:02:47 +0200
committerMichael Janczyk2010-05-09 21:02:47 +0200
commit20f7c139d8e8c9bca13d17d470c7ba5005f5534d (patch)
treeb6798f6c3591e61622aecc4352b3723cbcfada66 /os-plugins/plugins/vmgrid/files/run-vmgrid.sh
parentbug if statement changed, so it works if only one plugin installed (diff)
downloadcore-20f7c139d8e8c9bca13d17d470c7ba5005f5534d.tar.gz
core-20f7c139d8e8c9bca13d17d470c7ba5005f5534d.tar.xz
core-20f7c139d8e8c9bca13d17d470c7ba5005f5534d.zip
minor naming changes
Diffstat (limited to 'os-plugins/plugins/vmgrid/files/run-vmgrid.sh')
-rw-r--r--os-plugins/plugins/vmgrid/files/run-vmgrid.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/os-plugins/plugins/vmgrid/files/run-vmgrid.sh b/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
index 9b9adb44..9e3cbf0a 100644
--- a/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
+++ b/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
@@ -69,7 +69,7 @@ headless=1
while [ $# -gt 0 ]; do
case "$1" in
-h|--help)
- echo -e "Usage: run-vmgrid.sh [-g] [--mem <memorysize in MB>] \c"
+ echo -e "Usage: run-vmgrid.sh [-g] [--mem <memory size in MB>] \c"
echo -e "[/path/]filename[.xml]"
exit
;;
@@ -253,6 +253,7 @@ xmlvirt=$(grep -o 'virtualmachine param=.*"' ${xmlfile} \
# make a guess from the filename extension if ${xmlvirt} is empty
# (not set within the XML file)
+# TODO: implement possibility to submit own configuration files
if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
writelog "No virtual machine parameter defined in ${xmlfile}"
writelog "Trying to guess VM...\c"
@@ -330,20 +331,19 @@ writelog "\tVM short name:\t\t$vm_shortname"
### Declaration of default variables
###############################################################################
-# TODO: cpu cores
+# make sure cpu_cores is not empty
+cpu_cores=${cpu_cores:-"1"}
#vmgrid::maxvcpus
#vmgrid::minvcpus
-#cpu_cores="${cpu_cores}"
-
# check for CPU virtualization flags
-#vmgrid::hvm
+#vmgrid::vt
# total amount of memory defined in stage 3
permem=60
# get a result which can be divided through 4
mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4)
-#vmgrid::maxram
-#vmgrid::minram
+#vmgrid::maxmem
+#vmgrid::minmem
# configuring ethernet mac address: first 3 bytes are fixed (00:50:56)
# 4th byte is the VM-ID