8bd63e3f0ce0f53ef176378a459df0d936953771
Commit Graph

116 Commits

Author SHA1 Message Date
Zhao Lei
6d2553ef2e Remove quotes from subshell call in bash script
Always no quotes for $() statement.
We don't need quotes to hold blanks in result:
 # i=$(echo 1 2 3)
 # echo $i
 1 2 3
 #
These quotes can make something wrong in some case:
 # i=$(echo '!')
 #
 # i="$(echo '!')"
 -bash: !: event not found
 #
No real problem for current code, only to use a better code style.
Change-Id: Ib31b49680286600c9a182875122a0a752d3f8a33
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
2015年09月23日 17:34:07 +08:00
Jenkins
21155d91de Merge "labs: repeat test from snapshot" 2015年05月27日 06:30:52 +00:00
utsav
a4bb9d9a12 colorize osbash scripts using lib-color.sh
It colorizes the output of osbash.sh using
the conventions given in lib-color.sh.
Implements: blueprint osbash-color-support
Closes-Bug: #1443136
Change-Id: I42ca96454fdab47b283222e2deaf3e9b51d03106
2015年05月11日 21:15:34 +05:30
Pranav Salunke
7c8d4ecf8f Updates base disk size
Adding orchestration and telementry services require more disk size.
The current base disk size may not be sufficient for newely added
services.
Change-Id: Id8fc90a434cade6e1c9833935938869f6a84252a
2015年05月10日 14:22:53 +00:00
Roger Luethi
4749e620b6 labs: repeat test from snapshot
With this changeset, the cluster build can be tested starting from a
specific snapshot. This is mostly useful for testing client scripts
without having to go through the whole cluster build every time.
For instance, to rebuild the cluster from snapshot neuntron_configured:
./tools/repeat-test.sh -b -t neutron_configured -s "controller compute"
This will restore the appropriate snapshot on each node, boot nodes
controller and compute, and continue the cluster build from the named
snapshot onward.
Note: this procedure restores, boots, and continues in short order which
uncovers new shortcomings (races) in scripts that assume a service is
available when they should check and wait for the service.
If you just want to restore all nodes to the appropriate snapshots:
./tools/restore-cluster.sh -t <snapshot>
Change-Id: I0b7888d02de6eb50760d421d6d897f516f8c7718
2015年05月10日 16:14:52 +02:00
Jenkins
527399d26b Merge "Rename Bash scripts" 2015年05月10日 13:04:28 +00:00
Erwan Gallen
21df3c8691 Fix MD5 verification for fedora-20-x86_64
Adding the missing ISO_MD5 variable in the fedora-20-x86_64 lib
Change-Id: I94d90a0373fb8d7b6f57a1252d44e96e76b7e4af
Closes-Bug: #1451434 
2015年05月04日 15:54:31 +02:00
utsav dusad
cf3b1fa923 Rename Bash scripts
Rename scripts in /labs/lib with proper naming convention.
Bug #1451071
Change-Id: I3a1f096414866846a7f9572804c5db852d76a36e
2015年05月03日 22:44:56 +05:30
Pranav Salunke
0a86fa84e0 Updates ubuntu server image
Updates ubuntu server image to ubuntu-server-14.04.2. The older
versions are not currently available for download, resulting in
timeout with http 404 error while download request is being sent.
Change-Id: I86917aa1be0392d45d9e9e33f6a913704ae1fed8
2015年03月27日 10:46:19 +01:00
Utsav Dusad
36339cd5e0 Make all scripts under labs folder Bashate clean
Writing style for bash script is corrected.
Closes-Bug: #1430649
Change-Id: I8c8a73364922d418c47e7cd8ee372710cafab5ce
2015年03月14日 07:07:59 +01:00
Jenkins
61219b2164 Merge "labs: Adds colorizer for osbash script" 2015年03月11日 10:59:06 +00:00
sayalilunkad
845d2ae468 labs: Adds colorizer for osbash script
Adds script with all the colors and decorators like bold, underline.
Uses this script in main osbash.sh script to bring color to the script
run.
Also adds -c option to enable colors while buiding osbash script.
Usage: ./osbash.sh -b cluster (colors enabled by default)
 ./osbash.sh -b --no-color cluster (colors disabled)
