arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug when finding default disk pool.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11402 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2012-01-23 17:52:34 +00:00
parent 1f234f40fe
commit e7375935d3
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xCAT-UI/xcat/plugins/webportal.pm
View File

@ -618,7 +618,7 @@ sub clonezlinux {
# eckd_size = 10016
my $disk_pool;
my $default_conf = '/opt/zhcp/conf/default.conf';
my $default_direct = '/opt/zhcp/conf/default.direct';
my $default_direct = '/opt/zhcp/conf/profiles/default.direct';
# Exit if default.conf does not exist
if ( !(`ssh $hcp "test -e $default_conf && echo Exists"`) ) {
@ -634,15 +634,33 @@ sub clonezlinux {
my $out = `ssh $hcp "cat $default_conf"`;
my @tmp = split( /\n/, $out );
# default.conf should contain:
# Default configuration for virtual machines handled by this zHCP
# default_diskpool=POOL3
# compute_diskpool=POOL3
my $profile_diskpool_parm = '';
if ($profile) {
$profile_diskpool_parm = $profile . "_diskpool";
}
foreach (@tmp) {
# Get disk pool
if ( $_ =~ m/pool =/i ) {
# Get disk pool (default)
if ( $_ =~ m/default_diskpool=/i ) {
$disk_pool = $_;
$disk_pool =~ s/pool =//g;
$disk_pool =~ s/\s*$//; # Trim right
$disk_pool =~ s/^\s*//; # Trim left
$disk_pool =~ s/default_diskpool=//g;
}
# Get profile disk pool (default)
elsif ( $_ =~ m/$profile_diskpool_parm=/i && $profile_diskpool_parm) {
$disk_pool = $_;
$disk_pool =~ s/$profile_diskpool_parm=//g;
}
}
# Trim disk pool of white space
$disk_pool =~ s/\s*$//; # Trim right
$disk_pool =~ s/^\s*//; # Trim left
# Create VM
# e.g. webportal provzlinux [group] [hcp] [image]