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

Fixed issue with AutoYast where it expects the FCP channel, WWPN, and LUN to all be in lower-case. Otherwise, AutoYast would not find the SCSI/FCP device.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16355 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2013-05-17 20:20:59 +00:00
parent cd354d6634
commit f4b3f09bb0
3 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/lib/xcat/plugins/zvm.pm
View File

@ -5122,6 +5122,11 @@ sub nodeSet {
while (length($device) < 4) {
$device = "0" . $device;
}
# zFCP variables must be in lower-case or AutoYast would get confused
$device = lc($device);
$wwpn = lc($wwpn);
$lun = lc($lun);
# Find tag in template and attach SCSI device associated with it
$out = `sed --in-place -e "s#$tag#/dev/disk/by-path/ccw-0.0.$device-zfcp-0x$wwpn:0x$lun#i" $customTmpl`;
@ -5362,6 +5367,11 @@ END
$device = "0" . $device;
}
# zFCP variables must be in lower-case or AutoYast would get confused.
$device = lc($device);
$wwpn = lc($wwpn);
$lun = lc($lun);
# Create zfcp section
$zfcpSection = "zfcp --devnum 0.0.$device --wwpn 0x$wwpn --fcplun 0x$lun" . '\n';

31
xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl
View File

@ -1,6 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE profile>
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
<general>
<mode>
<confirm config:type="boolean">false</confirm>
@ -292,7 +293,18 @@
<!-- Root partition and swap space -->
<drive>
<device>replace_root_device</device>
<initialize config:type="boolean">true</initialize>
<partitions config:type="list">
<partition>
<create config:type="boolean">true</create>
<filesystem config:type="symbol">swap</filesystem>
<format config:type="boolean">true</format>
<mount>swap</mount>
<mountby config:type="symbol">path</mountby>
<partition_id config:type="integer">130</partition_id>
<partition_nr config:type="integer">1</partition_nr>
<size>auto</size>
</partition>
<partition>
<create config:type="boolean">true</create>
<filesystem config:type="symbol">ext3</filesystem>
@ -300,25 +312,14 @@
<mount>/</mount>
<mountby config:type="symbol">path</mountby>
<partition_id config:type="integer">131</partition_id>
<partition_nr config:type="integer">1</partition_nr>
<partition_nr config:type="integer">2</partition_nr>
<size>max</size>
</partition>
<partition>
<create config:type="boolean">true</create>
<filesystem config:type="symbol">swap</filesystem>
<format config:type="boolean">true</format>
<mount>swap</mount>
<mountby config:type="symbol">path</mountby>
<partition_id config:type="integer">131</partition_id>
<partition_nr config:type="integer">1</partition_nr>
<partition_type>primary</partition_type>
<size>auto</size>
</partition>
</partitions>
<use>all</use>
</drive>
</partitioning>
<proxy>
<enabled config:type="boolean">false</enabled>
@ -369,7 +370,7 @@
replace_software_packages
</packages>
</software>
<!-- Time zone -->
<timezone>

27
xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE profile>
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
<general>
<mode>
<confirm config:type="boolean">false</confirm>
@ -293,7 +293,18 @@
<!-- Root partition and swap space -->
<drive>
<device>replace_root_device</device>
<initialize config:type="boolean">true</initialize>
<partitions config:type="list">
<partition>
<create config:type="boolean">true</create>
<filesystem config:type="symbol">swap</filesystem>
<format config:type="boolean">true</format>
<mount>swap</mount>
<mountby config:type="symbol">path</mountby>
<partition_id config:type="integer">130</partition_id>
<partition_nr config:type="integer">1</partition_nr>
<size>auto</size>
</partition>
<partition>
<create config:type="boolean">true</create>
<filesystem config:type="symbol">ext3</filesystem>
@ -301,24 +312,14 @@
<mount>/</mount>
<mountby config:type="symbol">path</mountby>
<partition_id config:type="integer">131</partition_id>
<partition_nr config:type="integer">1</partition_nr>
<partition_nr config:type="integer">2</partition_nr>
<size>max</size>
</partition>
<partition>
<create config:type="boolean">true</create>
<filesystem config:type="symbol">swap</filesystem>
<format config:type="boolean">true</format>
<mount>swap</mount>
<mountby config:type="symbol">path</mountby>
<partition_id config:type="integer">131</partition_id>
<partition_nr config:type="integer">1</partition_nr>
<partition_type>primary</partition_type>
<size>auto</size>
</partition>
</partitions>
<use>all</use>
</drive>
</partitioning>
<proxy>
<enabled config:type="boolean">false</enabled>