Implements: blueprint osbash-color-support
Change-Id: I5b17221f67f76552deb3498b8a020f1b0d3a64a8
2015年03月11日 14:56:22 +05:30
Jenkins
cbd2149109 Merge "Modifies osbash files to use osbash ssh keys" 2015年03月09日 14:08:25 +00:00
sayalilunkad
05676783f2 Modifies osbash files to use osbash ssh keys
This patch makes use of the osbash public and private keys to ssh to VM
rather than the vagrant keys.
This also removes the vagrant keys directory from the repository.
Change-Id: I939274f188a02469c7e2cf9f9502510ea00d514e
2015年03月09日 13:49:52 +00:00
sayalilunkad
99189ab278 Point to version 2 pre-configuration files
This patch replaces the URLs pointing to the
pre-configuration files for all supported distros
to the latest version.
Change-Id: Ia9a158f695562c56a904af36367b3f2acd9db968
2015年03月08日 15:07:00 +00:00
sayalilunkad
3e6c2160dd Changes pre-config files to use new ssh keys
This patch adds version 2 of preseed files
pointing to the to the new osbash ssh keys URL
while keeping the older version to point to the
vagrant keys URL.
Change-Id: If0f0b609d5d58d7169eed0e2e84a890c7f3b4970
2015年03月08日 20:33:01 +05:30
Roger Luethi
86e1462b62 labs: merge node-specific config/scripts.* files
Currently, we have a file directing the build for each node. However,
rebuilding just one node hardly ever makes sense, so we might as well
remove the extra files and have the user just rebuild the cluster.
With this patch, every distribution will have a basedisk scripts
configuration file (as before) and one scripts configuration file for
building the cluster (or several for building additional, different
clusters).
Change-Id: I7f50d49d7337b790416a2a76c86be510990859fd
2015年03月01日 19:04:39 +01:00
Jenkins
11b75c0faa Merge "labs: abort on config/scripts.* syntax errors" 2015年01月31日 20:26:21 +00:00
Roger Luethi
b97d617579 labs: rename config/scripts.<distro>
Rename config/scripts.<distro> files to config/scripts.<distro>_base,
making it clear that these distro-specific scripts lists are only
used for the base disk.
Change-Id: I358c2df2c8d3f1ddae4fb26850407d2f6fa360ee
2015年01月23日 18:35:37 +01:00
Roger Luethi
21188d5dfa labs: abort on config/scripts.* syntax errors
Instead of skipping only lines starting with a '#' (comments), also skip
empty lines. For all other lines that are not commands, abort with a
syntax error.
Change-Id: I5e326f2eb27e4aa72ff75a211e36bc3b3a78126f
2015年01月23日 16:34:49 +01:00
Roger Luethi
cf0aa13715 labs: force LC_ALL=C for ssh
Mac OS X exports LC_CTYPE=UTF-8 to our ssh environment which makes the
keystone install fail (results in a Python traceback complaining about
"unknown locale: UTF-8").
This patch uses LC_ALL=C to override all locale settings.
The previous, limited work-arounds for neutron are no longer needed and
removed.
Change-Id: Ic7a2f5547fc4bd5d512da5197e48366c83c21c24
2014年12月22日 15:17:41 +01:00
Roger Luethi
67db6e7aa3 labs: fix Windows batch file creation
This changeset reverts "labs: temporary wbatch fix" and replaces it with
a proper fix, allowing the creation of correct Windows batch files on
build hosts without VirtualBox.
Change-Id: Iad005ce9f0dcecb910fc09b2c43385dd42992eda
2014年11月27日 15:20:22 +01:00
sayalilunkad
fb52a4a50c Removes ISO image if found corrupt
This patch automatically removes the corrupt
ISO image if md5sum doesn't match and prompts
user to re-run osbash script as oppose to asking
the user to remove the corrupt image.
Change-Id: I0dae5d7b88980a5644ec684f8cc8f04697f06e8b
2014年11月22日 18:36:09 +05:30
Roger Luethi
0611f83c84 labs: fix formatting in wait_for_ssh
The dots printed while waiting for the ssh server to respond are
no longer on a separate line, and the line ends with a newline.
Change-Id: Ib6c1ddaa35a35ff0a1c28f9e98d205740934c0f6
2014年10月27日 17:21:41 +01:00
Roger Luethi
84863087a5 labs: verify MD5 checksum for Linux ISO image
Verify the MD5 checksum of the Linux distribution's ISO image before
trying to use it. Image corruption happens, and the resulting problems
are not always easy to diagnose.
Change-Id: I92852a28392002d4fcd64898453086d5920d0ef1
2014年10月21日 10:17:23 +02:00
Roger Luethi
9066f772ee labs: add BASE_DISK_SIZE configuration option
A new configuration option, BASE_DISK_SIZE, allows users to change the
size of the disk available to the node VMs.
Because the disks grow dynamically, the cost of larger disks is limited
in practice to additional time spent in zero_empty.sh.
Change-Id: I47a72a08cfa51ba6c04306b64e04c4c2600975dd
2014年10月15日 07:47:21 +02:00
Roger Luethi
ea343760e2 labs: add options for config cmds
This patch adds two options to configuration commands (config/scripts.*).
-n <node_name>: change target node of command
-g <gui_type>: override GUI type (gui, headless, sdl) for this boot
The changed syntax is as follows:
cmd boot [-g <gui_type>] [-n <node_name>]
cmd snapshot [-n <node_name>] <snapshot_name>
cmd wait_for_shutdown [-n <node_name>]
cmd snapshot_cycle [-g <gui_type>] [-n <node_name>]
cmd init_node [-n <node_name>]
Change-Id: Id2673c6d504aed33f0259d5751084442e851684b
2014年10月08日 08:57:37 +02:00
Roger Luethi
615eda597a labs: remove old script queuing mechanism
Remove the old mechanism for queuing scripts.
Change-Id: I7645a80419918b3da585de12802301133fab6d10
2014年10月05日 21:17:25 +02:00
Roger Luethi
35218beac6 labs: add and use new cmd: queue
Add a new command, queue, to replace the old syntax in config/scripts.*.
Convert all config files to use the new syntax.
Previously, the scripts used hardcoded directory code words: scripts
for $SCRIPTS_DIR, osbash for $SCRIPTS_DIR/osbash.
With the new syntax, the argument is just a relative path inside
$SCRIPTS_DIR. This makes it easier to add (e.g. distribution-specific)
directories.
The new syntax makes also explicit that the command is used to queue
files for later execution.
Change-Id: I414b05785ad322e82f3bf3a38f3374d0e6c45c6c
2014年10月03日 16:04:56 +02:00
Roger Luethi
b2d5286996 labs: unregister clone VM disk, snapshots
Exporting via cloned VMs leaves the exported disks and snapshots
registered with VirtualBox (whether or not we pass a "--register" flag
to clonevm). Moving the exported VMs away or trying to export again to
the same location makes VirtualBox complain.
If we register the cloned VM upon creation and then unregister it
afterwards, we get at least rid of the snapshots and have only the
base disk left to unregister manually. This rather complicated method
is implemented here.
The export VMs have "-e" attached to their names, making them easier to
unregister here. They are also easy to recognize when imported into a
VirtualBox that already has node VMs using the original names.
Change-Id: I4532fd3152e705c3b35265359d7e6b0d5facd55e
2014年09月22日 16:51:53 +02:00
Jenkins
2d2e2febb0 Merge "labs: split get_base_disk_path" 2014年09月22日 13:06:29 +00:00
Roger Luethi
9fb0723cf9 labs: split get_base_disk_path
Spin off get_base_disk_name from get_base_disk_path so we can get the
disk name without the directory.
Change-Id: Id813fd9bbf8a859b639f92a380c067dfc67a95c7
2014年09月20日 23:45:19 +02:00
Roger Luethi
fed4626ac0 labs: fix shared folder restore after export
Fix the code responsible for reattaching shared directories after VMs
have been exported.
For OVA export:
- use saved share names instead of default name (for the sake of
 correctness; it is unlikely that a user will change the name)
