openstack/fuel-library
Code Issues Proposed changes

Incorrect output on command: fuel-migrate --help

Browse Source 
Closes-Bug: 1483587
Change-Id: Ibfc4326ee54713cfe279f2f1f3fd944c2a7ec7b0
This commit is contained in:
Maciej Relewicz 2015-10-12 12:54:17 +02:00
parent c6877e0fb6
commit 7a0839231e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/fuel-migrate/fuel-migrate
View File

@ -5,7 +5,7 @@ SSHO="-o PasswordAuthentication=no -o ConnectTimeout=5"
config_bundle="fvm_disk_size fvm_name fvm_ram fvm_cpu migrate_log fuel_astute dkvm_folder \ config_bundle="fvm_disk_size fvm_name fvm_ram fvm_cpu migrate_log fuel_astute dkvm_folder \
admin_net_br admin_net_b_type other_net_bridges os_swap os_root os_var os_varlibdocker \ admin_net_br admin_net_b_type other_net_bridges os_swap os_root os_var os_varlibdocker \
os_varlog fm_reboot del_vm max_worktime" os_varlog fm_reboot del_vm max_worktime help"
work_bundle="dkvm_ip admin_net_ip_bs dkvm_uri admin_net_ip admin_net_if admin_net_nm \ work_bundle="dkvm_ip admin_net_ip_bs dkvm_uri admin_net_ip admin_net_if admin_net_nm \
src_disk dst_disk s_base start_time fvm_admin_mac admin_net_mac" src_disk dst_disk s_base start_time fvm_admin_mac admin_net_mac"
@ -37,6 +37,7 @@ descr_os_varlibdocker="Size of varlibdocker volume. By default 30% of the remain
descr_os_varlog="Size of varlog volume. By default 100% of the remaining free space." descr_os_varlog="Size of varlog volume. By default 100% of the remaining free space."
descr_del_vm="Remove destination VM if it already exists? 'yes' or 'no'. Default is 'no'" descr_del_vm="Remove destination VM if it already exists? 'yes' or 'no'. Default is 'no'"
descr_max_worktime="Timeout for entire migration process in seconds. Default is 7200" descr_max_worktime="Timeout for entire migration process in seconds. Default is 7200"
descr_help="Show this help message and exit"
indent="\t\t\t\t" indent="\t\t\t\t"
wtw="$(($(stty size | awk '{print $2}') - 32 ))" wtw="$(($(stty size | awk '{print $2}') - 32 ))"
@ -365,6 +366,8 @@ timeout(){
[[ "${BASH_SOURCE[0]}" != "${0}" ]] && return [[ "${BASH_SOURCE[0]}" != "${0}" ]] && return
# Show usage if run without parameters. # Show usage if run without parameters.
[[ -z $1 ]] && usage [[ -z $1 ]] && usage
# Show usage if help is chosen
[[ "$1" == "--help" ]] && usage
# Check if already running # Check if already running
file_lock file_lock