For dir export:
- save and reattach shared directories after export
Change-Id: I79162c1ec788aa1d89104aa92aebeae2bb05adf5
2014年09月20日 23:44:07 +02:00
Roger Luethi
3f1ef07fdd labs: osbashauto exit on script error
Make osbashout abort if a client-side scripts returns an error; use a
file named error in the status directory to signal the problem and to
store the name of the offending script for use by Windows batch scripts.
Have osbash.sh and the Windows batch scripts exit when an error file
appears.
Change-Id: I6722e75c9c23b99e5ed25b00429026c2e0ff6a12
2014年09月14日 10:55:40 +02:00
Roger Luethi
80bb373a50 labs: simplify wait_for_autofiles logic
Refactoring to make the control flow easier to understand.
Change-Id: Id38fd1c06ba51ec65577e7c6e7d7caf67acff666
2014年09月12日 22:58:40 +02:00
Jenkins
1e2ec80744 Merge "labs: split out process_begin_files" 2014年09月12日 20:52:36 +00:00
Jenkins
3bab42dd5d Merge "labs: fix race in preseed script" 2014年09月11日 18:32:07 +00:00
Roger Luethi
412db49c57 labs: exit if ssh returns error value
With this changeset, osbash host scripts abort installation over ssh if
script execution in the VM returns an error. The patch has no effect on
installations using VirtualBox guest-addons.
Change-Id: Ibc0b297f44289cfe37e07fad1c0fcef1a30abfb2
2014年09月11日 15:20:14 +02:00
Roger Luethi
d14c75c38a labs: split out process_begin_files
Move the processing of *.begin status files into a separate function.
Call that function only if the host's status directory is shared with
the client scripts (through VirtualBox guest-additions).
Change-Id: I7716528c02aa4f8b5fc0901ff91ba5d37b5a0d9f
2014年09月11日 14:35:57 +02:00
Roger Luethi
6052a0455f labs: fix race in preseed script
When using the VirtualBox additions, there is a chance that after the
vboxadd service has started, the shared directory is not yet fully
available. In that case, activate_autostart.sh is never run (although
it may appear in time to be deleted).
This patch makes the script from preseed wait for activate_autostart.sh
to become available before it tries to execute it.
Change-Id: I1c2f3ef2f4301f36efec8a70b811ffe97dbaa779
2014年09月11日 13:04:57 +02:00
Roger Luethi
b35c73f3b4 labs: enable host I/O cache
This patch enables host I/O cache for the VMs created by the labs
scripts.
Without host I/O cache, occasional VM filesystem corruption occured on
two out of three host systems when we started taking snapshots after
every service install on the controller VM. Typically, the affected
script would just hang. The issue is somewhat elusive: it occured only
on two out of three test hosts, and the longest observed streak of
correct controller VM builds in a row was 16 (number 17 ended with
filesystem corruption).
With host I/O cache enabled, 125 builds were successful and none failed.
Change-Id: Ib36f44fdbf9366ef781df82f225e5ac8c5bb678f
2014年09月09日 09:15:43 +02:00
Roger Luethi
e41336c612 labs: bad variable reference in get_next_child_uuid
The recent renaming of local variables missed an instance of a variable.
Fixed.
Change-Id: I75da4382fc35dd288879715d987e8fabb8e2aa47
2014年09月02日 06:41:54 +02:00
Roger Luethi
946114eb30 labs: pass vm_name as arg to _vbox_configure_ifs
_vbox_configure_ifs should no longer use the environment variable
NODE_NAME as the name of the node VM. It gets replaced by the correct
value passed as an argument.
Change-Id: I9d36420bcf56bbabe2f47cee2d7eb2ad824bf5d1
2014年09月01日 17:43:27 +02:00
Jenkins
d815757eff Merge "labs: separate vm_name, NODE_NAME" 2014年09月01日 15:36:32 +00:00
Roger Luethi
6f44c8b272 labs: check and fix private ssh key permissions
If a user changes the permissions of the Vagrant insecure ssh key,
ssh authentication doesn't work anymore and they are prompted for
a password. To prevent that, check (and adjust, if necessary) file
permissions before using ssh.
Change-Id: I90589553de30ef606c4083a1b9980c2cc80a3b3b
2014年09月01日 08:40:18 +02:00
Roger Luethi
e47910e863 labs: separate vm_name, NODE_NAME
Distinguish between the name of a node VM (vm_name) and the hostname
used for the node VM. They just happened to have the same values until
now.
Change-Id: Idc457922fee886ebe504d5f56bbc86d0e5fbbd54
2014年08月31日 22:11:21 +02:00
Roger Luethi
3ed47695bb labs: replace VM_BASE_NAME with local variable
There is no need for users to customize the name of the temporary VM
used for building the base disk. This patch removes that option.
Change-Id: I1e3eebf0c9f1098623d8f4ab50d938211cc78b6f
2014年08月31日 21:44:32 +02:00
Jenkins
79cadac0b6 Merge "labs: rename local vars: virtualbox.install_node" 2014年08月31日 19:30:40 +00:00
Roger Luethi
19c31feb91 labs: rename local vars: virtualbox.install_node
Make local variables lowercase and some of them more descriptive.
Change-Id: I14072c03243e0fc16aef4a5b6513ca530a99d911
2014年08月31日 17:57:01 +02:00
Roger Luethi
b10d379990 labs: rename local vars: virtualbox.functions
Make local variables lowercase and some of them more descriptive.
Change-Id: I63bbc6a8527864ba3078804eec090a5bfc206f16
2014年08月31日 08:43:48 +02:00