From 5dba261cd172b628aa3f69c08bfac5409234056c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0001/1681] Remove trailing spaces in file ./xCAT-server/lib/xcat/plugins/dhcp.pm --- xCAT-server/lib/xcat/plugins/dhcp.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm index 1bd2e5357..ec08beded 100644 --- a/xCAT-server/lib/xcat/plugins/dhcp.pm +++ b/xCAT-server/lib/xcat/plugins/dhcp.pm @@ -587,7 +587,7 @@ sub addnode ); return; } - + my @macs = split(/\|/, $ent->{mac}); my $mace; my $deflstaments = $lstatements; From fd82746ab55460732602330ecf65acef95902b39 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0002/1681] Remove trailing spaces in file ./xCAT-server/lib/xcat/plugins/genimage.pm --- xCAT-server/lib/xcat/plugins/genimage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/genimage.pm b/xCAT-server/lib/xcat/plugins/genimage.pm index 3a7364eb7..0b97fec64 100644 --- a/xCAT-server/lib/xcat/plugins/genimage.pm +++ b/xCAT-server/lib/xcat/plugins/genimage.pm @@ -196,7 +196,7 @@ sub process_request { $postinstall_filename = $ref_linuximage_tab->{'postinstall'}; if ($postinstall_filename ne "") { foreach my $rawfile (split ',', $postinstall_filename) { - my ($file,@args)=split(" ",$rawfile); + my ($file,@args)=split(" ",$rawfile); if (!-r $file) { $callback->({ error => ["The postinstall_filename specified \'$file\' does not exist!"], errorcode => [1] }); return 1; From 021ed22d98e3bbc4078c90207d6a9c5badc555bd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0003/1681] Remove trailing spaces in file ./xCAT-server/share/xcat/install/scripts/post.rhels8 --- xCAT-server/share/xcat/install/scripts/post.rhels8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/install/scripts/post.rhels8 b/xCAT-server/share/xcat/install/scripts/post.rhels8 index 5d06b9df0..d875efbaa 100644 --- a/xCAT-server/share/xcat/install/scripts/post.rhels8 +++ b/xCAT-server/share/xcat/install/scripts/post.rhels8 @@ -15,6 +15,6 @@ do msgutil_r "$MASTER_IP" "info" "set NIC $nicname to be activated on system boot" "/var/log/xcat/xcat.log" ;; esac - sed -i 's/ONBOOT=no/ONBOOT=yes/' "$i" + sed -i 's/ONBOOT=no/ONBOOT=yes/' "$i" fi done From 461aa74609b344823d4eaee4fefc3ca00285713a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0004/1681] Remove trailing spaces in file ./xCAT-server/share/xcat/install/scripts/post.xcat.ng --- xCAT-server/share/xcat/install/scripts/post.xcat.ng | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat.ng b/xCAT-server/share/xcat/install/scripts/post.xcat.ng index c068ed882..83deac2fc 100644 --- a/xCAT-server/share/xcat/install/scripts/post.xcat.ng +++ b/xCAT-server/share/xcat/install/scripts/post.xcat.ng @@ -324,7 +324,7 @@ case "$XCATDEBUGMODE" in ;; esac -ln -s /etc/systemd/system/xcatpostinit1.service /etc/systemd/system/multi-user.target.wants/xcatpostinit1.service +ln -s /etc/systemd/system/xcatpostinit1.service /etc/systemd/system/multi-user.target.wants/xcatpostinit1.service case "$XCATDEBUGMODE" in "1"|"2") @@ -371,7 +371,7 @@ else esac fi -# Create the dskls post +# Create the dskls post cat >/opt/xcat/xcatdsklspost <<'EOF' #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost# EOF From cb99e7920b6b1734790c74ef7b875602eb2c13b9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0005/1681] Remove trailing spaces in file ./xCAT-server/share/xcat/install/sles/compute.sles12.tmpl --- xCAT-server/share/xcat/install/sles/compute.sles12.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl index 1bfc9c6ab..bf5a3764a 100644 --- a/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl +++ b/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl @@ -76,7 +76,7 @@ onboot - true + true false From 457daffc75770bc14d6bc35ed71223eae14a304a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0006/1681] Remove trailing spaces in file ./xCAT-test/autotest/testcase/mkdef/cases0 --- xCAT-test/autotest/testcase/mkdef/cases0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/mkdef/cases0 b/xCAT-test/autotest/testcase/mkdef/cases0 index cffe8c2a9..21e1214a9 100644 --- a/xCAT-test/autotest/testcase/mkdef/cases0 +++ b/xCAT-test/autotest/testcase/mkdef/cases0 @@ -268,7 +268,7 @@ check:output=~Error\: (\[.*?\]: )?The attribute \".+\" must be specified! cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test check:rc==1 check:output=~Error\: (\[.*?\]: )?The attribute \".+\" must be specified! -cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test hcp=test +cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test hcp=test check:rc==1 check:output=~Error\: (\[.*?\]: )?The attribute \".+\" must be specified! cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mtm=test hcp=test From 39e41d5837a232ffd6b8ba1060b9b3a25d8e58f4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0007/1681] Remove trailing spaces in file ./xCAT-test/autotest/testcase/xcat-inventory/cases.credential --- xCAT-test/autotest/testcase/xcat-inventory/cases.credential | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential index ddf9b5ab5..fb4014c7e 100644 --- a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential +++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential @@ -24,7 +24,7 @@ cmd:sed -i '$a\test' /etc/xcat/cert/server-cred.pem check:rc==0 cmd:sed -i '$a\test' /root/.xcat/client-key.pem check:rc==0 -cmd:xcat-inventory import -t credential -d /tmp/credential +cmd:xcat-inventory import -t credential -d /tmp/credential check:rc==0 check:output=~Inventory import successfully! check:output=~Warning: the /etc/xcat/ca/ca-cert.pem already exists, will be overwritten From 486ed3f6983e813d70ba5e4871b9ae6a3c6b6d77 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0008/1681] Remove trailing spaces in file ./xCAT-test/autotest/testcase/xcatconfig/case0 --- xCAT-test/autotest/testcase/xcatconfig/case0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0 index e37688b43..435197796 100644 --- a/xCAT-test/autotest/testcase/xcatconfig/case0 +++ b/xCAT-test/autotest/testcase/xcatconfig/case0 @@ -160,7 +160,7 @@ check:rc==0 cmd:cp -rf /install/postscripts/hostkeys /install/postscripts/hostkeysbak check:rc==0 #step2:run command and check messages -cmd:xcatconfig -s -c 2>&1 |tee /tmp/xcatconfig.test +cmd:xcatconfig -s -c 2>&1 |tee /tmp/xcatconfig.test check:rc==0 cmd:grep -iE "fail|error" /tmp/xcatconfig.test check:rc!=0 @@ -168,9 +168,9 @@ cmd:grep "Created xCAT certificate" /tmp/xcatconfig.test check:rc==0 cmd:grep "Generating new node hostkeys" /tmp/xcatconfig.test check:rc==0 -cmd:grep "Signature ok" /tmp/xcatconfig.test +cmd:grep "Signature ok" /tmp/xcatconfig.test check:rc==0 -cmd:grep "Generating SSH2 RSA Key" /tmp/xcatconfig.test +cmd:grep "Generating SSH2 RSA Key" /tmp/xcatconfig.test check:rc==0 #step3:Make sure /etc/xcat/hostkeys/ssh_host_rsa_key.pub is regenerated cmd:diff /etc/xcat/hostkeys/ssh_host_rsa_key.pub /etc/xcat/hostkeysbak/ssh_host_rsa_key.pub From 0932c35a310752ca7fd4fd3ce8bed673f7a5d99d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0009/1681] Remove trailing spaces in file ./xCAT-test/autotest/testcase/xcatd/case0 --- xCAT-test/autotest/testcase/xcatd/case0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/xcatd/case0 b/xCAT-test/autotest/testcase/xcatd/case0 index 3dd3b8e14..55a0504d6 100644 --- a/xCAT-test/autotest/testcase/xcatd/case0 +++ b/xCAT-test/autotest/testcase/xcatd/case0 @@ -81,7 +81,7 @@ cmd:service xcatd status check:output=~xcatd service|xcatd.service check:output=~xcatd service is running|active \(running\) check:rc==0 -cmd:service xcatd restart +cmd:service xcatd restart check:rc==0 cmd:sleep 10 cmd:service xcatd status From 820b6c2c46f24d2733ebf3ea20e3c15336461dce Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0010/1681] Remove trailing spaces in file ./xCAT/postscripts/injectservice --- xCAT/postscripts/injectservice | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT/postscripts/injectservice b/xCAT/postscripts/injectservice index f25cb0e69..99b53ac85 100755 --- a/xCAT/postscripts/injectservice +++ b/xCAT/postscripts/injectservice @@ -6,7 +6,7 @@ osver=$2 arch=$3 profile=$4 -#user-specified arguments in "postinstall" attribute +#user-specified arguments in "postinstall" attribute #the name of the service to inject servicename=$5 #the full path of the service unit file to inject on management node(non-chroot) From 5b37b2ead44788636dc1c17edd6169d14401c12d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0011/1681] Remove trailing spaces in file ./xCAT/postscripts/nicutils.sh --- xCAT/postscripts/nicutils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh index d72a4b00e..48f89ad1f 100755 --- a/xCAT/postscripts/nicutils.sh +++ b/xCAT/postscripts/nicutils.sh @@ -29,7 +29,7 @@ xargs="xargs" modprobe="modprobe" ######################################################################### -# ifdown/ifup will not be executed in diskful provision postscripts stage +# ifdown/ifup will not be executed in diskful provision postscripts stage ######################################################################### reboot_nic_bool=1 if [ -z "$UPDATENODE" ] || [ $UPDATENODE -ne 1 ] ; then From b6eb82675bbda31ffbf73a33e0bc23be09e1da06 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0012/1681] Remove trailing spaces in file .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c936bf7e..507fd0a77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ os: linux dist: trusty sudo: required -before_install: +before_install: - sudo apt-get install -y git reprepro devscripts debhelper libsoap-lite-perl libdbi-perl quilt openssh-server dpkg looptools genometools software-properties-common - perl -v - echo "yes" | sudo cpan -f -i Capture::Tiny -script: +script: - echo $TRAVIS_BUILD_ID - echo $TRAVIS_EVENT_TYPE - echo $TRAVIS_BUILD_NUMBER From 5c9d332cf069263ffd0676a6ca9ee638dc844680 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0013/1681] Remove trailing spaces in file build-ubunturepo --- build-ubunturepo | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-ubunturepo b/build-ubunturepo index 4026f08be..76d981c21 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -8,7 +8,7 @@ # Getting Started: # - Clone the xcat-core git repository under a directory named "xcat-core/src" # - make sure reprepro is installed on the build machine -# - Run this script from the local git repository you just created. +# - Run this script from the local git repository you just created. # ./build-ubunturepo -c BUILDALL=1 # Usage: attr=value attr=value ... ./build-ubunturepo { -c | -d } @@ -22,8 +22,8 @@ # When you are ready to release this build, use PROMOTE=1 without PREGA # BUILDALL=1 - build all rpms, whether they changed or not. Should be used for snap builds that are in # prep for a release. -# GPGSIGN=0 - Do not sign the repo in the end of the build. The repo will be signed by default -# +# GPGSIGN=0 - Do not sign the repo in the end of the build. The repo will be signed by default +# # LOG= - provide an LOG file option to redirect some output into log file # # DEST= - provide a directory to contains the build result @@ -334,7 +334,7 @@ __EOF__ if [ "$GPGSIGN" = "0" ];then #echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed" echo "" >> conf/distributions - else + else echo "SignWith: 5619700D" >> conf/distributions echo "" >> conf/distributions fi @@ -375,7 +375,7 @@ __EOF__ chmod 775 mklocalrepo.sh # - # Add a buildinfo file into the tar.bz2 file to track information about the build + # Add a buildinfo file into the tar.bz2 file to track information about the build # BUILDINFO=$local_core_repo_path/buildinfo echo "VERSION=$ver" > $BUILDINFO @@ -541,7 +541,7 @@ __EOF__ APT_DIR="${FRS}/xcat" APT_REPO_DIR="${APT_DIR}/repos/apt/devel" - # Decide whether to upload the xcat-dep package or NOT (default is to NOT upload xcat-dep + # Decide whether to upload the xcat-dep package or NOT (default is to NOT upload xcat-dep if [ "$UP" != "1" ]; then echo "Upload not specified, Done! (rerun with UP=1, to upload)" cd $old_pwd From 4b074877b901b56c3165506b31c9b88536d80e09 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0014/1681] Remove trailing spaces in file builddep.sh --- builddep.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/builddep.sh b/builddep.sh index 7a4e4de8f..2d7b221c1 100755 --- a/builddep.sh +++ b/builddep.sh @@ -3,21 +3,21 @@ # # Package up all the xCAT open source dependencies # - creating the yum repos -# - tar up the deps package +# - tar up the deps package # # This script assumes that the individual rpms have already been compiled # for the relevant architectures from the src & spec files in git. # # Dependencies: -# - createrepo command needs to be present on the build machine +# - createrepo command needs to be present on the build machine # # Usage: builddep.sh [attr=value attr=value ...] -# DESTDIR= - the dir to place the dep tarball in. The default is ../../../xcat-dep, +# DESTDIR= - the dir to place the dep tarball in. The default is ../../../xcat-dep, # relative to where this script is located. -# UP=0 or UP=1 - override the default upload behavior -# FRSYUM=0 - put the directory of individual rpms in the project web area instead +# UP=0 or UP=1 - override the default upload behavior +# FRSYUM=0 - put the directory of individual rpms in the project web area instead # of the FRS area. -# VERBOSE=1 - Set to 1 to see more VERBOSE output +# VERBOSE=1 - Set to 1 to see more VERBOSE output # you can change this if you need to USER=xcat @@ -45,7 +45,7 @@ fi if [ ! -d $GSA ]; then echo "ERROR: This script is intended to be used by xCAT development..." - echo "ERROR: The GSA directory ($GSA) directory does not appear to be mounted, cannot continue!" + echo "ERROR: The GSA directory ($GSA) directory does not appear to be mounted, cannot continue!" exit 1 fi @@ -73,7 +73,7 @@ XCATCOREDIR=`/bin/pwd` if [ -z "$DESTDIR" ]; then # This is really a hack here because it depends on the build # environment structure. However, it's not expected that - # users are building the xcat-dep packages + # users are building the xcat-dep packages DESTDIR=../../xcat-dep fi @@ -129,7 +129,7 @@ if [ "$OSNAME" != "AIX" ]; then echo "===> Modifying the xcat-dep.repo files to point to the correct location..." # 10/01/2015 - vkhu # The URLs have been updated in GSA, this section is not needed at the moment - # + # #if [ "$FRSYUM" != 0 ]; then # newurl="$YUMREPOURL2" # oldurl="$YUMREPOURL1" @@ -218,12 +218,12 @@ fi # Get the permissions and group correct if [ "$OSNAME" == "AIX" ]; then - # AIX + # AIX SYSGRP=system YUM=aix FRSDIR='2.x_AIX' else - # Linux + # Linux SYSGRP=root YUM=yum/devel FRSDIR='2.x_Linux' @@ -232,9 +232,9 @@ chgrp -R -h $SYSGRP * chmod -R g+w * echo "===> Building the tarball..." -# +# # Want to stay above xcat-dep so we can rsync the whole directory -# DO NOT CHANGE DIRECTORY AFTER THIS POINT!! +# DO NOT CHANGE DIRECTORY AFTER THIS POINT!! # cd .. pwd @@ -254,12 +254,12 @@ else tar $verbosetar -jcf $DFNAME xcat-dep fi -if [[ ${UP} -eq 0 ]]; then +if [[ ${UP} -eq 0 ]]; then echo "Upload not being done, set UP=1 to upload to xcat.org" exit 0; fi -# Upload the directory structure to xcat.org yum area (xcat/repos/yum). +# Upload the directory structure to xcat.org yum area (xcat/repos/yum). if [ "$FRSYUM" != 0 ]; then links="-L" # FRS does not support rsyncing sym links else @@ -284,7 +284,7 @@ echo "Uploading README to $FRS/xcat-dep/$FRSDIR/ ..." while [ $((i+=1)) -le 5 ] && ! rsync -v README $USER@$TARGET_MACHINE:$FRS/xcat-dep/$FRSDIR/ do : ; done -# For some reason the README is not updated +# For some reason the README is not updated echo "Uploading README to $YUMDIR/$YUM/ ..." while [ $((i+=1)) -le 5 ] && ! rsync -v README $USER@$TARGET_MACHINE:$YUMDIR/$YUM/ do : ; done From c440886cf50cbdffcbd6476c05d58c043440ed5f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0015/1681] Remove trailing spaces in file buildlocal.sh --- buildlocal.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/buildlocal.sh b/buildlocal.sh index 60da105aa..54bd06a86 100755 --- a/buildlocal.sh +++ b/buildlocal.sh @@ -35,7 +35,7 @@ ls $CURDIR/makerpm if [ $? -gt 0 ]; then echo "Error:no repo exist, exit 1." - exit 1 + exit 1 fi # Get a lock, so can not do 2 builds at once @@ -77,8 +77,8 @@ echo "This is an Ubuntu system" fi cd - mv ${rpmname_low}* $CURDIR/build - - done + + done #delete all files except .deb file find $CURDIR/build/* ! -name *.deb | xargs rm -f @@ -97,31 +97,31 @@ echo "This is an $OSNAME system" fi mkdir -p $CURDIR/build/ - + #always build perl-xCAT - $CURDIR/makerpm perl-xCAT - + $CURDIR/makerpm perl-xCAT + # Build the rest of the noarch rpms for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-test xCAT-buildkit xCAT-vlan; do - if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi + if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi $CURDIR/makerpm $rpmname done - + #build xCAT-genesis-scripts if it is x86_64 platform ARCH=$(uname -p) - if [ "$ARCH" = "x86_64" ]; then - $CURDIR/makerpm xCAT-genesis-scripts x86_64 + if [ "$ARCH" = "x86_64" ]; then + $CURDIR/makerpm xCAT-genesis-scripts x86_64 else $CURDIR/makerpm xCAT-genesis-scripts ppc64 fi - + # Build the xCAT and xCATsn rpms for all platforms for rpmname in xCAT xCATsn; do if [ "$OSNAME" = "AIX" ]; then $CURDIR/makerpm $rpmname - if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi + if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi else for arch in x86_64 ppc64 s390x; do $CURDIR/makerpm $rpmname $arch @@ -133,7 +133,7 @@ echo "This is an $OSNAME system" if [ "$OS" = "SUSE" ]; then cp /usr/src/packages/RPMS/noarch/* $CURDIR/build/ cp /usr/src/packages/RPMS/x86_64/* $CURDIR/build/ - cp /usr/src/packages/RPMS/ppc64/* $CURDIR/build/ + cp /usr/src/packages/RPMS/ppc64/* $CURDIR/build/ else cp /root/rpmbuild/RPMS/noarch/* $CURDIR/build/ cp /root/rpmbuild/RPMS/x86_64/* $CURDIR/build/ @@ -158,7 +158,7 @@ EOF rm -f /etc/zypp/repos.d/xcat-core.repo zypper ar file://$CURDIR/build xcat-core fi - + fi From 5763b084b139fd53aa47391309a41b2929dafd9f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0016/1681] Remove trailing spaces in file create_man_pages.py --- create_man_pages.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/create_man_pages.py b/create_man_pages.py index 2a5ff368a..01f24b03e 100755 --- a/create_man_pages.py +++ b/create_man_pages.py @@ -20,15 +20,15 @@ parser.add_option("--prefix", dest="PREFIX", help="Specify the location of the P POD2RST="pod2rst" def cmd_exists(cmd): - return subprocess.call("type " + cmd, shell=True, + return subprocess.call("type " + cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0 prefix_path = None prefix_lib_path = None -if options.PREFIX: +if options.PREFIX: if '~' in options.PREFIX: - # else assume full path is provided + # else assume full path is provided prefix_path = os.path.expanduser(options.PREFIX) else: prefix_path = options.PREFIX @@ -39,13 +39,13 @@ if options.PREFIX: sys.exit(1) prefix_lib_path = "%s/lib" %(prefix_path) - if not os.path.isdir(prefix_lib_path): + if not os.path.isdir(prefix_lib_path): prefix_lib_path = "%s/lib64" %(prefix_path) if not os.path.isdir(prefix_lib_path): print "ERROR, Cannot find the Perl lib directory in %s/lib or %s/lib64" %(prefix_path, prefix_path) sys.exit(1) -else: +else: if not cmd_exists(POD2RST): print "ERROR, %s requires pod2rst to continue!" %(os.path.basename(__file__)) parser.print_help() @@ -57,13 +57,13 @@ MANPAGE_DEST="./docs/source/guides/admin-guides/references/man" # # add the following to delete the generate files before creating them -# essentially this allows us to remove man pages and they will be +# essentially this allows us to remove man pages and they will be # removed in the generation print "Cleaning up the generated man pages in %s" %(MANPAGE_DEST) allfiles = glob("%s*/*.rst" %(MANPAGE_DEST)) -for d in allfiles: - # Skip over the index.rst file - if not "index.rst" in d: +for d in allfiles: + # Skip over the index.rst file + if not "index.rst" in d: print "Removing file %s" %(d) os.remove(d) @@ -93,18 +93,18 @@ def fix_double_dash(rst_file): os.system(sed_cmd) #remove intermediate .sed1 file rm_sed1file_cmd = "rm %s.sed1" %(rst_file) - os.system(rm_sed1file_cmd) + os.system(rm_sed1file_cmd) build_db_man_pages() # List the xCAT component directory which contain pod pages COMPONENTS = ['xCAT-SoftLayer', 'xCAT-test', 'xCAT-client', 'xCAT-vlan', 'perl-xCAT', 'xCAT-buildkit'] -for component in COMPONENTS: +for component in COMPONENTS: for root,dirs,files in os.walk("%s" %(component)): for file in files: - # only interested in .pod files + # only interested in .pod files if file.endswith(".pod"): pod_input = os.path.join(root,file) @@ -130,7 +130,7 @@ for component in COMPONENTS: cmd = "perl -I %s/share/perl5 %s/bin/%s " %(prefix_path, prefix_path, POD2RST) cmd += " --infile=%s --outfile=%s --title=%s.%s" %(pod_input, rst_output, title, man_ver) - # print cmd + # print cmd os.system(cmd) if man_ver == '1' or man_ver == '8': fix_vertical_bar(rst_output) From d8c6b79063de65212b804dfd8781d1e54253f1ce Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0017/1681] Remove trailing spaces in file docs/README.md --- docs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 67a8b8ac0..8b4779eaf 100644 --- a/docs/README.md +++ b/docs/README.md @@ -10,11 +10,11 @@ The documentation project is written in restructured text (.rst) using Sphinx an * Using pip, install or update sphinx (See: http://pip.readthedocs.org/) ``` - pip install sphinx + pip install sphinx ``` or ``` - pip install sphinx --upgrade + pip install sphinx --upgrade ``` * Using pip, install ReadTheDocs theme From 89db96a4a1cc4fc50608c6f44b5c6c9a5f5bf014 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0018/1681] Remove trailing spaces in file docs/source/QA/index.rst --- docs/source/QA/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/QA/index.rst b/docs/source/QA/index.rst index 2c8c72c0c..ed7466fed 100644 --- a/docs/source/QA/index.rst +++ b/docs/source/QA/index.rst @@ -5,4 +5,4 @@ Questions & Answers :maxdepth: 2 - makehosts.rst \ No newline at end of file + makehosts.rst From 496ea96d7657736cd99aaf0d9bfe7b8b6e8ab6e8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0019/1681] Remove trailing spaces in file docs/source/QA/makehosts.rst --- docs/source/QA/makehosts.rst | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/QA/makehosts.rst b/docs/source/QA/makehosts.rst index ba9755033..2c34bb586 100644 --- a/docs/source/QA/makehosts.rst +++ b/docs/source/QA/makehosts.rst @@ -67,15 +67,15 @@ Q: How to configure aliases? There are 3 methods to configure aliases: #. Use ``hostnames`` in ``hosts`` table to configure aliases for the installnic. -#. If you want to use script ``confignetwork`` to configure secondary NICs, suggest to use ``aliases`` in ``nics`` table to configure aliases. Refer to :doc:`Configure Aliases <../guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases>` -#. If you want to generate aliases records in ``/etc/hosts`` for secondary NICs and you don't want to use the script ``confignetwork`` to configure these NICs, suggest to use ``otherinterfaces`` in ``hosts`` table to configure aliases. Refer to following example: - +#. If you want to use script ``confignetwork`` to configure secondary NICs, suggest to use ``aliases`` in ``nics`` table to configure aliases. Refer to :doc:`Configure Aliases <../guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases>` +#. If you want to generate aliases records in ``/etc/hosts`` for secondary NICs and you don't want to use the script ``confignetwork`` to configure these NICs, suggest to use ``otherinterfaces`` in ``hosts`` table to configure aliases. Refer to following example: + * If you want to add ``node1-hd`` ``20.1.1.1`` in ``hosts`` table, and don't use ``confignetwork`` to configure it, you can add ``otherinterfaces`` like this: :: - chdef node1 otherinterfaces="node1-hd:20.1.1.1" + chdef node1 otherinterfaces="node1-hd:20.1.1.1" * After executing ``makehosts -n``, you can get records in ``/etc/hosts`` like following: :: - + 20.1.1.1 node1-hd **Note**: If suffixes or aliases for the same IP are configured in both ``hosts`` table and ``nics`` table, will cause conflicts. ``makehosts`` will use values from ``nics`` table. The values from ``nics`` table will over-write that from ``hosts`` table to create ``/etc/hosts`` records. @@ -90,7 +90,7 @@ You can follow the best practice example. * There are 2 networks in different domains: ``mgtnetwork`` and ``pubnetwork`` * ``mgtnetwork`` is xCAT management network * Generate 2 records with the same hostname in ``/etc/hosts``, like: :: - + 10.5.106.101 node1.cluster.com 192.168.20.101 node1.public.com @@ -101,11 +101,11 @@ You can follow the best practice example. #. Add networks entry in ``networks`` table: :: chdef -t network mgtnetwork net=10.0.0.0 mask=255.0.0.0 domain=cluster.com - chdef -t network pubnetwork net=192.168.30.0 mask=255.255.255.0 domain=public.com - + chdef -t network pubnetwork net=192.168.30.0 mask=255.255.255.0 domain=public.com + #. Create ``node1`` with ``ip=10.5.106.101``, xCAT can manage and install this node: :: - - chdef node1 ip=10.5.106.101 groups=all + + chdef node1 ip=10.5.106.101 groups=all #. Create ``node1-pub`` with ``ip=192.168.30.101``, this node is only used to generate ``/etc/hosts`` records for public network, can use ``_unmanaged`` group name to label it: :: @@ -114,9 +114,9 @@ You can follow the best practice example. #. Execute ``makehosts -n`` to generate ``/etc/hosts`` records: :: makehosts -n - + #. Check results in ``/etc/hosts``: :: - + 10.5.106.101 node1 node1.cluster.com 192.168.30.101 node1-pub node1.public.com From 82420f783834d8b356ad57d32af0fda2e81b18b0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0020/1681] Remove trailing spaces in file docs/source/QA/makehosts_qa.rst --- docs/source/QA/makehosts_qa.rst | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/QA/makehosts_qa.rst b/docs/source/QA/makehosts_qa.rst index f0c425b87..375c4c75b 100644 --- a/docs/source/QA/makehosts_qa.rst +++ b/docs/source/QA/makehosts_qa.rst @@ -66,15 +66,15 @@ Q: How to configure aliases? There are 3 methods to configure aliases: #. Use ``hostnames`` in ``hosts`` table to configure aliases for the installnic. -#. If you want to use script ``confignetwork`` to configure secondary NICs, suggest to use ``aliases`` in ``nics`` table to configure aliases, you can refer to :doc:`Configure Aliases <../guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases>` -#. If you want to generate aliases records in ``/etc/hosts`` for secondary NICs, and don't want to use script ``confignetwork`` to configure these NICs, suggest to use ``otherinterfaces`` in ``hosts`` table to configure aliases. You can refer to following example: - +#. If you want to use script ``confignetwork`` to configure secondary NICs, suggest to use ``aliases`` in ``nics`` table to configure aliases, you can refer to :doc:`Configure Aliases <../guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases>` +#. If you want to generate aliases records in ``/etc/hosts`` for secondary NICs, and don't want to use script ``confignetwork`` to configure these NICs, suggest to use ``otherinterfaces`` in ``hosts`` table to configure aliases. You can refer to following example: + * If you want to add ``node1-hd`` ``20.1.1.1`` in ``hosts`` table, and don't use ``confignetwork`` to configure it, you can add ``otherinterfaces`` like this: :: - chdef node1 otherinterfaces="node1-hd:20.1.1.1" + chdef node1 otherinterfaces="node1-hd:20.1.1.1" * After executing ``makehosts -n``, you can get records in ``/etc/hosts`` like following: :: - + 20.1.1.1 node1-hd **Note**: If suffixes or aliases for the same IP are configured in both ``hosts`` table and ``nics`` table, will cause conflicts. ``makehosts`` will use values from ``nics`` table. The values from ``nics`` table will over-write that from ``hosts`` table to create ``/etc/hosts`` records. @@ -89,7 +89,7 @@ You can follow the best practice example. * There are 2 networks in different domains: ``mgtnetwork`` and ``pubnetwork`` * ``mgtnetwork`` is xCAT management network * Generate 2 records with the same hostname in ``/etc/hosts``, like: :: - + 10.5.106.101 node1.cluster.com 192.168.20.101 node1.public.com @@ -100,11 +100,11 @@ You can follow the best practice example. #. Add networks entry in ``networks`` table: :: chdef -t network mgtnetwork net=10.0.0.0 mask=255.0.0.0 domain=cluster.com - chdef -t network pubnetwork net=192.168.30.0 mask=255.255.255.0 domain=public.com - + chdef -t network pubnetwork net=192.168.30.0 mask=255.255.255.0 domain=public.com + #. Create ``node1`` with ``ip=10.5.106.101``, xCAT can manage and install this node: :: - - chdef node1 ip=10.5.106.101 groups=all + + chdef node1 ip=10.5.106.101 groups=all #. Create ``node1-pub`` with ``ip=192.168.30.101``, this node is only used to generate ``/etc/hosts`` records for public network, can use ``_unmanaged`` group name to label it: :: @@ -113,9 +113,9 @@ You can follow the best practice example. #. Execute ``makehosts -n`` to generate ``/etc/hosts`` records: :: makehosts -n - + #. Check results in ``/etc/hosts``: :: - + 10.5.106.101 node1 node1.cluster.com 192.168.30.101 node1-pub node1.public.com From 0afe2ee73a0e3441db4072f74115f215a6da044d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0021/1681] Remove trailing spaces in file docs/source/advanced/chain/chain_table.rst --- docs/source/advanced/chain/chain_table.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/chain/chain_table.rst b/docs/source/advanced/chain/chain_table.rst index b12a86863..1cee2d238 100644 --- a/docs/source/advanced/chain/chain_table.rst +++ b/docs/source/advanced/chain/chain_table.rst @@ -7,8 +7,8 @@ The chain table (``tabdump chain``) is an xCAT database table that holds the cha * currchain * chain -To know how are those three attributes used, reference the picture: +To know how are those three attributes used, reference the picture: + +.. image:: chain_tasks_logic.png -.. image:: chain_tasks_logic.png - From 3c15dfb0f30e12624e65eb03f5f23957cad0b77d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0022/1681] Remove trailing spaces in file docs/source/advanced/chain/chain_tasks.rst --- docs/source/advanced/chain/chain_tasks.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/chain/chain_tasks.rst b/docs/source/advanced/chain/chain_tasks.rst index 4c840ef5f..725752ae5 100644 --- a/docs/source/advanced/chain/chain_tasks.rst +++ b/docs/source/advanced/chain/chain_tasks.rst @@ -18,14 +18,14 @@ Currently only the ``bmcsetup`` command is officially supplied by xCAT to run to runimage= **URL** is a string which can be run by ``wget`` to download the image from the URL. The example could be: :: - + runimage=http:////image.tgz The ``image.tgz`` **must** have the following properties: * Created using the ``tar zcvf`` command * The tarball must include a ``runme.sh`` script to initiate the execution of the runimage -To create your own image, reference :ref:`creating image for runimage `. +To create your own image, reference :ref:`creating image for runimage `. **Tip**: You could try to run ``wget http:////image.tgz`` manually to make sure the path has been set correctly. @@ -41,5 +41,5 @@ Causes the genesis kernel to create a shell for the administrator to log in and * standby -Causes the genesis kernel to go into standby and wait for tasks from the chain. ... +Causes the genesis kernel to go into standby and wait for tasks from the chain. ... From c2960e0a84bd4d5991237e994c004c8ae3fd3aab Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0023/1681] Remove trailing spaces in file docs/source/advanced/chain/create_image_for_runimage.rst --- docs/source/advanced/chain/create_image_for_runimage.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/chain/create_image_for_runimage.rst b/docs/source/advanced/chain/create_image_for_runimage.rst index fe029e1b0..a8d68339b 100644 --- a/docs/source/advanced/chain/create_image_for_runimage.rst +++ b/docs/source/advanced/chain/create_image_for_runimage.rst @@ -14,7 +14,7 @@ How to prepare a image for ``runimage`` in ``chain`` * go to the directory and run `tar -zcvf .` * Example - In the example, it shows how to install an independent pkg a.rpm + In the example, it shows how to install an independent pkg a.rpm * Create the directory for the image: :: @@ -29,7 +29,7 @@ How to prepare a image for ``runimage`` in ``chain`` cat runme.sh echo "start installing a.rpm" - rpm -ivh a.rpm + rpm -ivh a.rpm * modify the runme.sh script permission: :: From c6f4be282383fae4464cd642ff1b8073324f3ad0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0024/1681] Remove trailing spaces in file docs/source/advanced/chain/index.rst --- docs/source/advanced/chain/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/chain/index.rst b/docs/source/advanced/chain/index.rst index 48b556b2e..7cbce0ca0 100644 --- a/docs/source/advanced/chain/index.rst +++ b/docs/source/advanced/chain/index.rst @@ -12,4 +12,4 @@ The **chain** mechanism is implemented in xCAT genesis system. The genesis is a chain_tasks.rst run_tasks_during_discovery.rst run_tasks_to_configure.rst - + From 6717df56e4ad622515394b90c5c8659f27203a01 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0025/1681] Remove trailing spaces in file docs/source/advanced/cluster_maintenance/compute_node/index.rst --- docs/source/advanced/cluster_maintenance/compute_node/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/cluster_maintenance/compute_node/index.rst b/docs/source/advanced/cluster_maintenance/compute_node/index.rst index 87bc1c733..6f5374589 100644 --- a/docs/source/advanced/cluster_maintenance/compute_node/index.rst +++ b/docs/source/advanced/cluster_maintenance/compute_node/index.rst @@ -4,5 +4,5 @@ Compute Node .. toctree:: :maxdepth: 2 - changing_hostname_ip.rst + changing_hostname_ip.rst replace/index.rst From d171ed5484d4d51e7da81f7e5a1d86b219813869 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0026/1681] Remove trailing spaces in file docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst --- .../compute_node/replace/openpower.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst b/docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst index 018de0672..39b2a4e2f 100644 --- a/docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst +++ b/docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst @@ -4,7 +4,7 @@ OpenPOWER Nodes When compute nodes are physically replaced in the frame, leverage xCAT to re-discover the compute nodes. The following guide can be used for: - * IBM OpenPOWER S822LC for HPC + * IBM OpenPOWER S822LC for HPC #. Identify the machine(s) to be replaced: ``frame10cn02``. @@ -15,24 +15,24 @@ When compute nodes are physically replaced in the frame, leverage xCAT to re-dis #. Set the outgoing machine to ``offline`` and remove attributes of the machine: :: - nodeset frame10cn02 offline + nodeset frame10cn02 offline chdef frame10cn02 mac="" #. If using **MTMS**-based discovery, fill in the Model-Type and Serial Number for the machine: :: chdef frame10cn02 mtm=8335-GTB serial= -#. If using **SWITCH**-based discovery, go on to the next step. The ``switch`` and ``switch-port`` should already be set in the compute node definition. +#. If using **SWITCH**-based discovery, go on to the next step. The ``switch`` and ``switch-port`` should already be set in the compute node definition. Node attributes will be replaced during the discovery process (mtm, serial, mac, etc.) #. Search for the new BMC in the open range: :: - bmcdiscover --range -w -z + bmcdiscover --range -w -z #. When the BMC is found, start the discovery with the following commands: :: rsetboot /node-8335.* net - rpower /node-8335.* boot + rpower /node-8335.* boot From f4aa35c465c6a4c41080bf6d9f0342749ca78100 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0027/1681] Remove trailing spaces in file docs/source/advanced/cluster_maintenance/index.rst --- docs/source/advanced/cluster_maintenance/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/cluster_maintenance/index.rst b/docs/source/advanced/cluster_maintenance/index.rst index e4fcb7ff7..de21e9e6d 100644 --- a/docs/source/advanced/cluster_maintenance/index.rst +++ b/docs/source/advanced/cluster_maintenance/index.rst @@ -4,7 +4,7 @@ Cluster Maintenance .. toctree:: :maxdepth: 2 - compute_node/index.rst + compute_node/index.rst mgmt_node/index.rst service_node/index.rst sw_fw_inventory.rst From f0b9494a09eab416650250790249948e2e3f0604 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0028/1681] Remove trailing spaces in file docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst --- .../mgmt_node/changing_hostname_ip.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst b/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst index 5dbccfa64..e0d4724b5 100644 --- a/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst +++ b/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst @@ -70,7 +70,7 @@ Nothing to do. PostgreSQL ^^^^^^^^^^ -- Edit ``/etc/xcat/cfgloc`` file... +- Edit ``/etc/xcat/cfgloc`` file... Replace ``Pg:dbname=xcatdb;host=|xcatadm|xcat20`` with ``Pg:dbname=xcatdb;host=|xcatadm|xcat20``. @@ -81,7 +81,7 @@ PostgreSQL MySQL ^^^^^ -- Edit ``/etc/xcat/cfglooc``... +- Edit ``/etc/xcat/cfglooc``... Replace ``mysql:dbname=xcatdb;host=|xcatadmin|xcat20`` with ``mysql:dbname=xcatdb;host=|xcatadmin|xcat20`` Start the database @@ -151,7 +151,7 @@ For example, the old IP address was "10.6.0.1" chdef -t node cn1-cn4 conserver= -* Repeat the same process for the other attributes containing the old IP address. +* Repeat the same process for the other attributes containing the old IP address. Change networks table ^^^^^^^^^^^^^^^^^^^^^ @@ -178,7 +178,7 @@ If the old address still exists in the ``*.csv`` file, you can edit this file, t Generate SSL credentials(optional) ---------------------------------- -Use the following command to generate new SSL credentials: ``xcatconfig -c``. +Use the following command to generate new SSL credentials: ``xcatconfig -c``. Then update the following in xCAT: From 7e2aa23cae3483a0caf41cb0262a3a6ee812d689 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0029/1681] Remove trailing spaces in file docs/source/advanced/cluster_maintenance/mgmt_node/index.rst --- docs/source/advanced/cluster_maintenance/mgmt_node/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/cluster_maintenance/mgmt_node/index.rst b/docs/source/advanced/cluster_maintenance/mgmt_node/index.rst index 2cda13bd9..e97f304db 100644 --- a/docs/source/advanced/cluster_maintenance/mgmt_node/index.rst +++ b/docs/source/advanced/cluster_maintenance/mgmt_node/index.rst @@ -4,4 +4,4 @@ Management Node .. toctree:: :maxdepth: 2 - changing_hostname_ip.rst + changing_hostname_ip.rst From 9608386f43a9cd7df96c0e358bb55107d3bda25a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0030/1681] Remove trailing spaces in file docs/source/advanced/cluster_maintenance/service_node/index.rst --- docs/source/advanced/cluster_maintenance/service_node/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/cluster_maintenance/service_node/index.rst b/docs/source/advanced/cluster_maintenance/service_node/index.rst index bf5a4e05d..532e9758a 100644 --- a/docs/source/advanced/cluster_maintenance/service_node/index.rst +++ b/docs/source/advanced/cluster_maintenance/service_node/index.rst @@ -4,4 +4,4 @@ Service Node .. toctree:: :maxdepth: 2 - changing_hostname_ip.rst + changing_hostname_ip.rst From 862550265a04874a49b2c8969e892cde99457a1e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0031/1681] Remove trailing spaces in file docs/source/advanced/confluent/client/confluent_client.rst --- .../advanced/confluent/client/confluent_client.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/advanced/confluent/client/confluent_client.rst b/docs/source/advanced/confluent/client/confluent_client.rst index 335ed8c6c..7873c6e2f 100644 --- a/docs/source/advanced/confluent/client/confluent_client.rst +++ b/docs/source/advanced/confluent/client/confluent_client.rst @@ -5,7 +5,7 @@ Starting the confetty client As the root user, running ``/opt/confluent/bin/confetty`` will open the confetty prompt :: [root@c910f02c05p03 ~]# /opt/confluent/bin/confetty - / -> + / -> Creating a non root user ======================== @@ -26,19 +26,19 @@ It's recommenteed to create a non root user to use to connect to confetty password="********" -Connecting to a remote server +Connecting to a remote server ============================= In order to do remote sessions, keys must first be added to ``/etc/confluent`` -* /etc/confluent/privkey.pem - private key +* /etc/confluent/privkey.pem - private key * /etc/confluent/srvcert.pem - server cert If you want to use the xCAT Keys, you can simple copy them into ``/etc/confluent`` :: cp /etc/xcat/cert/server-key.pem /etc/confluent/privkey.pem - cp /etc/xcat/cert/server-cert.pem /etc/confluent/srvcert.pem + cp /etc/xcat/cert/server-cert.pem /etc/confluent/srvcert.pem The user and password may alternatively be provided via environment variables: :: @@ -55,4 +55,4 @@ If you want to run a confluent command against another host, could set the CONFL CONFLUENT_HOST= export CONFLUENT_HOST - + From 8585c016317cfd38e366d7c1944190a5377209d7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0032/1681] Remove trailing spaces in file docs/source/advanced/confluent/client/index.rst --- docs/source/advanced/confluent/client/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/confluent/client/index.rst b/docs/source/advanced/confluent/client/index.rst index 8058d7437..81e2078eb 100644 --- a/docs/source/advanced/confluent/client/index.rst +++ b/docs/source/advanced/confluent/client/index.rst @@ -4,4 +4,4 @@ confluent-client .. toctree:: :maxdepth: 2 - confluent_client.rst + confluent_client.rst From 40de346c4d6292d03e77ec29e450ae3554c5d2dd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0033/1681] Remove trailing spaces in file docs/source/advanced/confluent/index.rst --- docs/source/advanced/confluent/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/confluent/index.rst b/docs/source/advanced/confluent/index.rst index dc8bb7737..9cbc0cd04 100644 --- a/docs/source/advanced/confluent/index.rst +++ b/docs/source/advanced/confluent/index.rst @@ -1,9 +1,9 @@ -Confluent +Confluent ========= Confluent is a new codebase with a few goals in mind: -* Augment xCAT 2.X series +* Augment xCAT 2.X series * Potentially serve in place of xCAT-server for the next generation of xCAT **Disclaimer:** *Confluent code in conjunction with xCAT 2.X is currently BETA, use at your own risk* From 35b6fc49cf282702a22363fa6e454f65908563f5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0034/1681] Remove trailing spaces in file docs/source/advanced/confluent/server/confluent_server.rst --- .../advanced/confluent/server/confluent_server.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/advanced/confluent/server/confluent_server.rst b/docs/source/advanced/confluent/server/confluent_server.rst index 6eccd2d71..233f9a1fa 100644 --- a/docs/source/advanced/confluent/server/confluent_server.rst +++ b/docs/source/advanced/confluent/server/confluent_server.rst @@ -1,8 +1,8 @@ -Getting Started +Getting Started =============== -Confluent is intended to be used in conjunction with xCAT. +Confluent is intended to be used in conjunction with xCAT. The following documentation assumes that xCAT is already installed and configured on the management node. Download confluent @@ -20,7 +20,7 @@ To build from source, ensure your machine has the correct development packages t cd confluent/confluent_client ; ./buildrpm ; cd - -Install +Install ======= dependency @@ -59,7 +59,7 @@ To start confluent:: service confluent start To stop confluent:: - + service confluent stop If you want confluent daemon to start automatically at bootup, add confluent service to ``chkconfig``:: @@ -113,11 +113,11 @@ Configure the httpd configuration for confluent-api by creating a ``confluent.co ProxyPass http://10.2.5.3:4005 - - # restart httpd + + # restart httpd service httpd restart -Now point your browser to: ``http://:`` and log in with the non-root user and password created above. +Now point your browser to: ``http://:`` and log in with the non-root user and password created above. Confluent consoles ================== From d3afa68eca132bd063e1fce48d051c76ad1ad8a3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0035/1681] Remove trailing spaces in file docs/source/advanced/confluent/server/index.rst --- docs/source/advanced/confluent/server/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/confluent/server/index.rst b/docs/source/advanced/confluent/server/index.rst index 4af5f08c1..3f439d78d 100644 --- a/docs/source/advanced/confluent/server/index.rst +++ b/docs/source/advanced/confluent/server/index.rst @@ -1,8 +1,8 @@ -confluent-server +confluent-server ================ .. toctree:: :maxdepth: 2 - confluent_server.rst + confluent_server.rst From dd5553008c19c9185434c2a9060c82f289efcc90 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0036/1681] Remove trailing spaces in file docs/source/advanced/docker/docker_registry.rst --- docs/source/advanced/docker/docker_registry.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/docker/docker_registry.rst b/docs/source/advanced/docker/docker_registry.rst index 591f20d49..f088fbe57 100644 --- a/docs/source/advanced/docker/docker_registry.rst +++ b/docs/source/advanced/docker/docker_registry.rst @@ -36,7 +36,7 @@ Create Configuration File ''''''''''''''''''''''''' Define configuration file ``docker-registry`` under ``/docker-registry/`` folder as below. :: - + #!/bin/bash docker_command=$1 @@ -84,7 +84,7 @@ Start registry service: :: Method 2: Managing Docker Registry with Compose ``````````````````````````````````````````````` -Docker Compose it is a tool for defining and running Docker applications. It could help setting up registry. +Docker Compose it is a tool for defining and running Docker applications. It could help setting up registry. Install Docker Compose '''''''''''''''''''''' @@ -147,10 +147,10 @@ List Available Images in Registry ````````````````````````````````````` :: - curl -k https://domainname:5000/v2/_catalog + curl -k https://domainname:5000/v2/_catalog Pull Images from Registry -````````````````````````` +````````````````````````` Just use the "tag" image name, which includes the domain name, port, and image name. :: docker pull domainname:5000/imagename From dec80959c2220f1a8734c1f629e0cb42dabafd17 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0037/1681] Remove trailing spaces in file docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst --- .../dockerized_xcat/dockerized_xcat.rst | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst b/docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst index e1d9dba6b..e6eb29fff 100644 --- a/docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst +++ b/docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst @@ -16,7 +16,7 @@ Overview :align: right -**Compose** is a native tool shipped by Docker to define and run applications in Docker containers. You use a Compose file to configure your applications/services. Then, using a single command, you create and start all the services from your configuration. +**Compose** is a native tool shipped by Docker to define and run applications in Docker containers. You use a Compose file to configure your applications/services. Then, using a single command, you create and start all the services from your configuration. By pulling xCAT Docker image and running xCAT Docker image in a container, you get a well-configured xCAT Management Node to start cluster management work, without worrying about the xCAT installation and configuration on different OS and various hardware platforms. @@ -24,10 +24,10 @@ By pulling xCAT Docker image and running xCAT Docker image in a container, you g xCAT Docker images ------------------ -xCAT ships 2 Docker images for Docker host with different architecture: +xCAT ships 2 Docker images for Docker host with different architecture: * "xcat/xcat-ubuntu-x86_64": run on x86_64 Docker host -* "xcat/xcat-ubuntu-ppc64le": run on ppc64le Docker host +* "xcat/xcat-ubuntu-ppc64le": run on ppc64le Docker host Each of the xCAT Docker images above has 3 tags corresponding to different xCAT release inside Docker image: @@ -44,7 +44,7 @@ Run xCAT in Docker Each container with xCAT Docker image running inside is a xCAT management node, the container connects to the compute nodes and hardware control points in the cluster via "bridge" network on the Docker host. Generally, a xCAT container should connect to 2 types of networks( the 2 types of networks might be one network in some cluster): * "mgtnet": Management network, the network used by the Management Node to install operating systems and manage the nodes. The Management Node and in-band Network Interface Card (NIC) of the nodes are connected to this network. A bridge "mgtbr" will be created and attached to the network interface facing the compute nodes on Docker host -* "svcnet": Service network, the network used by the Management Node to control the nodes using out-of-band management using the Service Processor. A bridge "svcbr" will be created and attached to the network interface facing the hardware control points +* "svcnet": Service network, the network used by the Management Node to control the nodes using out-of-band management using the Service Processor. A bridge "svcbr" will be created and attached to the network interface facing the hardware control points You are required to determine and specify some necessary information, so that xCAT is well configured and running when the container is started. This includes: @@ -52,7 +52,7 @@ You are required to determine and specify some necessary information, so that xC * network information: the network configuration of the xCAT container * cluster information: the domain of the cluster -The information can be specified in 2 ways to run xCAT container: +The information can be specified in 2 ways to run xCAT container: * in options and arguments of docker commands such as ``docker network create`` or ``docker run`` * in the "docker-compose.yml", which contains all the configuration to start xCAT containers with Compose. This is the recommended way to start xCAT container. @@ -66,7 +66,7 @@ When xCAT Docker container is started, you can access it with ``sudo docker atta .. toctree:: :maxdepth: 2 - setup_docker_host.rst + setup_docker_host.rst run_xcat_in_docker_compose.rst run_xcat_in_docker_native.rst @@ -77,21 +77,21 @@ Work with xCAT Once xCAT Docker container is running, you can use xCAT with the shell inside the container. Since the ssh service has been enabled on the Docker container startup, you can connect to the container via ssh. The default root password is "cluster". -Once you attach or ssh to the container, you will find that xCAT is running and configured, you can play with xCAT and manage your cluster now. +Once you attach or ssh to the container, you will find that xCAT is running and configured, you can play with xCAT and manage your cluster now. Currently, since xCAT can only generate the diskless osimages of Linux distributions with the same OS version and architecture with xCAT MN. If you need to provision diskless osimages besides ubuntu x86_64 with xCAT running in the Docker, you can use ``imgexport`` and ``imgimport`` to import the diskless osimages generated before. If you start up the xCAT Docker container by following the steps described in sections above strictly, without specifying "--dns=IP_ADDRESS...", "--dns-search=DOMAIN...", or "--dns-opt=OPTION..." options, Docker uses the /etc/resolv.conf of the host machine (where the docker daemon runs). Any DNS problem inside container, make sure the DNS server on the Docker host works well. -Save and Restore xCAT data +Save and Restore xCAT data ---------------------------- -According to the policy of Docker, Docker image should only be the service deployment unit, it is not recommended to save data in Docker image. Docker uses "Data Volume" to save persistent data inside container, which can be simply taken as a shared directory between Docker host and Docker container. +According to the policy of Docker, Docker image should only be the service deployment unit, it is not recommended to save data in Docker image. Docker uses "Data Volume" to save persistent data inside container, which can be simply taken as a shared directory between Docker host and Docker container. For dockerized xCAT, there are 3 volumes recommended to save and restore xCAT user data. -* "/install": save the osimage resources under "/install" directory -* "/var/log/xcat/": save xCAT logs +* "/install": save the osimage resources under "/install" directory +* "/var/log/xcat/": save xCAT logs * "/.dbbackup": save and restore xCAT DB tables. You can save the xCAT DB tables with ``dumpxCATdb -p /.dbbackup/`` inside container and xCAT will restore the tables on the container start up. From 9165485e5efe70d82caf75308bfab74b4c2d178e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0038/1681] Remove trailing spaces in file docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst --- .../run_xcat_in_docker_compose.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst b/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst index 5a21e83d8..c50d05e68 100644 --- a/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst +++ b/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst @@ -3,14 +3,14 @@ Run xCAT in Docker with Compose (Recommended) An example configuration in the documentation ---------------------------------------------- +--------------------------------------------- To demonstrate the steps to run xCAT in a Docker container, take a cluster with the following configuration as an example :: - The name of the docker container running xCAT: xcatmn + The name of the docker container running xCAT: xcatmn The hostname of container xcatmn: xcatmn - The dns domain of the cluster: clusters.com + The dns domain of the cluster: clusters.com The management network object: mgtnet The network bridge of management network on Docker host: mgtbr @@ -24,7 +24,7 @@ To demonstrate the steps to run xCAT in a Docker container, take a cluster with The IP address of eno2 on Docker host: 192.168.0.1/8 The IP address of xCAT container in service network: 192.168.0.101 - + Install Compose on Docker host ------------------------------ @@ -34,27 +34,27 @@ Compose v1.7.0 or above should be installed on Docker host: :: chmod +x /usr/local/bin/docker-compose -Customize docker-compose file +Customize docker-compose file ----------------------------- -xCAT ships a docker-compose template `docker-compose.yml `_, which is a self-description file including all the configurations to run xCAT in container. You can make up your compose file based on it if you are familiar with `Compose file `_ , otherwise, you can simply customize it with the following steps: +xCAT ships a docker-compose template `docker-compose.yml `_, which is a self-description file including all the configurations to run xCAT in container. You can make up your compose file based on it if you are familiar with `Compose file `_ , otherwise, you can simply customize it with the following steps: 1. Specify the xCAT Docker image :: - image: [xCAT Docker image name]:[tag] - -specify the name and tag of xCAT Docker image, for example "xcat/xcat-ubuntu-x86_64:2.11" + image: [xCAT Docker image name]:[tag] -2. Specify the cluster domain name +specify the name and tag of xCAT Docker image, for example "xcat/xcat-ubuntu-x86_64:2.11" -:: +2. Specify the cluster domain name + +:: extra_hosts: - "xcatmn.[cluster domain name] xcatmn:[Container's IP address in management network]" -specify the cluster domain name,i.e, "site.domain" on xCAT Management Node, for example "clusters.com", and the IP address of xCAT Docker container in the management network, such as "10.5.107.101" +specify the cluster domain name,i.e, "site.domain" on xCAT Management Node, for example "clusters.com", and the IP address of xCAT Docker container in the management network, such as "10.5.107.101" 3. Specify the IP address of xCAT container in service network and management network @@ -66,7 +66,7 @@ specify the cluster domain name,i.e, "site.domain" on xCAT Management Node, for ipv4_address : [Container's IP address in service network] mgtnet: - ipv4_address : [Container's IP address in management network] + ipv4_address : [Container's IP address in management network] specify the IP address of Docker container in service network and management network. If the "svcnet" is the same as "mgtnet", the 2 "svcnet" lines should be commented out. @@ -75,30 +75,30 @@ specify the IP address of Docker container in service network and management net :: networks: - - #management network, attached to the network interface on Docker host + + #management network, attached to the network interface on Docker host #facing the nodes to provision mgtnet: driver: "bridge" - driver_opts: - com.docker.network.bridge.name: "mgtbr" - ipam: - config: + driver_opts: + com.docker.network.bridge.name: "mgtbr" + ipam: + config: - subnet: [subnet of mgtbr in CIDR] gateway:[IP address of mgtbr] - + #service network, attached to the network interface on #Docker host facing the bmc network svcnet: driver: "bridge" - driver_opts: - com.docker.network.bridge.name: "svcbr" - ipam: - config: + driver_opts: + com.docker.network.bridge.name: "svcbr" + ipam: + config: - subnet: [subnet of svcbr in CIDR] gateway: [IP address of svcbr] - -specify the network configuration of bridge networks "mgtnet" and "svcnet", the network configuration of the bridge networks should be same as the network interfaces attached to the bridges. The "mgtnet" and "svcnet" might the same network in some cluster, in this case, you can ignore the lines for "svcnet". + +specify the network configuration of bridge networks "mgtnet" and "svcnet", the network configuration of the bridge networks should be same as the network interfaces attached to the bridges. The "mgtnet" and "svcnet" might the same network in some cluster, in this case, you can ignore the lines for "svcnet". 5. Specify the Data Volumes for xCAT Docker container @@ -114,16 +114,16 @@ specify the network configuration of bridge networks "mgtnet" and "svcnet", the #"dumpxCATdb -p /.dbbackup" should be run manually to save xCAT DB inside container - [The directory on Docker host mounted to save xCAT DB inside container]:/.dbbackup #the "/.logs" value is used to keep xCAT logs - #the xCAT logs will be kept if specified + #the xCAT logs will be kept if specified - [The directory on Docker host to save xCAT logs inside container]:/var/log/xcat/ specify the volumes of the xCAT container used to save and restore xCAT data -Start xCAT Docker container with Compose +Start xCAT Docker container with Compose ---------------------------------------- After the "docker-compose.yml" is ready, the xCAT Docker container can be started with [1]_ :: - + docker-compose -f "docker-compose.yml" up -d; \ ifconfig eno1 0.0.0.0; \ brctl addif mgtbr eno1; \ @@ -139,7 +139,7 @@ To remove the container, you can run :: ifup eno1 To update the xCAT Docker image, you can run :: - + docker-compose -f "docker-compose.yml" pull @@ -151,6 +151,6 @@ Known Issues When you start up xCAT Docker container, you might see an error message at the end of the output like :: Couldn't connect to Docker daemon at http+unix://var/run/docker.sock - is it running? If it's at a non-standard location, specify the URL with the DOCKER_HOST environment variable. - + You can ignore it, the container has already been running. It is a Docker bug `#1214 `_ - + From fa7eb10b519e98593dc8e44a8f6f7f1511e36c16 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0039/1681] Remove trailing spaces in file docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst --- .../run_xcat_in_docker_native.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst b/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst index 2dc90076c..7fec49456 100644 --- a/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst +++ b/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst @@ -9,7 +9,7 @@ Now xCAT ships xCAT Docker images(x86_64 and ppc64le) on the `DockerHub : ", otherwise, you need to set the cluster domain with ``chdef -t site -o clustersite domain="clusters.com"`` inside the container manually * use ``--volume /docker/xcatdata/:/install`` to mount a pre-created "/docker/xcatdata" directory on Docker host to "/install" directory inside container as a data volume. This is optional, it is mandatory if you want to backup and restore xCAT data. * use ``--net=mgtnet`` to connect the container to the Docker network "mgtnet" From cf1b66ba147020e9dccd996cfde924e1717b1df9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0040/1681] Remove trailing spaces in file docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst --- .../advanced/docker/dockerized_xcat/setup_docker_host.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst b/docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst index 9ce4aa4e1..f0014130c 100644 --- a/docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst +++ b/docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst @@ -4,14 +4,14 @@ Setup Docker host Install Docker Engine --------------------- -The Docker host to run xCAT Docker image should be a baremental or virtual server with Docker v1.10 or above installed. For the details on system requirements and Docker installation, refer to `Docker Installation Docs `_. +The Docker host to run xCAT Docker image should be a baremental or virtual server with Docker v1.10 or above installed. For the details on system requirements and Docker installation, refer to `Docker Installation Docs `_. .. note:: Docker images can only run on Docker hosts with the same architecture. Since xCAT only ships x86_64 and ppc64le Docker images, running xCAT in Docker requires x86_64 or ppc64 Docker Hosts. Shutdown the SELinux/Apparmor on Docker host -------------------------------------------- -If the SELinux or Apparmor on Docker host is enabled, the services/applications inside Docker Container might be confined. To run xCAT in Docker container, SELinux and Apparmor on the Docker host must be disabled. +If the SELinux or Apparmor on Docker host is enabled, the services/applications inside Docker Container might be confined. To run xCAT in Docker container, SELinux and Apparmor on the Docker host must be disabled. SELinux can be disabled with: :: From b61df3110c0bea8f87e65bdd02c50b21dee90f9d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0041/1681] Remove trailing spaces in file docs/source/advanced/docker/index.rst --- docs/source/advanced/docker/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/docker/index.rst b/docs/source/advanced/docker/index.rst index a3353e1d8..7d275a49f 100644 --- a/docs/source/advanced/docker/index.rst +++ b/docs/source/advanced/docker/index.rst @@ -4,6 +4,6 @@ Docker .. toctree:: :maxdepth: 2 - dockerized_xcat/dockerized_xcat.rst + dockerized_xcat/dockerized_xcat.rst lifecycle_management.rst docker_registry.rst From b28e7f6620b535ff65eb35a8f3dab255b6342c51 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0042/1681] Remove trailing spaces in file docs/source/advanced/docker/lifecycle_management.rst --- .../advanced/docker/lifecycle_management.rst | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/source/advanced/docker/lifecycle_management.rst b/docs/source/advanced/docker/lifecycle_management.rst index 9f7b8db7c..3bc48a0c8 100644 --- a/docs/source/advanced/docker/lifecycle_management.rst +++ b/docs/source/advanced/docker/lifecycle_management.rst @@ -3,9 +3,9 @@ Docker life-cycle management in xCAT The Docker linux container technology is currently very popular. xCAT can help managing Docker containers. xCAT, as a system management tool has the natural advantage for supporting multiple operating systems, multiple architectures and large scale clusters. -This document describes how to use xCAT for docker management, from Docker Host setup to docker container operations. +This document describes how to use xCAT for docker management, from Docker Host setup to docker container operations. -.. note:: This document was verified with: +.. note:: This document was verified with: * Docker Version 1.10, 1.11 * Docker API version 1.22 @@ -19,7 +19,7 @@ This document describes how to use xCAT for docker management, from Docker Host Setting up Docker Host ---------------------- -The **Docker Host** is the bare metal server or virtual machine where Docker containers can run. It will be called *dockerhost* in the following sections. +The **Docker Host** is the bare metal server or virtual machine where Docker containers can run. It will be called *dockerhost* in the following sections. The *dockerhost* at a minimum must provide the following: @@ -28,12 +28,12 @@ The *dockerhost* at a minimum must provide the following: Preparing osimage for docker host ````````````````````````````````` -The osimage represents the image of the Operating System which will be deployed on the dockerhost. +The osimage represents the image of the Operating System which will be deployed on the dockerhost. -Copy files out from DVDs/ISOs and generate +Copy files out from DVDs/ISOs and generate """""""""""""""""""""""""""""""""""""""""" -**[ubuntu x86_64]** :: - +**[ubuntu x86_64]** :: + copycds ubuntu-xxx-server-amd64.iso **[ubuntu16.04 ppc64el]** :: @@ -52,31 +52,31 @@ The pkglist file should contain the following: :: nfs-common snmpd bridge-utils - -The otherpkglist file should contain the following: -**[ubuntu x86_64]** :: +The otherpkglist file should contain the following: + +**[ubuntu x86_64]** :: # cat /install/custom/ubuntu/ubuntu_docker.pkglist docker-engine -**[ubuntu16.04 ppc64el]** - +**[ubuntu16.04 ppc64el]** + At the time of this writing (February 2016), docker package is not available for **ppc64el** architecture from docker.org. You can follow instructions below on how to manually download and install it. -* Download docker engine for ppc64el: +* Download docker engine for ppc64el: :: - + wget http://launchpadlibrarian.net/251622081/docker.io_1.10.3-0ubuntu4_ppc64el.deb -O /install/docker_ppc64el/docker.io_1.10.3-0ubuntu4_ppc64el.deb -* Configure **otherpkgdir** like this: +* Configure **otherpkgdir** like this: :: otherpkgdir=/install/docker_ppc64el -* The **otherpkglist** file should be: +* The **otherpkglist** file should be: :: @@ -87,7 +87,7 @@ Create the osimage for dockerhost """"""""""""""""""""""""""""""""" The osimage for dockerhost will be like this: -**[ubuntu x86_64]** :: +**[ubuntu x86_64]** :: # lsdef -t osimage ub14.04.03-x86_64-dockerhost Object name: ub14.04.03-x86_64-dockerhost @@ -125,9 +125,9 @@ Currently, a customer defined network object is needed when create a docker cont chdef host01 -p postbootscripts="setupdockerhost =/@[:nicname]" -* netobj_name: the network object to be created, it will be used in *dockernics* when creating docker container +* netobj_name: the network object to be created, it will be used in *dockernics* when creating docker container * subnet/netmask@gateway: the network which the IP address of docker container running on the docker host must be located in. If *nicname* is specified, the *subnet/netmask* must be the subnet of the nic *nicname* located in. And *gateway* shall be the IP address of the nic *nicname*. -* nicname: the physical nic name which will be attached to the network object +* nicname: the physical nic name which will be attached to the network object For example, a network object *mynet0* with subnet *10.0.0.0/16* and gateway *10.0.101.1* on nic *eth0* can be created with the command: :: @@ -170,7 +170,7 @@ Create docker instance * dockerflag - A JSON string which will be used as parameters to create a docker. Reference `docker API v1.22 `_ for more information about which parameters can be specified for "dockerflag". To create the docker instance *host01c01* with image *ubuntu* and command */bin/bash*, use: :: - + mkdocker host01c01 image=ubuntu command=/bin/bash dockerflag="{\"AttachStdin\":true,\"AttachStdout\":true,\"AttachStderr\":true,\"OpenStdin\":true}" Remove docker instance @@ -242,13 +242,13 @@ If things go wrong: ip addr show dev -* Run **ps -ef | grep docker** to verify docker engine is running with configured options. It should look something like +* Run **ps -ef | grep docker** to verify docker engine is running with configured options. It should look something like :: root 3703 1 0 Apr15 ? 00:12:28 /usr/bin/docker daemon -H unix:///var/run/docker.sock -H tcp://host01:2375 --tls --tlscacert=/root/.docker/ca-cert.pem --tlscert=/root/.docker/dockerhost-cert.pem --tlskey=/root/.docker/dockerhost-cert.pem --tlsverify=true --raw-logs -If the output is missing some options, verify that file **/lib/systemd/system/docker.service** contains the following lines +If the output is missing some options, verify that file **/lib/systemd/system/docker.service** contains the following lines :: From 94e8c46e069e38c9a76c9e45bc08d0ed31e7fb50 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0043/1681] Remove trailing spaces in file docs/source/advanced/domain_name_resolution/domain_name_resolution.rst --- .../domain_name_resolution/domain_name_resolution.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/advanced/domain_name_resolution/domain_name_resolution.rst b/docs/source/advanced/domain_name_resolution/domain_name_resolution.rst index 6009eb083..b5ff7c3da 100644 --- a/docs/source/advanced/domain_name_resolution/domain_name_resolution.rst +++ b/docs/source/advanced/domain_name_resolution/domain_name_resolution.rst @@ -78,7 +78,7 @@ Preparing for Using a DNS If you are choosing any of the options for using DNS, follow these steps: -NOTE: This documentation only applies to the xCAT makedns command using the ddns.pm plugin. The ddns.pm plugin is based on named9/bind9, and can not support named8/bind8 due to syntax difference. +NOTE: This documentation only applies to the xCAT makedns command using the ddns.pm plugin. The ddns.pm plugin is based on named9/bind9, and can not support named8/bind8 due to syntax difference. * Set the **nameservers** and **forwarders** attributes in the xCAT site table. The **nameservers** attribute identifies the DNS server hostname/ip that the nodes point to in their **/etc/resolv.conf** files. The forwarders attribute are the DNS server's ip that can resolve external hostnames. If you are running a DNS on the xCAT MN, it will use the forwarders DNS server to resolve any hostnames it can't. @@ -88,7 +88,7 @@ For example: :: * Create an /etc/resolv.conf file on the management node -Edit **/etc/resolv.conf** to contain the cluster domain value you set in the site table's **domain** attribute above, and to point to the same DNS server you will be using for your nodes (if you are using DNS). +Edit **/etc/resolv.conf** to contain the cluster domain value you set in the site table's **domain** attribute above, and to point to the same DNS server you will be using for your nodes (if you are using DNS). Option #1: Running DNS on Your Management Node ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -132,7 +132,7 @@ If you already have a DNS on your site network and you want to use it to solve t * Set the site **nameservers** value to the IP address of the external name server. :: chdef -t site nameservers= - + * Set the correct information of external dns into the /etc/resolv.conf on your xCAT MN. The **domain** and **nameservers** values must be set correctly in **/etc/resolv.conf**. Which should have the same values with the ones your set in the site table. @@ -159,7 +159,7 @@ The **domain** and **nameservers** values must be set correctly in **/etc/resolv file "db.192.168.1"; }; - * To update the name resolution entries from ``/etc/hosts`` or hosts table of xCAT MN to external DNS, run ``makedns -e`` + * To update the name resolution entries from ``/etc/hosts`` or hosts table of xCAT MN to external DNS, run ``makedns -e`` Alternatively, you can set site.externaldns=1 and run ``makedns`` @@ -191,7 +191,7 @@ The configurations are described below for the two options, note the differences Once **/etc/hosts** is populated with all of the nodes' hostnames and IP addresses, configure DNS on the management node and start it: :: - makedns -n + makedns -n When the **/etc/resolv.conf** files for the compute nodes are created the value of the **nameserver** in /etc/resolv.conf is gotten from **site.nameservers** or **networks.nameservers** if it's specified. From f3f96e0d44f51c2a25c92dde11e3579665f1750f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0044/1681] Remove trailing spaces in file docs/source/advanced/domain_name_resolution/index.rst --- docs/source/advanced/domain_name_resolution/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/domain_name_resolution/index.rst b/docs/source/advanced/domain_name_resolution/index.rst index 7b98533b8..13e5c4955 100644 --- a/docs/source/advanced/domain_name_resolution/index.rst +++ b/docs/source/advanced/domain_name_resolution/index.rst @@ -4,4 +4,4 @@ Domain Name Resolution .. toctree:: :maxdepth: 2 - domain_name_resolution.rst + domain_name_resolution.rst From 7d7476aebfd00c965b40913bb471f7e96f4b8c8a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0045/1681] Remove trailing spaces in file docs/source/advanced/goconserver/quickstart.rst --- docs/source/advanced/goconserver/quickstart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/goconserver/quickstart.rst b/docs/source/advanced/goconserver/quickstart.rst index 96559668b..53a293ce8 100644 --- a/docs/source/advanced/goconserver/quickstart.rst +++ b/docs/source/advanced/goconserver/quickstart.rst @@ -17,4 +17,4 @@ To enable ``goconserver``, execute the following steps: makegocons - The new console logs will start logging to ``/var/log/consoles/.log`` \ No newline at end of file + The new console logs will start logging to ``/var/log/consoles/.log`` From 2f9534902d097bfbdfd7146e1b9351157b60ce26 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0046/1681] Remove trailing spaces in file docs/source/advanced/gpu/nvidia/management.rst --- docs/source/advanced/gpu/nvidia/management.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/advanced/gpu/nvidia/management.rst b/docs/source/advanced/gpu/nvidia/management.rst index 057c625e7..fed4f5221 100644 --- a/docs/source/advanced/gpu/nvidia/management.rst +++ b/docs/source/advanced/gpu/nvidia/management.rst @@ -1,7 +1,7 @@ GPU Management and Monitoring ============================= -The ``nvidia-smi`` command provided by NVIDIA can be used to manage and monitor GPUs enabled Compute Nodes. In conjunction with the xCAT``xdsh`` command, you can easily manage and monitor the entire set of GPU enabled Compute Nodes remotely from the Management Node. +The ``nvidia-smi`` command provided by NVIDIA can be used to manage and monitor GPUs enabled Compute Nodes. In conjunction with the xCAT``xdsh`` command, you can easily manage and monitor the entire set of GPU enabled Compute Nodes remotely from the Management Node. Example: :: @@ -14,7 +14,7 @@ Example: :: Management ---------- -Some useful ``nvidia-smi`` example commands for management. +Some useful ``nvidia-smi`` example commands for management. * Set persistence mode, When persistence mode is enabled the NVIDIA driver remains loaded even when no active clients, DISABLED by default:: @@ -29,11 +29,11 @@ Some useful ``nvidia-smi`` example commands for management. nvidia-smi -i 0 -p 0/1 - * Set MODE for compute applications, query with --query-gpu=compute_mode:: + * Set MODE for compute applications, query with --query-gpu=compute_mode:: nvidia-smi -i 0 -c 0/1/2/3 - * Trigger reset of the GPU :: + * Trigger reset of the GPU :: nvidia-smi -i 0 -r @@ -48,7 +48,7 @@ Some useful ``nvidia-smi`` example commands for management. Monitoring ---------- -Some useful ``nvidia-smi`` example commands for monitoring. +Some useful ``nvidia-smi`` example commands for monitoring. * The number of NVIDIA GPUs in the system :: @@ -75,7 +75,7 @@ Some useful ``nvidia-smi`` example commands for monitoring. nvidia-smi -i 0 --query-gpu=compute_mode --format=csv,noheader * Percent of time over the past sample period during which one or more kernels was executing on the GPU:: - + nvidia-smi -i 0 --query-gpu=utilization.gpu --format=csv,noheader * Total errors detected across entire chip. Sum of device_memory, register_file, l1_cache, l2_cache and texture_memory :: @@ -86,14 +86,14 @@ Some useful ``nvidia-smi`` example commands for monitoring. nvidia-smi -i 0 --query-gpu=temperature.gpu --format=csv,noheader - * The ECC mode that the GPU is currently operating under:: + * The ECC mode that the GPU is currently operating under:: nvidia-smi -i 0 --query-gpu=ecc.mode.current --format=csv,noheader * The power management status:: nvidia-smi -i 0 --query-gpu=power.management --format=csv,noheader - + * The last measured power draw for the entire board, in watts:: nvidia-smi -i 0 --query-gpu=power.draw --format=csv,noheader From 5dbe005d93f4ece0597d3a53876c4b3a923732be Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0047/1681] Remove trailing spaces in file docs/source/advanced/gpu/nvidia/osimage/postscripts.rst --- docs/source/advanced/gpu/nvidia/osimage/postscripts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/gpu/nvidia/osimage/postscripts.rst b/docs/source/advanced/gpu/nvidia/osimage/postscripts.rst index b0c392c39..6800fe021 100644 --- a/docs/source/advanced/gpu/nvidia/osimage/postscripts.rst +++ b/docs/source/advanced/gpu/nvidia/osimage/postscripts.rst @@ -16,7 +16,7 @@ Add this script to your node object using the ``chdef`` command: :: Setting GPU Configurations -------------------------- -NVIDIA allows for changing GPU attributes using the ``nvidia-smi`` commands. These settings do not persist when a compute node is rebooted. One way set these attributes is to use an xCAT postscript to set the values every time the node is rebooted. +NVIDIA allows for changing GPU attributes using the ``nvidia-smi`` commands. These settings do not persist when a compute node is rebooted. One way set these attributes is to use an xCAT postscript to set the values every time the node is rebooted. * Set the power limit to 175W: :: From a122244cd15baa74788b8af781e170ed10efc7c7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0048/1681] Remove trailing spaces in file docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst --- .../advanced/gpu/nvidia/osimage/ubuntu.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst b/docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst index f56f8b9ed..37be35353 100644 --- a/docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst +++ b/docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst @@ -12,7 +12,7 @@ xCAT provides a sample package list files for CUDA. You can find them at: * ``/opt/xcat/share/xcat/install/ubuntu/cudafull.ubuntu14.04.3.ppc64el.pkglist`` * ``/opt/xcat/share/xcat/install/ubuntu/cudaruntime.ubuntu14.04.3.ppc64el.pkglist`` -**[diskful note]**: There is a requirement to reboot the machine after the CUDA drivers are installed. To satisfy this requirement, the CUDA software is installed in the ``pkglist`` attribute of the osimage definition where the reboot happens after the Operating System is installed. +**[diskful note]**: There is a requirement to reboot the machine after the CUDA drivers are installed. To satisfy this requirement, the CUDA software is installed in the ``pkglist`` attribute of the osimage definition where the reboot happens after the Operating System is installed. cudafull ^^^^^^^^ @@ -21,13 +21,13 @@ cudafull lsdef -t osimage -z ubuntu14.04.3-ppc64el-install-compute \ | sed 's/install-compute:/install-cudafull:/' \ - | mkdef -z + | mkdef -z #. Add the CUDA repo created in the previous step to the ``pkgdir`` attribute. If your Management Node IP is 10.0.0.1, the URL for the repo would be ``http://10.0.0.1/install/cuda-repo/ppc64el/var/cuda-repo-7-5-local``, add it to the pkgdir:: - chdef -t osimage -o ubuntu14.04.3-ppc64el-install-cudafull \ + chdef -t osimage -o ubuntu14.04.3-ppc64el-install-cudafull \ -p pkgdir=http://10.0.0.1/install/cuda-repo/ppc64el/var/cuda-repo-7-5-local @@ -45,7 +45,7 @@ cudaruntime lsdef -t osimage -z ubuntu14.04.3-ppc64el-install-compute \ | sed 's/install-compute:/install-cudaruntime:/' \ - | mkdef -z + | mkdef -z #. Add the CUDA repo created in the previous step to the ``pkgdir`` attribute: @@ -64,14 +64,14 @@ cudaruntime Diskless images --------------- -The following examples will create diskless images for ``cudafull`` and ``cudaruntime``. The osimage definitions will be created from the base ``ubuntu14.04.3-ppc64el-netboot-compute`` osimage. +The following examples will create diskless images for ``cudafull`` and ``cudaruntime``. The osimage definitions will be created from the base ``ubuntu14.04.3-ppc64el-netboot-compute`` osimage. xCAT provides a sample package list files for CUDA. You can find them at: * ``/opt/xcat/share/xcat/netboot/ubuntu/cudafull.ubuntu14.04.3.ppc64el.pkglist`` * ``/opt/xcat/share/xcat/netboot/ubuntu/cudaruntime.ubuntu14.04.3.ppc64el.pkglist`` -**[diskless note]**: For diskless images, the requirement for rebooting the machine is not applicable because the images is loaded on each reboot. The install of the CUDA packages is required to be done in the ``otherpkglist`` **NOT** the ``pkglist``. +**[diskless note]**: For diskless images, the requirement for rebooting the machine is not applicable because the images is loaded on each reboot. The install of the CUDA packages is required to be done in the ``otherpkglist`` **NOT** the ``pkglist``. cudafull ^^^^^^^^ @@ -80,9 +80,9 @@ cudafull lsdef -t osimage -z ubuntu14.04.3-ppc64el-netboot-compute \ | sed 's/netboot-compute:/netboot-cudafull:/' \ - | mkdef -z + | mkdef -z -#. Add the CUDA repo created in the previous step to the ``otherpkgdir`` attribute. +#. Add the CUDA repo created in the previous step to the ``otherpkgdir`` attribute. If your Management Node IP is 10.0.0.1, the URL for the repo would be ``http://10.0.0.1/install/cuda-repo/ppc64el/var/cuda-repo-7-5-local``, add it to the ``otherpkgdir``:: @@ -98,7 +98,7 @@ cudafull #. Verify that ``acpid`` is installed on the Management Node or on the Ubuntu host where you are generating the diskless image: :: - apt-get install -y acpid + apt-get install -y acpid #. Generate the image: :: @@ -115,9 +115,9 @@ cudaruntime lsdef -t osimage -z ubuntu14.04.3-ppc64el-netboot-compute \ | sed 's/netboot-compute:/netboot-cudaruntime:/' \ - | mkdef -z + | mkdef -z -#. Add the CUDA repo created in the previous step to the ``otherpkgdir`` attribute. +#. Add the CUDA repo created in the previous step to the ``otherpkgdir`` attribute. If your Management Node IP is 10.0.0.1, the URL for the repo would be ``http://10.0.0.1/install/cuda-repo/ppc64el/var/cuda-repo-7-5-local``, add it to the ``otherpkgdir``:: @@ -133,7 +133,7 @@ cudaruntime #. Verify that ``acpid`` is installed on the Management Node or on the Ubuntu host where you are generating the diskless image: :: - apt-get install -y acpid + apt-get install -y acpid #. Generate the image: :: From 3cfeb83bcb0cf54f0e8afc5f22cd6a2bbec12d2f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0049/1681] Remove trailing spaces in file docs/source/advanced/gpu/nvidia/repo/index.rst --- docs/source/advanced/gpu/nvidia/repo/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/gpu/nvidia/repo/index.rst b/docs/source/advanced/gpu/nvidia/repo/index.rst index 13965d5b5..5d91fbe7c 100644 --- a/docs/source/advanced/gpu/nvidia/repo/index.rst +++ b/docs/source/advanced/gpu/nvidia/repo/index.rst @@ -1,7 +1,7 @@ Create CUDA software repository =============================== -The NVIDIA CUDA Toolkit is available to download at http://developer.nvidia.com/cuda-downloads. +The NVIDIA CUDA Toolkit is available to download at http://developer.nvidia.com/cuda-downloads. Download the toolkit and prepare the software repository on the xCAT Management Node to server the NVIDIA CUDA files. From 912fa0569b393590933495853aa9c6cffe358faf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0050/1681] Remove trailing spaces in file docs/source/advanced/gpu/nvidia/repo/nvml.rst --- docs/source/advanced/gpu/nvidia/repo/nvml.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/gpu/nvidia/repo/nvml.rst b/docs/source/advanced/gpu/nvidia/repo/nvml.rst index 8453700dc..7f74a3040 100644 --- a/docs/source/advanced/gpu/nvidia/repo/nvml.rst +++ b/docs/source/advanced/gpu/nvidia/repo/nvml.rst @@ -3,9 +3,9 @@ Install NVIDIA Management Library (optional) See https://developer.nvidia.com/nvidia-management-library-nvml for more information. -The .run file can be downloaded from NVIDIAs website and placed into the ``/install/postscripts`` directory on the Management Node. +The .run file can be downloaded from NVIDIAs website and placed into the ``/install/postscripts`` directory on the Management Node. -To enable installation of the management library after the node is install, add the .run file to the ``postbootscripts`` attribute for the nodes: :: +To enable installation of the management library after the node is install, add the .run file to the ``postbootscripts`` attribute for the nodes: :: # ensure the .run file has execute permission chmod +x /install/postscripts/.run From 9d5559729da36e5007244c7d4127e7ebcb15d236 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0051/1681] Remove trailing spaces in file docs/source/advanced/gpu/nvidia/repo/ubuntu.rst --- docs/source/advanced/gpu/nvidia/repo/ubuntu.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/gpu/nvidia/repo/ubuntu.rst b/docs/source/advanced/gpu/nvidia/repo/ubuntu.rst index ac31ca6dd..96ea8eb95 100644 --- a/docs/source/advanced/gpu/nvidia/repo/ubuntu.rst +++ b/docs/source/advanced/gpu/nvidia/repo/ubuntu.rst @@ -9,14 +9,14 @@ Local A local package repo will contain all of the CUDA packages. Extract the CUDA packages into ``/install/cuda-repo/ppc64le``: :: # For CUDA toolkit: /root/cuda-repo-ubuntu1404-7-5-local_7.5-18_ppc64el.deb - + # Create the repo directory under xCAT /install dir mkdir -p /install/cuda-repo/ppc64el # extract the package dpkg -x /root/cuda-repo-ubuntu1404-7-5-local_7.5-18_ppc64el.deb /install/cuda-repo/ppc64el - + Network ------- @@ -31,7 +31,7 @@ The ``sources.list`` entry may look similar to: :: Authorize the CUDA repo ----------------------- -In order to access the CUDA repository you must import the CUDA GPGKEY into the ``apt_key`` trust list. xCAT provides a sample postscript ``/install/postscripts/addcudakey`` to help with this task: :: +In order to access the CUDA repository you must import the CUDA GPGKEY into the ``apt_key`` trust list. xCAT provides a sample postscript ``/install/postscripts/addcudakey`` to help with this task: :: chdef -t node -o -p postscripts=addcudakey From d6315ee9b89a11cd09579860097b23c1aac6d644 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0052/1681] Remove trailing spaces in file docs/source/advanced/gpu/nvidia/verify_cuda_install.rst --- .../gpu/nvidia/verify_cuda_install.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/advanced/gpu/nvidia/verify_cuda_install.rst b/docs/source/advanced/gpu/nvidia/verify_cuda_install.rst index 63587b67d..793331c2c 100644 --- a/docs/source/advanced/gpu/nvidia/verify_cuda_install.rst +++ b/docs/source/advanced/gpu/nvidia/verify_cuda_install.rst @@ -4,10 +4,10 @@ Verify CUDA Installation **The following verification steps only apply to the ``cudafull`` installations.** #. Verify driver version by looking at: ``/proc/driver/nvidia/version``: :: - + # cat /proc/driver/nvidia/version NVRM version: NVIDIA UNIX ppc64le Kernel Module 352.39 Fri Aug 14 17:10:41 PDT 2015 - GCC version: gcc version 4.8.5 20150623 (Red Hat 4.8.5-4) (GCC) + GCC version: gcc version 4.8.5 20150623 (Red Hat 4.8.5-4) (GCC) #. Verify the CUDA Toolkit version :: @@ -19,7 +19,7 @@ Verify CUDA Installation #. Verify running CUDA GPU jobs by compiling the samples and executing the ``deviceQuery`` or ``bandwidthTest`` programs. - * Compile the samples: + * Compile the samples: **[RHEL]:** :: @@ -32,13 +32,13 @@ Verify CUDA Installation cd ~/ apt-get install cuda-samples-7-0 -y - cd /usr/local/cuda-7.0/samples - make + cd /usr/local/cuda-7.0/samples + make * Run the ``deviceQuery`` sample: :: - # ./bin/ppc64le/linux/release/deviceQuery + # ./bin/ppc64le/linux/release/deviceQuery ./deviceQuery Starting... CUDA Device Query (Runtime API) version (CUDART static linking) Detected 4 CUDA Capable device(s) @@ -54,9 +54,9 @@ Verify CUDA Installation ............ deviceQuery, CUDA Driver = CUDART, CUDA Driver Version = 7.5, CUDA Runtime Version = 7.5, NumDevs = 4, Device0 = Tesla K80, Device1 = Tesla K80, Device2 = Tesla K80, Device3 = Tesla K80 Result = PASS - + * Run the ``bandwidthTest`` sample: :: - + # ./bin/ppc64le/linux/release/bandwidthTest [CUDA Bandwidth Test] - Starting... Running on... @@ -75,6 +75,6 @@ Verify CUDA Installation Transfer Size (Bytes) Bandwidth(MB/s) 33554432 141485.3 Result = PASS - + NOTE: The CUDA Samples are not meant for performance measurements. Results may vary when GPU Boost is enabled. - + From 3469a8a9b313ef9df574924e330c3dc9a3c78b2c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0053/1681] Remove trailing spaces in file docs/source/advanced/hamn/high_available_management_node.rst --- .../hamn/high_available_management_node.rst | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/source/advanced/hamn/high_available_management_node.rst b/docs/source/advanced/hamn/high_available_management_node.rst index ebd78cf57..bf06d2216 100644 --- a/docs/source/advanced/hamn/high_available_management_node.rst +++ b/docs/source/advanced/hamn/high_available_management_node.rst @@ -1,42 +1,42 @@ Configuration considerations ============================ -xCAT provides several configuration options for the HAMN, you can select one of the option based on your failover requirements and hardware configuration, the following configuration considerations should be able to help you to make the decision. +xCAT provides several configuration options for the HAMN, you can select one of the option based on your failover requirements and hardware configuration, the following configuration considerations should be able to help you to make the decision. Data synchronization mechanism ------------------------------ -The data synchronization is important for any high availability configuration. When the xCAT management node failover occurs, the xCAT data needs to be exactly the same before failover, and some of the operating system configuration should also be synchronized between the two management nodes. To be specific, the following data should be synchronized between the two management nodes to make the xCAT HAMN work: +The data synchronization is important for any high availability configuration. When the xCAT management node failover occurs, the xCAT data needs to be exactly the same before failover, and some of the operating system configuration should also be synchronized between the two management nodes. To be specific, the following data should be synchronized between the two management nodes to make the xCAT HAMN work: -* xCAT database -* xCAT configuration files, like ``/etc/xcat``, ``~/.xcat``, ``/opt/xcat`` -* The configuration files for the services that are required by xCAT, like named, DHCP, apache, nfs, ssh, etc. -* The operating systems images repository and users customization data repository, the ``/install`` directory contains these repositories in most cases. +* xCAT database +* xCAT configuration files, like ``/etc/xcat``, ``~/.xcat``, ``/opt/xcat`` +* The configuration files for the services that are required by xCAT, like named, DHCP, apache, nfs, ssh, etc. +* The operating systems images repository and users customization data repository, the ``/install`` directory contains these repositories in most cases. -There are a lot of ways for data synchronization, but considering the specific xCAT HAMN requirements, only several of the data synchronization options are practical for xCAT HAMN. +There are a lot of ways for data synchronization, but considering the specific xCAT HAMN requirements, only several of the data synchronization options are practical for xCAT HAMN. -**1\. Move physical disks between the two management nodes**: if we could physically move the hard disks from the failed management node to the backup management node, and bring up the backup management node, then both the operating system and xCAT data will be identical between the new management node and the failed management node. RAID1 or disk mirroring could be used to avoid the disk be a single point of failure. +**1\. Move physical disks between the two management nodes**: if we could physically move the hard disks from the failed management node to the backup management node, and bring up the backup management node, then both the operating system and xCAT data will be identical between the new management node and the failed management node. RAID1 or disk mirroring could be used to avoid the disk be a single point of failure. -**2\. Shared data**: the two management nodes use the single copy of xCAT data, no matter which management node is the primary MN, the cluster management capability is running on top of the single data copy. The access to the data could be done through various ways like shared storage, NAS, NFS, samba etc. Based on the protocol being used, the data might be accessible only on one management node at a time or be accessible on both management nodes in parallel. If the data could only be accessed from one management node, the failover process need to take care of the data access transition; if the data could be accessed on both management nodes, the failover does not need to consider the data access transition, it usually means the failover process could be faster. +**2\. Shared data**: the two management nodes use the single copy of xCAT data, no matter which management node is the primary MN, the cluster management capability is running on top of the single data copy. The access to the data could be done through various ways like shared storage, NAS, NFS, samba etc. Based on the protocol being used, the data might be accessible only on one management node at a time or be accessible on both management nodes in parallel. If the data could only be accessed from one management node, the failover process need to take care of the data access transition; if the data could be accessed on both management nodes, the failover does not need to consider the data access transition, it usually means the failover process could be faster. -Warning: Running database through network file system has a lot of potential problems and is not practical, however, most of the database system provides database replication feature that can be used to synchronize the database between the two management nodes. +Warning: Running database through network file system has a lot of potential problems and is not practical, however, most of the database system provides database replication feature that can be used to synchronize the database between the two management nodes. -**3\. Mirroring**: each of the management node has its own copy of the xCAT data, and the two copies of data are synchronized through mirroring mechanism. DRBD is used widely in the high availability configuration scenarios, to provide data replication by mirroring a whole block device via network. If we put all the important data for xCAT onto the DRBD devices, then it could assure the data is synchronized between the two management nodes. Some parallel file system also provides capability to mirror data through network. +**3\. Mirroring**: each of the management node has its own copy of the xCAT data, and the two copies of data are synchronized through mirroring mechanism. DRBD is used widely in the high availability configuration scenarios, to provide data replication by mirroring a whole block device via network. If we put all the important data for xCAT onto the DRBD devices, then it could assure the data is synchronized between the two management nodes. Some parallel file system also provides capability to mirror data through network. Manual vs. Automatic Failover ----------------------------- -When the primary management node fails, the backup management node could automatically take over, or the administrator has to perform some manual procedure to finish the failover. In general, the automatic failover takes less time to detect the failure and perform and failover, comparing with the manual failover, but the automatic failover requires more complex configuration. We could not say the automatic failover is better than the manual failover in all cases, the following factors should be considered when deciding the manual failover or automatic failover: +When the primary management node fails, the backup management node could automatically take over, or the administrator has to perform some manual procedure to finish the failover. In general, the automatic failover takes less time to detect the failure and perform and failover, comparing with the manual failover, but the automatic failover requires more complex configuration. We could not say the automatic failover is better than the manual failover in all cases, the following factors should be considered when deciding the manual failover or automatic failover: **1\. How long the cluster could survive if the management node is down?** -If the cluster could not survive for more than several minutes, then the automatic failover might be the only option; if the compute nodes could run without the management node, at least for a while, then the manual failover could be an option. +If the cluster could not survive for more than several minutes, then the automatic failover might be the only option; if the compute nodes could run without the management node, at least for a while, then the manual failover could be an option. -From xCAT perspective, if the management node needs to provide network services like DHCP, named, ntp or nfs to the compute nodes, then the cluster probably could not survive too long if the management node is down; if the management node only performs hardware control and some other management capabilities, then the failed management node may not cause too much trouble for the cluster. xCAT provides various options for configuring if the compute nodes rely on the network services on the management node. +From xCAT perspective, if the management node needs to provide network services like DHCP, named, ntp or nfs to the compute nodes, then the cluster probably could not survive too long if the management node is down; if the management node only performs hardware control and some other management capabilities, then the failed management node may not cause too much trouble for the cluster. xCAT provides various options for configuring if the compute nodes rely on the network services on the management node. **2\. Configuration complexity** -The configuration for the high availability applications is usually complex, it may take a long time to configure, debug and stabilize the high availability configuration. +The configuration for the high availability applications is usually complex, it may take a long time to configure, debug and stabilize the high availability configuration. **3\. Maintenance effort** @@ -45,7 +45,7 @@ The automatic failover brings in several high availability applications, after t Configuration Options ===================== -The combinations of data synchronization mechanism and manual/automatic failover indicates different HAMN configuration options, the table below list all the combinations (the bold numbers are the combinations xCAT has documented and tested): +The combinations of data synchronization mechanism and manual/automatic failover indicates different HAMN configuration options, the table below list all the combinations (the bold numbers are the combinations xCAT has documented and tested): +-------------------+-------------------------+-----------------+--------------+ |# | **Move physical disks** | **Shared data** | **Mirroring**| @@ -55,14 +55,14 @@ The combinations of data synchronization mechanism and manual/automatic failover |Automatic Failover | 4 | **5** | **6** | +-------------------+-------------------------+-----------------+--------------+ -Option 1, :ref:`setup_ha_mgmt_node_with_raid1_and_disks_move` +Option 1, :ref:`setup_ha_mgmt_node_with_raid1_and_disks_move` -Option 2, :ref:`setup_ha_mgmt_node_with_shared_data` +Option 2, :ref:`setup_ha_mgmt_node_with_shared_data` Option 3, it is doable but not currently supported. Option 4, it is not practical. -Option 5, :ref:`setup_xcat_high_available_management_node_with_nfs` +Option 5, :ref:`setup_xcat_high_available_management_node_with_nfs` Option 6, :ref:`setup_ha_mgmt_node_with_drbd_pacemaker_corosync` From d3a0289a692caddb00df203c03722a6decad23d3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0054/1681] Remove trailing spaces in file docs/source/advanced/hamn/index.rst --- docs/source/advanced/hamn/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/hamn/index.rst b/docs/source/advanced/hamn/index.rst index 1d7bcecab..51448bb80 100644 --- a/docs/source/advanced/hamn/index.rst +++ b/docs/source/advanced/hamn/index.rst @@ -6,7 +6,7 @@ The xCAT management node plays an important role in the cluster, if the manageme The goal of the HAMN (High Availability Management Node) configuration is, when the primary xCAT management node fails, the standby management node can take over the role of the management node, either through automatic failover or through manual procedure performed by the administrator, and thus avoid long periods of time during which your cluster does not have active cluster management function available. -The following pages describes ways to configure the xCAT Management Node for High Availability. +The following pages describes ways to configure the xCAT Management Node for High Availability. .. toctree:: :maxdepth: 2 From 4828c0516fe9695f4670eb48bead1702a04dbb60 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0055/1681] Remove trailing spaces in file docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst --- ...mgmt_node_with_drbd_pacemaker_corosync.rst | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst index 91f9c6cd9..6118ba479 100644 --- a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst +++ b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst @@ -1651,7 +1651,7 @@ which should result in the following output: :: x3550m4n01 x3550m4n02 Pacemaker Nodes: x3550m4n01 x3550m4n02 - + Resources: Resource: ip_xCAT (class=ocf provider=heartbeat type=IPaddr2) Attributes: ip=10.1.0.1 iflabel=xCAT cidr_netmask=22 nic=eno2 @@ -1714,10 +1714,10 @@ which should result in the following output: :: Operations: start interval=0s timeout=1m (symlinks_xCAT-start-timeout-1m) stop interval=0s timeout=1m (symlinks_xCAT-stop-timeout-1m) monitor interval=31s on-fail=ignore (symlinks_xCAT-monitor-interval-31s) - + Stonith Devices: Fencing Levels: - + Location Constraints: Ordering Constraints: promote ms_drbd_xCAT then start grp_xCAT (kind:Mandatory) (id:order-ms_drbd_xCAT-grp_xCAT-mandatory) @@ -1756,7 +1756,7 @@ which should result in the following output: :: gmetad with grp_xCAT (score:INFINITY) (id:colocation-gmetad-grp_xCAT-INFINITY) icinga with grp_xCAT (score:INFINITY) (id:colocation-icinga-grp_xCAT-INFINITY) ip_xCAT with grp_xCAT (score:INFINITY) (id:colocation-ip_xCAT-grp_xCAT-INFINITY) - + Cluster Properties: cluster-infrastructure: corosync cluster-name: ucl_cluster @@ -1780,12 +1780,12 @@ And the resulting output should be the following: :: Version: 1.1.12-a14efad 2 Nodes configured 17 Resources configured - - + + Online: [ x3550m4n01 x3550m4n02 ] - + Full list of resources: - + ip_xCAT (ocf::heartbeat:IPaddr2): Started x3550m4n01 NFS_xCAT (ocf::heartbeat:nfsserver): Started x3550m4n01 apache_xCAT (ocf::heartbeat:apache): Started x3550m4n01 @@ -1802,7 +1802,7 @@ And the resulting output should be the following: :: Resource Group: grp_xCAT fs_xCAT (ocf::heartbeat:Filesystem): Started x3550m4n01 symlinks_xCAT (ocf::tummy:drbdlinks): Started x3550m4n01 - + PCSD Status: x3550m4n01: Online x3550m4n02: Online @@ -1818,7 +1818,7 @@ Further from this, the following changes needed to be made for nfs in el7 :: Description=RPC Pipe File System DefaultDependencies=no Conflicts=umount.target - + [Mount] What=sunrpc Where=/var/lib/nfs_local/rpc_pipefs @@ -1849,9 +1849,9 @@ Further from this, the following changes needed to be made for nfs in el7 :: -After=var-lib-nfs-rpc_pipefs.mount +Requires=var-lib-nfs_local-rpc_pipefs.mount +After=var-lib-nfs_local-rpc_pipefs.mount - + ConditionPathExists=/etc/krb5.keytab - + --- /usr/lib/systemd/system/nfs-secure.service 2015-01-23 16:30:26.000000000 +0000 +++ /etc/systemd/system/nfs-secure.service 2015-10-13 01:39:36.000000000 +0100 @@ -1863,9 +1863,9 @@ Further from this, the following changes needed to be made for nfs in el7 :: -After=var-lib-nfs-rpc_pipefs.mount +Requires=var-lib-nfs_local-rpc_pipefs.mount +After=var-lib-nfs_local-rpc_pipefs.mount - + ConditionPathExists=/etc/krb5.keytab - + --- /usr/lib/systemd/system/nfs-secure-server.service 2015-01-23 16:30:26.000000000 +0000 +++ /etc/systemd/system/nfs-secure-server.service 2015-10-13 01:39:36.000000000 +0100 @@ -1878,7 +1878,7 @@ Further from this, the following changes needed to be made for nfs in el7 :: +After=var-lib-nfs_local-rpc_pipefs.mount PartOf=nfs-server.service PartOf=nfs-utils.service - + --- /usr/lib/systemd/system/nfs-blkmap.service 2015-01-23 16:30:26.000000000 +0000 +++ /etc/systemd/system/nfs-blkmap.service 2015-10-13 01:39:36.000000000 +0100 @@ -1890,7 +1890,7 @@ Further from this, the following changes needed to be made for nfs in el7 :: -Requires=var-lib-nfs-rpc_pipefs.mount +After=var-lib-nfs_local-rpc_pipefs.mount +Requires=var-lib-nfs_local-rpc_pipefs.mount - + Requisite=nfs-blkmap.target After=nfs-blkmap.target From 2d65684b1f1f5d0c54728ddd7a9dacd975010d12 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0056/1681] Remove trailing spaces in file docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst --- .../hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst index 895775f5e..b93047eb8 100644 --- a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst +++ b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst @@ -81,4 +81,4 @@ The failover procedure is simple and straightforward: #. Boot up the standby management node -#. Verify the standby management node could now perform all the cluster management operations. +#. Verify the standby management node could now perform all the cluster management operations. From 2be845747a4cc5ba0216d63aa95601e612737f6e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0057/1681] Remove trailing spaces in file docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst --- .../setup_ha_mgmt_node_with_shared_data.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst index a694ad0d6..ab574af45 100644 --- a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst +++ b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst @@ -54,7 +54,7 @@ The configuration procedure will be quite different based on the shared data mec /install ~/.xcat / - /tftpboot + /tftpboot .. note:: * For MySQL, the database directory is ``/var/lib/mysql`` @@ -100,7 +100,7 @@ Setup xCAT on the Primary Management Node Add the two management nodes into policy table: :: - tabdump policy + tabdump policy "1.2","rhmn1",,,,,,"trusted",, "1.3","rhmn2",,,,,,"trusted",, "1.4","rhmn",,,,,,"trusted",, @@ -109,7 +109,7 @@ Setup xCAT on the Primary Management Node chdef -t site databaseloc=/dbdirectory -#. Install and configure database. Refer to the doc [**doto:** choosing_the_Database] to configure the database on the xCAT management node. For PostgreSql, add primary and standby IP addresses access to database, use ``pgsqlsetup -i -a 9.114.47.103 -a 9.114.47.104`` to migrate an existing xCAT database from SQLite to PostgreSQL. +#. Install and configure database. Refer to the doc [**doto:** choosing_the_Database] to configure the database on the xCAT management node. For PostgreSql, add primary and standby IP addresses access to database, use ``pgsqlsetup -i -a 9.114.47.103 -a 9.114.47.104`` to migrate an existing xCAT database from SQLite to PostgreSQL. Verify xcat is running on correct database by running: :: @@ -135,7 +135,7 @@ Setup xCAT on the Primary Management Node #. Stop the xcatd daemon and some related network services from starting on reboot: :: service xcatd stop - chkconfig --level 345 xcatd off + chkconfig --level 345 xcatd off service conserver off chkconfig --level 2345 conserver off service dhcpd stop @@ -148,8 +148,8 @@ Setup xCAT on the Primary Management Node #. (Optional) If DFM is being used for hardware control capabilities, install DFM package, setup xCAT to communicate directly to the System P server's service processor.:: - xCAT-dfm RPM - ISNM-hdwr_svr RPM + xCAT-dfm RPM + ISNM-hdwr_svr RPM #. If there is any node that is already managed by the Management Node,change the noderes table tftpserver & xcatmaster & nfsserver attributes to the Virtual ip @@ -160,7 +160,7 @@ Setup xCAT on the Primary Management Node Setup xCAT on the Standby Management Node ========================================= -#. Make sure the standby management node is NOT using the shared data. +#. Make sure the standby management node is NOT using the shared data. #. Add the alias ip address ``9.114.47.97`` into the ``/etc/resolv.conf`` as the nameserver. Change the hostname resolution order to be using ``/etc/hosts`` before using name server. Change "hosts: files dns" in /etc/nsswitch.conf. @@ -174,8 +174,8 @@ Setup xCAT on the Standby Management Node #. (Optional) DFM only, Install DFM package: :: - xCAT-dfm RPM - ISNM-hdwr_svr RPM + xCAT-dfm RPM + ISNM-hdwr_svr RPM #. Setup hostname resolution between the primary management node and standby management node. Make sure the primary management node can resolve the hostname of the standby management node, and vice versa. @@ -190,7 +190,7 @@ Setup xCAT on the Standby Management Node #. Stop the xcatd daemon and related network services from starting on reboot: :: service xcatd stop - chkconfig --level 345 xcatd off + chkconfig --level 345 xcatd off service conserver off chkconfig --level 2345 conserver off service dhcpd stop @@ -458,7 +458,7 @@ The operating system is installed on the internal disks. #. Connect the shared disk to both management nodes - To verify the shared disks are connected correctly, run the sginfo command on both management nodes and look for the same serial number in the output. Be aware that the sginfo command may not be installed by default on Linux, the sginfo command is shipped with package sg3_utils, you can manually install the package sg3_utils on both management nodes. + To verify the shared disks are connected correctly, run the sginfo command on both management nodes and look for the same serial number in the output. Be aware that the sginfo command may not be installed by default on Linux, the sginfo command is shipped with package sg3_utils, you can manually install the package sg3_utils on both management nodes. Once the sginfo command is installed, run sginfo -l command on both management nodes to list all the known SCSI disks, for example, enter: :: @@ -473,9 +473,9 @@ The operating system is installed on the internal disks. /dev/sg3 [=/dev/sdd scsi0 ch=0 id=4 lun=0] /dev/sg4 [=/dev/sde scsi0 ch=0 id=5 lun=0] - Use the ``sginfo -s `` to identify disks with the same serial number on both management nodes, for example: + Use the ``sginfo -s `` to identify disks with the same serial number on both management nodes, for example: - On the primary management node: :: + On the primary management node: :: [root@rhmn1 ~]# sginfo -s /dev/sdb Serial Number '1T23043224 ' @@ -487,7 +487,7 @@ The operating system is installed on the internal disks. [root@rhmn2~]# sginfo -s /dev/sdb Serial Number '1T23043224 ' - We can see that the ``/dev/sdb`` is a shared disk on both management nodes. In some cases, as with mirrored disks and when there is no matching of serial numbers between the two management nodes, multiple disks on a single server can have the same serial number, In these cases, format the disks, mount them on both management nodes, and then touch files on the disks to determine if they are shared between the management nodes. + We can see that the ``/dev/sdb`` is a shared disk on both management nodes. In some cases, as with mirrored disks and when there is no matching of serial numbers between the two management nodes, multiple disks on a single server can have the same serial number, In these cases, format the disks, mount them on both management nodes, and then touch files on the disks to determine if they are shared between the management nodes. #. Create partitions on shared disks @@ -495,7 +495,7 @@ The operating system is installed on the internal disks. fdisk /dev/sdc - Verify the partitions are created by running ``fdisk -l``. + Verify the partitions are created by running ``fdisk -l``. #. Create file systems on shared disks @@ -507,9 +507,9 @@ The operating system is installed on the internal disks. mkfs.ext3 -v /dev/sdc4 mkfs.ext3 -v /dev/sdc5 - If you place entries for the disk in ``/etc/fstab``, which is not required, ensure that the entries do not have the system automatically mount the disk. + If you place entries for the disk in ``/etc/fstab``, which is not required, ensure that the entries do not have the system automatically mount the disk. - .. note:: Since the file systems will not be mounted automatically during system reboot this must be manually done and xCAT should be started **after** the filesystem is mounted. + .. note:: Since the file systems will not be mounted automatically during system reboot this must be manually done and xCAT should be started **after** the filesystem is mounted. #. Verify the file systems on the primary management node. @@ -525,7 +525,7 @@ The operating system is installed on the internal disks. umount /etc/xcat umount /install - umount ~/.xcat + umount ~/.xcat umount / umount /tftpboot @@ -539,9 +539,9 @@ The operating system is installed on the internal disks. mount /dev/sdc4 / mount /dev/sdc5/tftpboot - You may get errors "mount: you must specify the filesystem type" or "mount: special device /dev/sdb1 does not exist" when trying to mount the file systems on the standby management node, this is caused by the missing devices files on the standby management node, run ``fidsk /dev/sdx`` and simply select "w write table to disk and exit" in the fdisk menu, then retry the mount. + You may get errors "mount: you must specify the filesystem type" or "mount: special device /dev/sdb1 does not exist" when trying to mount the file systems on the standby management node, this is caused by the missing devices files on the standby management node, run ``fidsk /dev/sdx`` and simply select "w write table to disk and exit" in the fdisk menu, then retry the mount. - After that, umount the file system on the standby management node: :: + After that, umount the file system on the standby management node: :: umount /etc/xcat umount /install From a51dbe0f837e06eff65299717a9f21866c7fedcb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0058/1681] Remove trailing spaces in file docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst --- ...available_management_node_in_softlayer.rst | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst b/docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst index a8b40f11a..50ae5614d 100644 --- a/docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst +++ b/docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst @@ -1,6 +1,6 @@ .. _setup_xcat_high_available_management_node_with_nfs: -Setup xCAT HA Mgmt with NFS pacemaker and corosync +Setup xCAT HA Mgmt with NFS pacemaker and corosync ==================================================================================== In this doc, we will configure a xCAT HA cluster using ``pacemaker`` and ``corosync`` based on NFS server. ``pacemaker`` and ``corosync`` only support ``x86_64`` systems, more information about ``pacemaker`` and ``corosync`` refer to doc :ref:`setup_ha_mgmt_node_with_drbd_pacemaker_corosync`. @@ -24,19 +24,19 @@ The DB is SQLlite. There is no service node in this example. Prepare NFS server -------------------- -In NFS server 10.2.2.44, execute commands to export fs; If you want to use another non-root user to manage xCAT, such as hpcpeadmin. +In NFS server 10.2.2.44, execute commands to export fs; If you want to use another non-root user to manage xCAT, such as hpcpeadmin. You should create a directory for ``/home/hpcpeadmin``; Execute commands in NFS server c902f02x44. :: # service nfs start - # mkdir ~/.xcat + # mkdir ~/.xcat # mkdir -p /etc/xcat # mkdir -p /disk1/install/ # mkdir -p /disk1/hpcpeadmin # mkdir -p /disk1/install/xcat - # vi /etc/exports - /disk1/install *(rw,no_root_squash,sync,no_subtree_check) - /etc/xcat *(rw,no_root_squash,sync,no_subtree_check) + # vi /etc/exports + /disk1/install *(rw,no_root_squash,sync,no_subtree_check) + /etc/xcat *(rw,no_root_squash,sync,no_subtree_check) /root/.xcat *(rw,no_root_squash,sync,no_subtree_check) /root/.ssh *(rw,no_root_squash,sync,no_subtree_check) /disk1/hpcpeadmin *(rw,no_root_squash,sync,no_subtree_check) @@ -75,12 +75,12 @@ Execute steps on xCAT MN rhmn1 Mount share nfs from 10.2.2.44: :: - # mkdir -p /install + # mkdir -p /install # mkdir -p /etc/xcat # mkdir -p /home/hpcpeadmin # mount 10.2.2.44:/disk1/install /install # mount 10.2.2.44:/etc/xcat /etc/xcat - # mkdir -p /root/.xcat + # mkdir -p /root/.xcat # mount 10.2.2.44:/root/.xcat /root/.xcat # mount 10.2.2.44:/root/.ssh /root/.ssh # mount 10.2.2.44:/disk1/hpcpeadmin /home/hpcpeadmin @@ -113,16 +113,16 @@ Execute steps on xCAT MN rhmn1 Download xcat-core tar ball and xcat-dep tar ball from github, and untar them: :: - # mkdir /install/xcat - # mv xcat-core-2.8.4.tar.bz2 /install/xcat/ + # mkdir /install/xcat + # mv xcat-core-2.8.4.tar.bz2 /install/xcat/ # mv xcat-dep-201404250449.tar.bz2 /install/xcat/ - # cd /install/xcat + # cd /install/xcat # tar -jxvf xcat-core-2.8.4.tar.bz2 # tar -jxvf xcat-dep-201404250449.tar.bz2 # cd xcat-core # ./mklocalrepo.sh # cd ../xcat-dep/rh6/x86_64/ - # ./mklocalrepo.sh + # ./mklocalrepo.sh # yum clean metadata # yum install xCAT # source /etc/profile.d/xcat.sh @@ -232,7 +232,7 @@ Install corosync and pacemaker on both rhmn2 and rhmn1 enabled=1 gpgcheck=0 -#. Install ``corosync`` and ``pacemaker``, then generate ssh key: +#. Install ``corosync`` and ``pacemaker``, then generate ssh key: Install ``corosync`` and ``pacemaker``: :: @@ -333,15 +333,15 @@ Be aware that you need to apply ALL the configuration at once. You cannot pick a Check that both rhmn2 and chetha are standby state now: :: - rhmn1 ~]# crm status - Last updated: Wed Aug 13 22:57:58 2014 - Last change: Wed Aug 13 22:40:31 2014 via cibadmin on rhmn1 - Stack: classic openais (with plugin) - Current DC: rhmn2 - partition with quorum - Version: 1.1.8-7.el6-394e906 - 2 Nodes configured, 2 expected votes - 14 Resources configured. - Node rhmn1: standby + rhmn1 ~]# crm status + Last updated: Wed Aug 13 22:57:58 2014 + Last change: Wed Aug 13 22:40:31 2014 via cibadmin on rhmn1 + Stack: classic openais (with plugin) + Current DC: rhmn2 - partition with quorum + Version: 1.1.8-7.el6-394e906 + 2 Nodes configured, 2 expected votes + 14 Resources configured. + Node rhmn1: standby Node rhmn2: standby Execute ``crm configure edit`` to add all configure at once: :: @@ -481,29 +481,29 @@ Verify auto fail over #. Let rhmn1 standby and rhmn2 online, xcat will run on rhmn2: :: rhmn2 /]# crm node online rhmn2 - rhmn2 /]# crm node standby rhmn1 - rhmn2 /]# crm status - Last updated: Mon Aug 4 23:19:33 2014 - Last change: Mon Aug 4 23:19:40 2014 via crm_attribute on rhmn2 - Stack: classic openais (with plugin) - Current DC: rhmn1 - partition with quorum - Version: 1.1.8-7.el6-394e906 - 2 Nodes configured, 2 expected votes - 12 Resources configured. + rhmn2 /]# crm node standby rhmn1 + rhmn2 /]# crm status + Last updated: Mon Aug 4 23:19:33 2014 + Last change: Mon Aug 4 23:19:40 2014 via crm_attribute on rhmn2 + Stack: classic openais (with plugin) + Current DC: rhmn1 - partition with quorum + Version: 1.1.8-7.el6-394e906 + 2 Nodes configured, 2 expected votes + 12 Resources configured. - Node rhmn1: standby - Online: [ rhmn2 ] + Node rhmn1: standby + Online: [ rhmn2 ] - Resource Group: XCAT_GROUP - xCATmnVIP (ocf::heartbeat:IPaddr2): Started rhmn2 - INSTALLFS (ocf::heartbeat:Filesystem): Started rhmn2 - ETCXCATFS (ocf::heartbeat:Filesystem): Started rhmn2 - ROOTXCATFS (ocf::heartbeat:Filesystem): Started rhmn2 - NFSlock_xCAT (lsb:nfslock): Started rhmn2 - xCAT (lsb:xcatd): Started rhmn2 - Clone Set: clone_named [named] - Started: [ rhmn2 ] - Stopped: [ named:1 ] + Resource Group: XCAT_GROUP + xCATmnVIP (ocf::heartbeat:IPaddr2): Started rhmn2 + INSTALLFS (ocf::heartbeat:Filesystem): Started rhmn2 + ETCXCATFS (ocf::heartbeat:Filesystem): Started rhmn2 + ROOTXCATFS (ocf::heartbeat:Filesystem): Started rhmn2 + NFSlock_xCAT (lsb:nfslock): Started rhmn2 + xCAT (lsb:xcatd): Started rhmn2 + Clone Set: clone_named [named] + Started: [ rhmn2 ] + Stopped: [ named:1 ] rhmn2 /]#lsxcatd -v Version 2.8.4 (git commit 7306ca8abf1c6d8c68d3fc3addc901c1bcb6b7b3, built Mon Apr 21 20:48:59 EDT 2014) From b43b10ae4588389d72dd5d98ddeda7242bd9b6ca Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0059/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst --- .../appendix/appendix_a_setup_backup_service_nodes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst b/docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst index d36a0a0cc..41b13259d 100644 --- a/docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst +++ b/docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst @@ -95,7 +95,7 @@ procedure to move its CNs over to the backup SN. Move the nodes to the new service nodes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Use the :doc:`snmove ` command to make the database changes necessary to move a set of compute nodes from one Service Node to another. +Use the :doc:`snmove ` command to make the database changes necessary to move a set of compute nodes from one Service Node to another. To switch all the compute nodes from Service Node ``sn1`` to the backup Service Node ``sn2``, run: :: From 914bb9f16ab528ca9b74aa2d2c73a8eeaf329c5b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0060/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst --- .../hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst b/docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst index 10b20cdcc..15a4dda30 100644 --- a/docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst +++ b/docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst @@ -1,10 +1,10 @@ Appendix C: Migrating a Management Node to a Service Node ========================================================= -Directly converting an existing Management Node to a Service Node may have some issues and is not recommended. Do the following steps to convert the xCAT Management Node into a Service node: +Directly converting an existing Management Node to a Service Node may have some issues and is not recommended. Do the following steps to convert the xCAT Management Node into a Service node: #. backup your xCAT database on the Management Node #. Install a new xCAT Management node #. Restore your xCAT database into the new Management Node -#. Re-provision the old xCAT Management Node as a new Service Node +#. Re-provision the old xCAT Management Node as a new Service Node From a64dd9bc9259f9f24f7bb1bf57cce59638276317 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0061/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/configure_dhcp.rst --- docs/source/advanced/hierarchy/configure_dhcp.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/hierarchy/configure_dhcp.rst b/docs/source/advanced/hierarchy/configure_dhcp.rst index f2dca9fa7..06fe9e258 100644 --- a/docs/source/advanced/hierarchy/configure_dhcp.rst +++ b/docs/source/advanced/hierarchy/configure_dhcp.rst @@ -7,7 +7,7 @@ Add the defined nodes into the DHCP configuration, refer to: `XCAT_pLinux_Clusters/#configure-dhcp `_ In the large cluster, the size of dhcp lease file "/var/lib/dhcpd/dhcpd.leases" on the DHCP server will grow over time. At around 100MB in size, the DHCP server will take a long time to respond to DHCP requests from clients and cause DHCP timeouts: :: - + ... Mar 2 01:59:10 c656ems2 dhcpd: DHCPDISCOVER from 00:0a:f7:73:7d:d0 via eth0 Mar 2 01:59:10 c656ems2 dhcpd: DHCPOFFER on 9.114.39.101 to 00:0a:f7:73:7d:d0 via eth0 From f7e2b752815457d31e3668c01828e2a8eea41fe1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0062/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/mysql_configure.rst --- .../source/advanced/hierarchy/databases/mysql_configure.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/mysql_configure.rst b/docs/source/advanced/hierarchy/databases/mysql_configure.rst index a7404c2b6..6145e6aab 100644 --- a/docs/source/advanced/hierarchy/databases/mysql_configure.rst +++ b/docs/source/advanced/hierarchy/databases/mysql_configure.rst @@ -21,7 +21,7 @@ where the /tmp/servicenodes contains a host per line: :: 10.%.%.% node2.cluster.net -**While not recommended**, if you wish to manually migrate your xCAT database, see the following documentation: +**While not recommended**, if you wish to manually migrate your xCAT database, see the following documentation: `Manually set up MySQL `_ .. _grante_revoke_mysql_access_label: @@ -36,7 +36,7 @@ Granting/Revoking access to the database for Service Node Clients * Granting access to the xCAT database. Service Nodes are required for xCAT hierarchical support. Compute nodes may also need access that depends on which application is going to run. (xcat201 is xcatadmin's password for following examples) :: MariaDB > GRANT ALL on xcatdb.* TO xcatadmin@ IDENTIFIED BY 'xcat201'; - + Use the wildcards to do a GRANT ALL to every ipaddress or nodename that need to access the database. :: MariaDB > GRANT ALL on xcatdb.* TO xcatadmin@'%.cluster.net' IDENTIFIED BY 'xcat201'; @@ -50,4 +50,4 @@ Granting/Revoking access to the database for Service Node Clients MariaDB > SELECT host, user FROM mysql.user; - + From ef2b4759ad4914502c6e6b0c9c864a46e6b23c21 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0063/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/mysql_install.rst --- .../source/advanced/hierarchy/databases/mysql_install.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/mysql_install.rst b/docs/source/advanced/hierarchy/databases/mysql_install.rst index 497296bbc..366a083fc 100644 --- a/docs/source/advanced/hierarchy/databases/mysql_install.rst +++ b/docs/source/advanced/hierarchy/databases/mysql_install.rst @@ -15,7 +15,7 @@ The MySQL database is supported by xCAT since xCAT 2.1. MariaDB is a fork of th | xCAT 2.10+ | Yes | Yes | +------------+------------+------------+ -MySQL/MariaDB packages are shipped as part of most Linux Distributions. +MySQL/MariaDB packages are shipped as part of most Linux Distributions. Red Hat Enterprise Linux @@ -55,12 +55,12 @@ Suse Linux Enterprise Server libqt4-sql-mysql-* libmysqlclient18-* perl-DBD-mysql-* - -Debian/Ubuntu + +Debian/Ubuntu ------------- -* MySQL - Using ``apt-get``, ensure that the following packages are installed on the management node: :: +* MySQL - Using ``apt-get``, ensure that the following packages are installed on the management node: :: mysql-server mysql-common From 2f217af2d05ded5fefb25a444e3bf73e5d47aec1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0064/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/mysql_remove.rst --- .../advanced/hierarchy/databases/mysql_remove.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/mysql_remove.rst b/docs/source/advanced/hierarchy/databases/mysql_remove.rst index 6a25ab488..e8c71c951 100644 --- a/docs/source/advanced/hierarchy/databases/mysql_remove.rst +++ b/docs/source/advanced/hierarchy/databases/mysql_remove.rst @@ -12,18 +12,18 @@ If you no longer want to use MySQL/MariaDB to maintain ``xcatdb``, and like to s XCATBYPASS=1 restorexCATdb -p ~/xcat-dbback -* Change to PostgreSQL, following documentation: :doc:`/advanced/hierarchy/databases/postgres_install` +* Change to PostgreSQL, following documentation: :doc:`/advanced/hierarchy/databases/postgres_install` * Change back to default xCAT database, SQLite (**Note**: xCAT Hierarchy cluster will no longer work) - #. Stop the ``xcatd`` daemon on the management node. :: + #. Stop the ``xcatd`` daemon on the management node. :: service xcatd stop - #. Remove the ``xatdb`` from MySQL/MariaDB (optional): :: + #. Remove the ``xatdb`` from MySQL/MariaDB (optional): :: - /usr/bin/mysql -u root -p + /usr/bin/mysql -u root -p drop the xcatdb: :: @@ -34,10 +34,10 @@ If you no longer want to use MySQL/MariaDB to maintain ``xcatdb``, and like to s mysql> drop user xcatadm; #. Move, or remove, the ``/etc/xcat/cfglog`` file as it points xCAT to MySQL/MariaDB. (without this file, xCAT defaults to SQLite): :: - - rm /etc/xcat/cfgloc + + rm /etc/xcat/cfgloc #. Restart ``xcatd``: :: - service xcatd start + service xcatd start From 8a019447f01f7c5f5dbe8f7798b448fe7936ff91 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0065/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/mysql_using.rst --- docs/source/advanced/hierarchy/databases/mysql_using.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/mysql_using.rst b/docs/source/advanced/hierarchy/databases/mysql_using.rst index 899e90a8a..6c97859e5 100644 --- a/docs/source/advanced/hierarchy/databases/mysql_using.rst +++ b/docs/source/advanced/hierarchy/databases/mysql_using.rst @@ -20,17 +20,17 @@ Start/Stop MySQL/MariaDB service service mysql stop -Basic MySQL/MariaDB commands +Basic MySQL/MariaDB commands ----------------------------- Refer to ``_ for the latest documentation. * Using ``mysql``, connect to the xcat database: :: - + mysql -u root -p * List the hosts and users which managed by this xcat MN: :: - + MariaDB> SELECT host, user FROM mysql.user; * List the databases: :: From 264a840f8334ae11cfd3ace9461421525ed516cf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0066/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/postgres_configure.rst --- .../hierarchy/databases/postgres_configure.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/postgres_configure.rst b/docs/source/advanced/hierarchy/databases/postgres_configure.rst index c9ce1e014..c3a1bb449 100644 --- a/docs/source/advanced/hierarchy/databases/postgres_configure.rst +++ b/docs/source/advanced/hierarchy/databases/postgres_configure.rst @@ -8,13 +8,13 @@ A utility is provided to migrate an existing xCAT database from SQLite to Postgr pgsqlsetup -i -V -**While not recommended**, if you wish to manually migrate your xCAT database, see the following documentation: +**While not recommended**, if you wish to manually migrate your xCAT database, see the following documentation: `Manually set up PostgreSQL `_ -Setting up the Service Nodes +Setting up the Service Nodes ---------------------------- -For service nodes, add the IP address of each service nodes to the postgres configuration file: ``/var/lib/pgsql/data/pg_hba.conf`` +For service nodes, add the IP address of each service nodes to the postgres configuration file: ``/var/lib/pgsql/data/pg_hba.conf`` If you had the following two service nodes: :: @@ -29,10 +29,10 @@ You would add the following to ``/var/lib/pgsql/data/pg_hba.conf`` :: Restart PostgreSQL after editing the file: :: - service postgresql restart + service postgresql restart -For more information about changing the ``pg_hab.conf`` file and ``postgresql.conf`` files, see the following documentation: +For more information about changing the ``pg_hab.conf`` file and ``postgresql.conf`` files, see the following documentation: `Setup the PostgreSQL Configuration Files `_ .. _modify_postgresql_database_diretory: From 5feeb4b58fb4e134e9be525c51511140937e7861 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0067/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/postgres_install.rst --- docs/source/advanced/hierarchy/databases/postgres_install.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/postgres_install.rst b/docs/source/advanced/hierarchy/databases/postgres_install.rst index a87f81f09..666258c2e 100644 --- a/docs/source/advanced/hierarchy/databases/postgres_install.rst +++ b/docs/source/advanced/hierarchy/databases/postgres_install.rst @@ -16,7 +16,7 @@ Using yum, install the following rpms: :: Suse Linux Enterprise Server ---------------------------- -**Note:** On SLES, ``perl-DBD`` packages are provided on the SDK iso images. +**Note:** On SLES, ``perl-DBD`` packages are provided on the SDK iso images. Using zyppr, install the following rpms: :: @@ -24,7 +24,7 @@ Using zyppr, install the following rpms: :: zypper install perl-DBD-Pg -Debian/Ubuntu +Debian/Ubuntu ------------- Using apt, install the following packages: :: From 98340ff84866db430543c919498ef424cded86ac Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0068/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/postgres_remove.rst --- .../advanced/hierarchy/databases/postgres_remove.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/postgres_remove.rst b/docs/source/advanced/hierarchy/databases/postgres_remove.rst index 16807d1d2..245018853 100644 --- a/docs/source/advanced/hierarchy/databases/postgres_remove.rst +++ b/docs/source/advanced/hierarchy/databases/postgres_remove.rst @@ -8,12 +8,12 @@ To remove ``xcatdb`` completely from the PostgreSQL database: mkdir -p ~/xcat-dbback dumpxCATdb -p ~/xcat-dbback -#. Stop the ``xcatd`` daemon on the management node. +#. Stop the ``xcatd`` daemon on the management node. **Note:** If you are using *xCAT Hierarchy (service nodes)* and removing ``xcatdb`` from postgres, hierarchy will no longer work. You will need to configure another database which supports remote database access to continue using the hierarchy feature. :: service xcatd stop -#. Remove the ``xatdb`` from PostgreSQL: :: +#. Remove the ``xatdb`` from PostgreSQL: :: su - postgres @@ -31,7 +31,7 @@ To remove ``xcatdb`` completely from the PostgreSQL database: rm -rf * #. Move, or remove, the ``/etc/xcat/cfglog`` file as it points xCAT to PostgreSQL. (without this file, xCAT defaults to SQLite): :: - + mv /etc/xcat/cfgloc /etc/xcat/cfglog.postgres #. Restore the PostgreSQL database into SQLite: :: @@ -40,5 +40,5 @@ To remove ``xcatdb`` completely from the PostgreSQL database: #. Restart ``xcatd``: :: - service xcatd start + service xcatd start From 73aa34a17c31f3ed15980f2bd6609648a8e3bb81 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0069/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/postgres_tips.rst --- .../source/advanced/hierarchy/databases/postgres_tips.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/postgres_tips.rst b/docs/source/advanced/hierarchy/databases/postgres_tips.rst index 82df8ac42..00d1ba886 100644 --- a/docs/source/advanced/hierarchy/databases/postgres_tips.rst +++ b/docs/source/advanced/hierarchy/databases/postgres_tips.rst @@ -9,13 +9,13 @@ Using PostgreSQL Use the psql command line utility to connect to the PostgreSQL database: :: su - postgres - psql -h -U xcatadm -d xcatdb + psql -h -U xcatadm -d xcatdb Useful Commands --------------- -* Show create statement for a table, for example prescripts table. :: +* Show create statement for a table, for example prescripts table. :: /usr/bin/pg_dump xcatdb -U xcatadm -t prescripts @@ -26,7 +26,7 @@ Useful Commands # drop the xcatdb dropdb xcatdb - # remove the xcatadm database owner + # remove the xcatadm database owner dropuser xcatadm # clean up the postgresql files (necessary if you want to re-create the database) @@ -38,7 +38,7 @@ Useful Commands su - postgres psql -l -* Access the database: :: +* Access the database: :: su - postgres psql xcatdb From d33cc58e0acca79231e7d0a4de6e9507aaee530f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0070/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/databases/postgres_using.rst --- docs/source/advanced/hierarchy/databases/postgres_using.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/postgres_using.rst b/docs/source/advanced/hierarchy/databases/postgres_using.rst index b757333c9..fe56eed5e 100644 --- a/docs/source/advanced/hierarchy/databases/postgres_using.rst +++ b/docs/source/advanced/hierarchy/databases/postgres_using.rst @@ -12,8 +12,8 @@ Using ``psql``, connect to the xcat database: :: list the xCAT tables: :: xcatdb=> \dt - -show the entries in the nodelist table: :: + +show the entries in the nodelist table: :: xcatdb=> select * from nodelist; @@ -29,7 +29,7 @@ Show the SQL create statement for a table: :: /usr/bin/pg_dump_xcatdb -U xcatadm -t - # example, for prescripts table: + # example, for prescripts table: /usr/bin/pg_dump xcatdb -U xcatadm -t prescripts List all databases in postgres: :: From 8bea160d47b73087e42af6d113ec75ba9a946644 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0071/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/define_and_install_compute_node.rst --- .../define_and_install_compute_node.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/advanced/hierarchy/define_and_install_compute_node.rst b/docs/source/advanced/hierarchy/define_and_install_compute_node.rst index 952dd3d6b..f3e637d1a 100644 --- a/docs/source/advanced/hierarchy/define_and_install_compute_node.rst +++ b/docs/source/advanced/hierarchy/define_and_install_compute_node.rst @@ -4,16 +4,16 @@ Define and install your Compute Nodes Make /install available on the Service Nodes -------------------------------------------- -Note that all of the files and directories pointed to by your osimages should -be placed under the directory referred to in site.installdir (usually -/install), so they will be available to the service nodes. The installdir -directory is mounted or copied to the service nodes during the hierarchical +Note that all of the files and directories pointed to by your osimages should +be placed under the directory referred to in site.installdir (usually +/install), so they will be available to the service nodes. The installdir +directory is mounted or copied to the service nodes during the hierarchical installation. -If you are not using the NFS-based statelite method of booting your compute -nodes and you are not using service node pools, set the installloc attribute -to "/install". This instructs the service node to mount /install from the -management node. (If you don't do this, you have to manually sync /install +If you are not using the NFS-based statelite method of booting your compute +nodes and you are not using service node pools, set the installloc attribute +to "/install". This instructs the service node to mount /install from the +management node. (If you don't do this, you have to manually sync /install between the management node and the service nodes.) :: @@ -23,17 +23,17 @@ between the management node and the service nodes.) Make compute node syncfiles available on the servicenodes --------------------------------------------------------- -If you are not using the NFS-based statelite method of booting your compute -nodes, and you plan to use the syncfiles postscript to update files on the -nodes during install, you must ensure that those files are sync'd to the -servicenodes before the install of the compute nodes. To do this after your -nodes are defined, you will need to run the following whenever the files in +If you are not using the NFS-based statelite method of booting your compute +nodes, and you plan to use the syncfiles postscript to update files on the +nodes during install, you must ensure that those files are sync'd to the +servicenodes before the install of the compute nodes. To do this after your +nodes are defined, you will need to run the following whenever the files in your synclist change on the Management Node: :: updatenode -f -At this point you can return to the documentation for your cluster environment +At this point you can return to the documentation for your cluster environment to define and deploy your compute nodes. From 25d60d94332ed48e3839ba973d92ce8d5484e7fc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0072/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/define_service_node.rst --- .../hierarchy/define_service_node.rst | 154 +++++++++--------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/docs/source/advanced/hierarchy/define_service_node.rst b/docs/source/advanced/hierarchy/define_service_node.rst index 6c5b5b3ef..81e6c8557 100644 --- a/docs/source/advanced/hierarchy/define_service_node.rst +++ b/docs/source/advanced/hierarchy/define_service_node.rst @@ -16,8 +16,8 @@ group called **service**. Some of the commands in this document will use the group **service** to update all service nodes. Note: a Service Node's service node is the Management Node; so a service node -must have a direct connection to the management node. The compute nodes do not -have to be directly attached to the Management Node, only to their service +must have a direct connection to the management node. The compute nodes do not +have to be directly attached to the Management Node, only to their service node. This will all have to be defined in your networks table. Add Service Nodes to the nodelist Table @@ -25,11 +25,11 @@ Add Service Nodes to the nodelist Table Define your service nodes (if not defined already), and by convention we put them in a **service** group. We usually have a group compute for our compute -nodes, to distinguish between the two types of nodes. (If you want to use your -own group name for service nodes, rather than service, you need to change some -defaults in the xCAT db that use the group name service. For example, in the -postscripts table there is by default a group entry for service, with the -appropriate postscripts to run when installing a service node. Also, the +nodes, to distinguish between the two types of nodes. (If you want to use your +own group name for service nodes, rather than service, you need to change some +defaults in the xCAT db that use the group name service. For example, in the +postscripts table there is by default a group entry for service, with the +appropriate postscripts to run when installing a service node. Also, the default ``kickstart/autoyast`` template, pkglist, etc that will be used have files names based on the profile name service.) :: @@ -44,7 +44,7 @@ appropriate for SNs. Display the list of osimages and choose one with lsdef -t osimage -For this example, let's assume you chose the stateful osimage definition for +For this example, let's assume you chose the stateful osimage definition for rhels 7: rhels7-x86_64-install-service . If you want to modify any of the osimage attributes (e.g. ``kickstart/autoyast`` template, pkglist, etc), make a copy of the osimage definition and also copy to ``/install/custom`` @@ -63,16 +63,16 @@ Now set some of the common attributes for the SNs at the group level: :: Add Service Nodes to the servicenode Table ------------------------------------------ -An entry must be created in the servicenode table for each service node or the -service group. This table describes all the services you would like xcat to -setup on the service nodes. (Even if you don't want xCAT to set up any -services - unlikely - you must define the service nodes in the servicenode -table with at least one attribute set (you can set it to 0), otherwise it will +An entry must be created in the servicenode table for each service node or the +service group. This table describes all the services you would like xcat to +setup on the service nodes. (Even if you don't want xCAT to set up any +services - unlikely - you must define the service nodes in the servicenode +table with at least one attribute set (you can set it to 0), otherwise it will not be recognized as a service node.) -When the xcatd daemon is started or restarted on the service node, it will -make sure all of the requested services are configured and started. (To -temporarily avoid this when restarting xcatd, use "service xcatd reload" +When the xcatd daemon is started or restarted on the service node, it will +make sure all of the requested services are configured and started. (To +temporarily avoid this when restarting xcatd, use "service xcatd reload" instead.) To set up the minimum recommended services on the service nodes: :: @@ -138,9 +138,9 @@ value as the node's servicenode attribute. Host name resolution must have been setup in advance, with ``/etc/hosts``, DNS or dhcp to ensure that the names put in this table can be resolved on the -Management Node, Service nodes, and the compute nodes. It is easiest to have a -node group of the compute nodes for each service node. For example, if all the -nodes in node group compute1 are serviced by sn1 and all the nodes in node +Management Node, Service nodes, and the compute nodes. It is easiest to have a +node group of the compute nodes for each service node. For example, if all the +nodes in node group compute1 are serviced by sn1 and all the nodes in node group compute2 are serviced by sn2: :: @@ -148,18 +148,18 @@ group compute2 are serviced by sn2: chdef -t group compute1 servicenode=sn1 xcatmaster=sn1-c chdef -t group compute2 servicenode=sn2 xcatmaster=sn2-c -Note: in this example, sn1 and sn2 are the node names of the service nodes -(and therefore the hostnames associated with the NICs that the MN talks to). -The hostnames sn1-c and sn2-c are associated with the SN NICs that communicate +Note: in this example, sn1 and sn2 are the node names of the service nodes +(and therefore the hostnames associated with the NICs that the MN talks to). +The hostnames sn1-c and sn2-c are associated with the SN NICs that communicate with their compute nodes. Note: if not set, the attribute tftpserver's default value is xcatmaster, but in some releases of xCAT it has not defaulted correctly, so it is safer to set the tftpserver to the value of xcatmaster. -These attributes will allow you to specify which service node should run the -conserver (console) and monserver (monitoring) daemon for the nodes in the -group specified in the command. In this example, we are having each node's +These attributes will allow you to specify which service node should run the +conserver (console) and monserver (monitoring) daemon for the nodes in the +group specified in the command. In this example, we are having each node's primary SN also act as its conserver and monserver (the most typical setup). :: @@ -169,43 +169,43 @@ primary SN also act as its conserver and monserver (the most typical setup). Service Node Pools ^^^^^^^^^^^^^^^^^^ -Service Node Pools are multiple service nodes that service the same set of -compute nodes. Having multiple service nodes allows backup service node(s) for -a compute node when the primary service node is unavailable, or can be used -for work-load balancing on the service nodes. But note that the selection of -which SN will service which compute node is made at compute node boot time. -After that, the selection of the SN for this compute node is fixed until the -compute node is rebooted or the compute node is explicitly moved to another SN +Service Node Pools are multiple service nodes that service the same set of +compute nodes. Having multiple service nodes allows backup service node(s) for +a compute node when the primary service node is unavailable, or can be used +for work-load balancing on the service nodes. But note that the selection of +which SN will service which compute node is made at compute node boot time. +After that, the selection of the SN for this compute node is fixed until the +compute node is rebooted or the compute node is explicitly moved to another SN using the `snmove `_ command. -To use Service Node pools, you need to architect your network such that all of -the compute nodes and service nodes in a particular pool are on the same flat +To use Service Node pools, you need to architect your network such that all of +the compute nodes and service nodes in a particular pool are on the same flat network. If you don't want the management node to respond to manage some of -the compute nodes, it shouldn't be on that same flat network. The +the compute nodes, it shouldn't be on that same flat network. The site, dhcpinterfaces attribute should be set such that the SNs' DHCP daemon -only listens on the NIC that faces the compute nodes, not the NIC that faces -the MN. This avoids some timing issues when the SNs are being deployed (so -that they don't respond to each other before they are completely ready). You +only listens on the NIC that faces the compute nodes, not the NIC that faces +the MN. This avoids some timing issues when the SNs are being deployed (so +that they don't respond to each other before they are completely ready). You also need to make sure the `networks `_ table accurately reflects the physical network structure. -To define a list of service nodes that support a set of compute nodes, set the -servicenode attribute to a comma-delimited list of the service nodes. When -running an xCAT command like xdsh or updatenode for compute nodes, the list -will be processed left to right, picking the first service node on the list to -run the command. If that service node is not available, then the next service -node on the list will be chosen until the command is successful. Errors will -be logged. If no service node on the list can process the command, then the -error will be returned. You can provide some load-balancing by assigning your +To define a list of service nodes that support a set of compute nodes, set the +servicenode attribute to a comma-delimited list of the service nodes. When +running an xCAT command like xdsh or updatenode for compute nodes, the list +will be processed left to right, picking the first service node on the list to +run the command. If that service node is not available, then the next service +node on the list will be chosen until the command is successful. Errors will +be logged. If no service node on the list can process the command, then the +error will be returned. You can provide some load-balancing by assigning your service nodes as we do below. -When using service node pools, the intent is to have the service node that -responds first to the compute node's DHCP request during boot also be the -xcatmaster, the tftpserver, and the NFS/http server for that node. Therefore, -the xcatmaster and nfsserver attributes for nodes should not be set. When -nodeset is run for the compute nodes, the service node interface on the -network to the compute nodes should be defined and active, so that nodeset -will default those attribute values to the "node ip facing" interface on that +When using service node pools, the intent is to have the service node that +responds first to the compute node's DHCP request during boot also be the +xcatmaster, the tftpserver, and the NFS/http server for that node. Therefore, +the xcatmaster and nfsserver attributes for nodes should not be set. When +nodeset is run for the compute nodes, the service node interface on the +network to the compute nodes should be defined and active, so that nodeset +will default those attribute values to the "node ip facing" interface on that service node. For example: :: @@ -213,7 +213,7 @@ For example: :: chdef -t node compute1 servicenode=sn1,sn2 xcatmaster="" nfsserver="" chdef -t node compute2 servicenode=sn2,sn1 xcatmaster="" nfsserver="" -You need to set the sharedtftp site attribute to 0 so that the SNs will not +You need to set the sharedtftp site attribute to 0 so that the SNs will not automatically mount the ``/tftpboot`` directory from the management node: :: @@ -233,8 +233,8 @@ from this rsync. rsync -auv --exclude 'autoinst' /install sn1:/ -Note: If your service nodes are stateless and site.sharedtftp=0, if you reboot -any service node when using servicenode pools, any data written to the local +Note: If your service nodes are stateless and site.sharedtftp=0, if you reboot +any service node when using servicenode pools, any data written to the local ``/tftpboot`` directory of that SN is lost. You will need to run nodeset for all of the compute nodes serviced by that SN again. @@ -244,14 +244,14 @@ networks table, see ref: networks table, see :ref:`setup_networks_table_label`. Conserver and Monserver and Pools """"""""""""""""""""""""""""""""" -The support of conserver and monserver with Service Node Pools is still not -supported. You must explicitly assign these functions to a service node using +The support of conserver and monserver with Service Node Pools is still not +supported. You must explicitly assign these functions to a service node using the nodehm.conserver and noderes.monserver attribute as above. Setup Site Table ---------------- -If you are not using the NFS-based statelite method of booting your compute +If you are not using the NFS-based statelite method of booting your compute nodes, set the installloc attribute to ``/install``. This instructs the service node to mount ``/install`` from the management node. (If you don't do this, you have to manually sync ``/install`` between the management node and @@ -259,11 +259,11 @@ the service nodes.) :: chdef -t site clustersite installloc="/install" -For IPMI controlled nodes, if you want the out-of-band IPMI operations to be -done directly from the management node (instead of being sent to the +For IPMI controlled nodes, if you want the out-of-band IPMI operations to be +done directly from the management node (instead of being sent to the appropriate service node), set site.ipmidispatch=n. -If you want to throttle the rate at which nodes are booted up, you can set the +If you want to throttle the rate at which nodes are booted up, you can set the following site attributes: @@ -278,7 +278,7 @@ See the `site table man page `_ for details. Setup networks Table -------------------- -All networks in the cluster must be defined in the networks table. When xCAT +All networks in the cluster must be defined in the networks table. When xCAT is installed, it runs makenetworks, which creates an entry in the networks table for each of the networks the management node is on. You need to add entries for each network the service nodes use to communicate to the compute @@ -288,22 +288,22 @@ For example: :: mkdef -t network net1 net=10.5.1.0 mask=255.255.255.224 gateway=10.5.1.1 -If you want to set the nodes' xcatmaster as the default gateway for the nodes, -the gateway attribute can be set to keyword "". In this case, xCAT -code will automatically substitute the IP address of the node's xcatmaster for +If you want to set the nodes' xcatmaster as the default gateway for the nodes, +the gateway attribute can be set to keyword "". In this case, xCAT +code will automatically substitute the IP address of the node's xcatmaster for the keyword. Here is an example: :: mkdef -t network net1 net=10.5.1.0 mask=255.255.255.224 gateway= -The ipforward attribute should be enabled on all the xcatmaster nodes that -will be acting as default gateways. You can set ipforward to 1 in the -servicenode table or add the line "net.ipv4.ip_forward = 1" in file +The ipforward attribute should be enabled on all the xcatmaster nodes that +will be acting as default gateways. You can set ipforward to 1 in the +servicenode table or add the line "net.ipv4.ip_forward = 1" in file ``/etc/sysctl.conf`` and then run "sysctl -p /etc/sysctl.conf" manually to enable the ipforwarding. -Note:If using service node pools, the networks table dhcpserver attribute can -be set to any single service node in your pool. The networks tftpserver, and +Note:If using service node pools, the networks table dhcpserver attribute can +be set to any single service node in your pool. The networks tftpserver, and nameserver attributes should be left blank. Verify the Tables @@ -317,17 +317,17 @@ compute1, compute2: :: Add additional adapters configuration script (optional) ------------------------------------------------------------ -It is possible to have additional adapter interfaces automatically configured -when the nodes are booted. XCAT provides sample configuration scripts for -ethernet, IB, and HFI adapters. These scripts can be used as-is or they can be -modified to suit your particular environment. The ethernet sample is +It is possible to have additional adapter interfaces automatically configured +when the nodes are booted. XCAT provides sample configuration scripts for +ethernet, IB, and HFI adapters. These scripts can be used as-is or they can be +modified to suit your particular environment. The ethernet sample is ``/install/postscript/configeth``. When you have the configuration script that you want you can add it to the "postscripts" attribute as mentioned above. Make sure your script is in the ``/install/postscripts`` directory and that it is executable. -Note: For system p servers, if you plan to have your service node perform the -hardware control functions for its compute nodes, it is necessary that the SN +Note: For system p servers, if you plan to have your service node perform the +hardware control functions for its compute nodes, it is necessary that the SN ethernet network adapters connected to the HW service VLAN be configured. Configuring Secondary Adapters From d38f36e05588d682a345d40b83363123eec39b9d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0073/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/define_service_nodes.rst --- .../hierarchy/define_service_nodes.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/advanced/hierarchy/define_service_nodes.rst b/docs/source/advanced/hierarchy/define_service_nodes.rst index 63137f989..5e1d14785 100644 --- a/docs/source/advanced/hierarchy/define_service_nodes.rst +++ b/docs/source/advanced/hierarchy/define_service_nodes.rst @@ -3,7 +3,7 @@ Define Service Nodes This next part shows how to configure a xCAT Hierarchy and provision xCAT service nodes from an existing xCAT cluster. -*The document assumes that the compute nodes that are part of your cluster have already been defined into the xCAT database and you have successfully provisioned the compute nodes using xCAT* +*The document assumes that the compute nodes that are part of your cluster have already been defined into the xCAT database and you have successfully provisioned the compute nodes using xCAT* The following table illustrates the cluster being used in this example: @@ -33,8 +33,8 @@ The following table illustrates the cluster being used in this example: chdef -t site hierarchicalattrs="postscripts" -#. Select the compute nodes that will become service nodes - +#. Select the compute nodes that will become service nodes + The first node in each rack, ``r1n01`` and ``r2n01``, is selected to become the xCAT service nodes and manage the compute nodes in that rack @@ -53,7 +53,7 @@ The following table illustrates the cluster being used in this example: chdef -t group -o service setupnfs=1 \ setupdhcp=1 \ - setuptftp=1 \ + setuptftp=1 \ setupnameserver=1 \ setupconserver=2 @@ -63,26 +63,26 @@ The following table illustrates the cluster being used in this example: * For clusters with subnetted management networks, you might want to set ``setupupforward=1`` * For the ``setupconserver`` attribute, if ``conserver`` is used, set to ``1``, if ``goconserver`` is used, set to ``2`` -#. Add additional postscripts for Service Nodes (optional) +#. Add additional postscripts for Service Nodes (optional) By default, xCAT will execute the ``servicenode`` postscript when installed or diskless booted. This postscript will set up the necessary credentials and installs the xCAT software on the Service Nodes. If you have additional postscripts that you want to execute on the service nodes, copy to ``/install/postscripts`` and run the following: :: chdef -t group -o service -p postscripts= -#. Assigning Compute Nodes to their Service Nodes +#. Assigning Compute Nodes to their Service Nodes + + The node attributes ``servicenode`` and ``xcatmaster``, define which Service node will serve the particular compute node. - The node attributes ``servicenode`` and ``xcatmaster``, define which Service node will serve the particular compute node. - * ``servicenode`` - defines which Service Node the **Management Node** should send commands to (e.g ``xdsh``) and should be set to the hostname or IP address of the service node that the management node can contact it by. * ``xcatmaster`` - defines which Service Node the **Compute Node** should boot from and should be set to the hostname or IP address of the service node that the compute node can contact it by. You must set both ``servicenode`` and ``xcatmaster`` regardless of whether or not you are using service node pools, for most scenarios, the value will be identical. :: - chdef -t group -o rack1 servicenode=r1n01 xcatmaster=r1n01 + chdef -t group -o rack1 servicenode=r1n01 xcatmaster=r1n01 chdef -t group -o rack2 servicenode=r2n01 xcatmaster=r2n01 #. Set the conserver and monserver attributes - + Set which service node should run the conserver (console) and monserver (monitoring) daemon for the nodes in the group. The most typical setup is to have the service node also ad as it's conserver and monserver. :: chdef -t group -o rack1 conserver=r1n01 monserver=r1n01 @@ -101,7 +101,7 @@ The following table illustrates the cluster being used in this example: chdef -t site clustersite sharedtftp=0 chdef -t site clustersite installloc= - rsync -auv --exclude 'autoinst' /install r1n01:/ - rsync -auv --exclude 'autoinst' /install r2n01:/ - rsync -auv --exclude 'autoinst' /tftpboot r1n01:/ - rsync -auv --exclude 'autoinst' /tftpboot r2n01:/ + rsync -auv --exclude 'autoinst' /install r1n01:/ + rsync -auv --exclude 'autoinst' /install r2n01:/ + rsync -auv --exclude 'autoinst' /tftpboot r1n01:/ + rsync -auv --exclude 'autoinst' /tftpboot r2n01:/ From 558b2a81e1cd115d244db5ecdc3d1aaa80a5d0a4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0074/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/index.rst --- docs/source/advanced/hierarchy/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/hierarchy/index.rst b/docs/source/advanced/hierarchy/index.rst index 4439ff4e6..52ed9ac80 100644 --- a/docs/source/advanced/hierarchy/index.rst +++ b/docs/source/advanced/hierarchy/index.rst @@ -1,7 +1,7 @@ Hierarchical Clusters / Large Cluster Support ============================================= -xCAT supports management of very large sized cluster by creating a **Hierarchical Cluster** and the concept of **xCAT Service Nodes**. +xCAT supports management of very large sized cluster by creating a **Hierarchical Cluster** and the concept of **xCAT Service Nodes**. When dealing with large clusters, to balance the load, it is recommended to have more than one node (Management Node, "MN") handling the installation and management of the Compute Nodes ("CN"). These additional *helper* nodes are referred to as **Service Nodes** ("SN"). The Management Node can delegate all management operational needs to the Service Node responsible for a set of compute node. From 9dd0e5217f8d39d221650739263350ce0f526892 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0075/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/provision/diskful_sn.rst --- docs/source/advanced/hierarchy/provision/diskful_sn.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/hierarchy/provision/diskful_sn.rst b/docs/source/advanced/hierarchy/provision/diskful_sn.rst index 552d0f39a..e72b9ba6a 100644 --- a/docs/source/advanced/hierarchy/provision/diskful_sn.rst +++ b/docs/source/advanced/hierarchy/provision/diskful_sn.rst @@ -11,7 +11,7 @@ Any cluster using statelite compute nodes must use a stateful (diskful) Service Configure ``otherpkgdir`` and ``otherpkglist`` for service node osimage ----------------------------------------------------------------------- - * Create a subdirectory ``xcat`` under a path specified by ``otherpkgdir`` attribute of the service node os image, selected during the :doc:`../define_service_nodes` step. + * Create a subdirectory ``xcat`` under a path specified by ``otherpkgdir`` attribute of the service node os image, selected during the :doc:`../define_service_nodes` step. For example, for osimage *rhels7-x86_64-install-service* :: @@ -114,17 +114,17 @@ Watch the installation progress using either wcons or rcons: :: Update Service Node Diskful Image --------------------------------- -To update the xCAT software on the Service Node: +To update the xCAT software on the Service Node: #. Remove previous xcat-core, xcat-dep, and tar files in the NFS mounted ``/install/post/otherpkgs/`` directory: :: - + rm /install/post/otherpkgs///xcat/xcat-core rm /install/post/otherpkgs///xcat/xcat-dep rm /install/post/otherpkgs///xcat/ rm /install/post/otherpkgs///xcat/ #. Download the desired tar files from xcat.org on to the Management Node, and untar them in the same NFS mounted ``/install/post/otherpkgs/`` directory: :: - + cd /install/post/otherpkgs///xcat/ tar jxvf tar jxvf From 8eb6db67e9debd7df01b97a5196459fead84073c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0076/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/provision/diskless_sn.rst --- .../advanced/hierarchy/provision/diskless_sn.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/advanced/hierarchy/provision/diskless_sn.rst b/docs/source/advanced/hierarchy/provision/diskless_sn.rst index 8825a1ad1..3412f01e7 100644 --- a/docs/source/advanced/hierarchy/provision/diskless_sn.rst +++ b/docs/source/advanced/hierarchy/provision/diskless_sn.rst @@ -67,7 +67,7 @@ When you run ``copycds``, xCAT will only create a Service Node stateful osimage If you would like to change any of these files, copy them to a custom directory. This can be any directory you choose, but we recommend that you - keep it /install somewhere. A good location is something like ``/install/custom/netboot/``. + keep it /install somewhere. A good location is something like ``/install/custom/netboot/``. :: @@ -172,8 +172,8 @@ When you run ``copycds``, xCAT will only create a Service Node stateful osimage If you installed your management node directly from the online repository, you will need to download the ``xcat-core`` and ``xcat-dep`` tarballs - - From http://xcat.org/download.html, download the ``xcat-core`` and ``xcat-dep`` tarball files. - Copy these into a subdirectory in the ``otherpkgdir`` directory. + - From http://xcat.org/download.html, download the ``xcat-core`` and ``xcat-dep`` tarball files. + Copy these into a subdirectory in the ``otherpkgdir`` directory. :: @@ -184,9 +184,9 @@ When you run ``copycds``, xCAT will only create a Service Node stateful osimage cd /install/post/otherpkgs/rhels7.3/ppc64le mkdir xcat cd xcat - + # copy the and tarballs here - + # extract the tarballs tar -jxvf .tar.bz2 tar -jxvf .tar.bz2 From 71cd0917349b1ef41a48c614ff89cfde6c0dcf9a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0077/1681] Remove trailing spaces in file docs/source/advanced/hierarchy/service_nodes.rst --- docs/source/advanced/hierarchy/service_nodes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/hierarchy/service_nodes.rst b/docs/source/advanced/hierarchy/service_nodes.rst index 7a6462a04..a1c99d57c 100644 --- a/docs/source/advanced/hierarchy/service_nodes.rst +++ b/docs/source/advanced/hierarchy/service_nodes.rst @@ -1,7 +1,7 @@ Service Nodes ============= -Service Nodes are similar to the xCAT Management Node in that each service Nodes runs an instance of the xCAT daemon: ``xcatd``. ``xcatd``'s communicate with each other using the same XML/SSL protocol that the xCAT client uses to communicate with ``xcatd`` on the Management Node. +Service Nodes are similar to the xCAT Management Node in that each service Nodes runs an instance of the xCAT daemon: ``xcatd``. ``xcatd``'s communicate with each other using the same XML/SSL protocol that the xCAT client uses to communicate with ``xcatd`` on the Management Node. The Service Nodes need to communicate with the xCAT database running on the Management Node. This is done using the remote client capabilities of the database. This is why the default SQLite database cannot be used. From 6b1f12e145c24070bc63faa492c81cd27171be05 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0078/1681] Remove trailing spaces in file docs/source/advanced/kit/custom/build/createkit.rst --- .../advanced/kit/custom/build/createkit.rst | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/source/advanced/kit/custom/build/createkit.rst b/docs/source/advanced/kit/custom/build/createkit.rst index fbb0e6118..2c712c8ff 100644 --- a/docs/source/advanced/kit/custom/build/createkit.rst +++ b/docs/source/advanced/kit/custom/build/createkit.rst @@ -6,15 +6,15 @@ Use the :doc:`buildkit ` comman buildkit create [-l|--kitloc ] -Kit Directory +Kit Directory ------------- -The Kit directory location will be automatically populated with additional subdirecotries and samples: +The Kit directory location will be automatically populated with additional subdirecotries and samples: **buildkit.conf** - The sample Kit build configuration file. **source_packages** - This directory stores the source packages for Kit Packages and Non-Native Packages. The **buildkit** command will search these directories for source packages when building packages. This directory stores: - + * RPM spec and tarballs. (A sample spec file is provided.) * Source RPMs. * Pre-built RPMs (contained in a subdirectory of source_packages) @@ -42,7 +42,7 @@ The Kit directory location will be automatically populated with additional subd Kit Configuration File ---------------------- -The ``buildkit.conf`` file is a sample file that contains a description of all the supported attributes and indicates required or optional fields. The user needs to modify this file for the software kit to be built. [#]_ +The ``buildkit.conf`` file is a sample file that contains a description of all the supported attributes and indicates required or optional fields. The user needs to modify this file for the software kit to be built. [#]_ **kit** --- This stanza defines general information for the Kit. There must be exactly one kit stanza in a kit build file. :: @@ -71,12 +71,12 @@ The ``buildkit.conf`` file is a sample file that contains a description of all t osarch=x86_64 minor version can be support following format: :: - + osminorversion=2 <<-- minor version has to be exactly matched to 2 osminorversion=>=2 <<-- minor version can be 2 or greater than 2 - osminorversion=<=2 <<-- minor version can be 2 or less than 2 + osminorversion=<=2 <<-- minor version can be 2 or less than 2 osminorversion=>2 <<-- minor version has to be greater than 2 - osminorversion=<2 <<-- minor version has to be less than 2 + osminorversion=<2 <<-- minor version has to be less than 2 **kitcomponent** --- This stanza defines one Kit Component. A kitcomponent definition is a way of specifying a subset of the product Kit that may be installed into an xCAT osimage. A kitcomponent may or may not be dependent on other kitcomponents.If user want to build a component which supports multiple OSes, need to create one kitcomponent stanza for each OS. :: @@ -106,13 +106,13 @@ minor version can be support following format: :: serverroles=compute ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs,insserv kitrepoid=sles11_x86_64 - kitpkgdeps=ppe_rte_license + kitpkgdeps=ppe_rte_license -**kitpackage** --- This stanza defines Kit Package (ie. RPM). There can be zero or more kitpackage stanzas. For multiple package supports, need to +**kitpackage** --- This stanza defines Kit Package (ie. RPM). There can be zero or more kitpackage stanzas. For multiple package supports, need to #. Define one kitpackage section per supported OS. or - #. Define one kitpacakge stanza which contains multiple kitrepoid lines. For the RPM packages, users need to responsible for creating an RPM spec file that can run on multiple OSes. + #. Define one kitpacakge stanza which contains multiple kitrepoid lines. For the RPM packages, users need to responsible for creating an RPM spec file that can run on multiple OSes. :: @@ -149,7 +149,7 @@ minor version can be support following format: :: Partial vs. Complete Kits ------------------------- -A **complete** software kits includes all the product software and is ready to be consumed as is. A **partial** software kit is one that does not include all the product packages and requires the consumer to download the product software and complete the kit before it can be consumed. +A **complete** software kits includes all the product software and is ready to be consumed as is. A **partial** software kit is one that does not include all the product packages and requires the consumer to download the product software and complete the kit before it can be consumed. To build partial kits, the ``isexternalpkg=yes`` needs to be set in the ``kitpackage`` stanza in the ``buildkit.conf`` file: :: From f618d7980fa49a9c9b5df3dc0a00ad810f5887b0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0079/1681] Remove trailing spaces in file docs/source/advanced/kit/custom/build/kitrepo.rst --- docs/source/advanced/kit/custom/build/kitrepo.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/kit/custom/build/kitrepo.rst b/docs/source/advanced/kit/custom/build/kitrepo.rst index 964c203a1..a2f757ac1 100644 --- a/docs/source/advanced/kit/custom/build/kitrepo.rst +++ b/docs/source/advanced/kit/custom/build/kitrepo.rst @@ -25,4 +25,4 @@ If the Kit Package Repository is not fully built, the command builds it as follo #. Build the Component Meta-Packages associated with this Kit Package Repository. Create the packages under the Kit Package Repository directory #. Build the Kit Packages associated with this Kit Package Repository. Create the packages under the Kit Package Repository directory #. Build the repository meta-data for the Kit Package Repository. The repository meta-data is based on the OS native package format. For example, for RHEL, we build the YUM repository meta-data with the createrepo command. - + From df62883c5517dc45a255dc63558bf1e501da0c5c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0080/1681] Remove trailing spaces in file docs/source/advanced/kit/custom/build/kittarfile.rst --- docs/source/advanced/kit/custom/build/kittarfile.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/kit/custom/build/kittarfile.rst b/docs/source/advanced/kit/custom/build/kittarfile.rst index 5246b35f3..0a8e39e9a 100644 --- a/docs/source/advanced/kit/custom/build/kittarfile.rst +++ b/docs/source/advanced/kit/custom/build/kittarfile.rst @@ -37,7 +37,7 @@ Follow these steps to complete the kit build process for a partial kit. #. copy the partial kit to a working directory #. copy the product software packages to a convenient location or locations #. cd to the working directory - #. Build the complete kit tarfile + #. Build the complete kit tarfile :: From 490d9deff6c14a4b224c587525512e7458ec8aca Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0081/1681] Remove trailing spaces in file docs/source/advanced/kit/custom/build/validatekit.rst --- docs/source/advanced/kit/custom/build/validatekit.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/kit/custom/build/validatekit.rst b/docs/source/advanced/kit/custom/build/validatekit.rst index ea2f108ec..7f9c64554 100644 --- a/docs/source/advanced/kit/custom/build/validatekit.rst +++ b/docs/source/advanced/kit/custom/build/validatekit.rst @@ -5,5 +5,5 @@ After modifying the ``buildkit.conf`` file and copying all the necessary files t buildkit chkconfig -This command will verify all required fields defined in the buildkit.conf. If errors are found, fix the specified error and rerun the command until all fields are validated. +This command will verify all required fields defined in the buildkit.conf. If errors are found, fix the specified error and rerun the command until all fields are validated. From a4b70760c728d12fc21e790e2a7b923e35e0b990 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0082/1681] Remove trailing spaces in file docs/source/advanced/kit/custom/introduction.rst --- docs/source/advanced/kit/custom/introduction.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/advanced/kit/custom/introduction.rst b/docs/source/advanced/kit/custom/introduction.rst index febb1dbde..3d7042166 100644 --- a/docs/source/advanced/kit/custom/introduction.rst +++ b/docs/source/advanced/kit/custom/introduction.rst @@ -1,4 +1,4 @@ -Introduction +Introduction ============ Contents @@ -6,10 +6,10 @@ Contents A Software Kit is a tar file that contains the following: -**Kit Configuration File** --- A file describing the contents of this kit and contains following information +**Kit Configuration File** --- A file describing the contents of this kit and contains following information * Kit name, version, description, supported OS distributions, license information, and deployment parameters - * Kit repository information including name, supported OS distributions, and supported architectures + * Kit repository information including name, supported OS distributions, and supported architectures * Kit component information including name, version, description, server roles, scripts, and other data **Kit Repositories** --- A directory for each operating system version this kit is supported in. Each directory contains all of the product software packages required for that environment along with repository metadata. @@ -42,14 +42,14 @@ Once the kit components are added to xCAT osimage definitions, administrators ca #. ``genimage`` command to create a diskless OS image installing the kit components for diskless OS provisioning #. ``updatenode`` command to install the kit components on existing deployed nodes -The ``kitcomponent`` metadata defines the kit packages as dependency packages and the OS package manager (``yum``, ``zypper``, ``apt-get``) automatically installes the required packages during the xCAT ``otherpkgs`` install process. +The ``kitcomponent`` metadata defines the kit packages as dependency packages and the OS package manager (``yum``, ``zypper``, ``apt-get``) automatically installes the required packages during the xCAT ``otherpkgs`` install process. Kit Framework ------------- -With time, the implementation of the xCAT Software Kit support may change. +With time, the implementation of the xCAT Software Kit support may change. -In order to process a kit successfully, the kit must be compatible with the level of xCAT code that was used to build the kit. The xCAT kit commands and software kits contain the framework version and compatible supported versions. +In order to process a kit successfully, the kit must be compatible with the level of xCAT code that was used to build the kit. The xCAT kit commands and software kits contain the framework version and compatible supported versions. To view the framework version, use the ``-v | --version`` option on :doc:`addkit ` :: @@ -59,7 +59,7 @@ To view the framework version, use the ``-v | --version`` option on :doc:`addkit compatible_frameworks = 0,1,2 -If the commands in the xCAT installation is not compatible with the Software Kit obtained, update xCAT to a more recent release. +If the commands in the xCAT installation is not compatible with the Software Kit obtained, update xCAT to a more recent release. -.. [#] PCM is IBM Platform Cluster Manager +.. [#] PCM is IBM Platform Cluster Manager From aea82825cdb7b3d4ee7c3dcb54b08c7e0f5e488e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0083/1681] Remove trailing spaces in file docs/source/advanced/kit/custom/using/update.rst --- docs/source/advanced/kit/custom/using/update.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/kit/custom/using/update.rst b/docs/source/advanced/kit/custom/using/update.rst index 2651a6e93..210912189 100644 --- a/docs/source/advanced/kit/custom/using/update.rst +++ b/docs/source/advanced/kit/custom/using/update.rst @@ -24,6 +24,6 @@ updating diskful nodes For existing active nodes, use the updatenode command to update the OS on those nodes. The updatenode command will use the osimage assigned to the node to determine the software to be updated. Once the osimage has been updated, make sure the correct image is assigned to the node and then run updatenode: :: - chdef provmethod= + chdef provmethod= updatenode From f079e4db5e26b64fccdcb49d3c4936475c046d67 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0084/1681] Remove trailing spaces in file docs/source/advanced/kit/hpc/quickstart.rst --- docs/source/advanced/kit/hpc/quickstart.rst | 36 ++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/source/advanced/kit/hpc/quickstart.rst b/docs/source/advanced/kit/hpc/quickstart.rst index 74b8d83e4..90e16f973 100644 --- a/docs/source/advanced/kit/hpc/quickstart.rst +++ b/docs/source/advanced/kit/hpc/quickstart.rst @@ -1,9 +1,9 @@ Quick Start Guide ================= -This quick start is provided to guide users through the steps required to install the IBM High Performance Computing (HPC) software stack on a cluster managed by xCAT. (*NOTE:* xCAT provides XLC and XLF partial kits, but all other HPC kits are provided by the HPC products teams, xCAT may not have any knowledges of their dependencies and requirements) +This quick start is provided to guide users through the steps required to install the IBM High Performance Computing (HPC) software stack on a cluster managed by xCAT. (*NOTE:* xCAT provides XLC and XLF partial kits, but all other HPC kits are provided by the HPC products teams, xCAT may not have any knowledges of their dependencies and requirements) -The following software kits will be used to install the IBM HPC software stack on to a RedHat Enterprise Linux 7.2 operating system running on ppc64le architecture. +The following software kits will be used to install the IBM HPC software stack on to a RedHat Enterprise Linux 7.2 operating system running on ppc64le architecture. * ``xlc-13.1.3-0-ppc64le.tar.bz2`` [1]_ * ``xlf-15.1.3-0-ppc64le.tar.bz2`` [1]_ @@ -16,7 +16,7 @@ The following software kits will be used to install the IBM HPC software stack o .. [1] This guide assumes that the **complete** software kit is available for all the products listed below. For the IBM XL compilers, follow the :doc:`IBM XL Compiler ` documentation to obtain the software and create the **complete** kit before proceeding. 1. Using the ``addkit`` command, add each software kit package into xCAT: :: - + addkit xlc-13.1.3-0-ppc64le.tar.bz2,xlf-15.1.3-0-ppc64le.tar.bz2 addkit pperte-2.3.0.0-1547a-ppc64le.tar.bz2,pperte-2.3.0.2-s002a-ppc64le.tar.bz2 addkit pessl-5.2.0-0-ppc64le.tar.bz2,essl-5.4.0-0-ppc64le.tar.bz2 @@ -25,15 +25,15 @@ The following software kits will be used to install the IBM HPC software stack o The ``lskit`` command can be used to view the kits after adding to xCAT. -2. Using the ``addkitcomp`` command, add the kitcomponent to the target osimage. +2. Using the ``addkitcomp`` command, add the kitcomponent to the target osimage. - The order that the kit components are added to the osimage is important due to dependencies that kits may have with one another, a feature to help catch potential issues ahead of time. There are a few different types of dependencies: + The order that the kit components are added to the osimage is important due to dependencies that kits may have with one another, a feature to help catch potential issues ahead of time. There are a few different types of dependencies: * **internal kit dependencies** - kit components within the software kit have dependencies. For example, the software has a dependency on it's license component. The ``-a`` option will automatically resolve internal kit dependencies. - * **external kit dependencies** - a software kit depends on another software provided in a separate kit. The dependency kit must be added first. ``addkitcomp`` will complain if it cannot resolve the dependency. - * **runtime dependencies** - the software provided in the kit has rpm requirements for external 3rd party RPMs not shipped with the kit. The administrator needs to configure these before deploying the osimage and ``addkitcomp`` cannot detect this dependencies. + * **external kit dependencies** - a software kit depends on another software provided in a separate kit. The dependency kit must be added first. ``addkitcomp`` will complain if it cannot resolve the dependency. + * **runtime dependencies** - the software provided in the kit has rpm requirements for external 3rd party RPMs not shipped with the kit. The administrator needs to configure these before deploying the osimage and ``addkitcomp`` cannot detect this dependencies. - In the following examples, the ``rhels7.2-ppc64le-install-compute`` osimage is used and the ``-a`` option is specified to resolve internal dependencies. + In the following examples, the ``rhels7.2-ppc64le-install-compute`` osimage is used and the ``-a`` option is specified to resolve internal dependencies. #. Add the **XLC** kitcomponents to the osimage: :: @@ -42,7 +42,7 @@ The following software kits will be used to install the IBM HPC software stack o #. Add the **XLF** kitcomponents to the osimage: :: - + addkitcomp -a -i rhels7.2-ppc64le-install-compute \ xlf.compiler-compute-15.1.3-0-rhels-7.2-ppc64le @@ -59,11 +59,11 @@ The following software kits will be used to install the IBM HPC software stack o min-pperte-compute-2.3.0.0-1547a-rhels-7.2-ppc64le - #. Add the PE RTE PTF2, **pperte-s002a**, kitcomponents to the osimage. + #. Add the PE RTE PTF2, **pperte-s002a**, kitcomponents to the osimage. The PTF2 update requires the ``pperte-license`` component, which is provided by the GA software kit. The ``addkitcomp -n`` option allows for multiple versions of the same kit component to be installed into the osimage. If only the PTF2 version is intended to be installed, you can skip the previous step for adding the GA ppetre kit component, but the GA software kit must have been added to xCAT with the ``addkit`` command in order to resolve the license dependency. :: - addkitcomp -a -n -i rhels7.2-ppc64le-install-compute \ + addkitcomp -a -n -i rhels7.2-ppc64le-install-compute \ pperte-login-2.3.0.2-s002a-rhels-7.2-ppc64le addkitcomp -a -n -i rhels7.2-ppc64le-install-compute \ @@ -73,7 +73,7 @@ The following software kits will be used to install the IBM HPC software stack o min-pperte-compute-2.3.0.2-s002a-rhels-7.2-ppc64le - #. Add the **ESSL** kitcomponents to the osimage. + #. Add the **ESSL** kitcomponents to the osimage. The ESSL software kit has an *external dependency* to the ``libxlf`` which is provided in the XLF software kit. Since it's already added in the above step, there is no action needed here. @@ -101,9 +101,9 @@ The following software kits will be used to install the IBM HPC software stack o addkitcomp -a -i rhels7.2-ppc64le-install-compute \ essl-computenode-3264rtecuda-5.4.0-0-rhels-7.2-ppc64le - If the system doesn't have GPU and the CUDA toolkit is not needed, the administrator should not add the following kit components that requires the CUDA packages: ``essl-loginnode-5.4.0-0-rhels-7.2-ppc64le``, ``essl-computenode-3264rte-5.4.0-0-rhels-7.2-ppc64le`` and ``essl-computenode-3264rtecuda-5.4.0-0-rhels-7.2-ppc64le``. Check the ESSL installation guide: http://www.ibm.com/support/knowledgecenter/SSFHY8_5.4.0/com.ibm.cluster.essl.v5r4.essl300.doc/am5il_xcatinstall.htm + If the system doesn't have GPU and the CUDA toolkit is not needed, the administrator should not add the following kit components that requires the CUDA packages: ``essl-loginnode-5.4.0-0-rhels-7.2-ppc64le``, ``essl-computenode-3264rte-5.4.0-0-rhels-7.2-ppc64le`` and ``essl-computenode-3264rtecuda-5.4.0-0-rhels-7.2-ppc64le``. Check the ESSL installation guide: http://www.ibm.com/support/knowledgecenter/SSFHY8_5.4.0/com.ibm.cluster.essl.v5r4.essl300.doc/am5il_xcatinstall.htm - #. Add the **Parallel ESSL** kitcomponents to osimage. + #. Add the **Parallel ESSL** kitcomponents to osimage. **Note:** ESSL kitcomponents are required for the PESSL. :: @@ -115,7 +115,7 @@ The following software kits will be used to install the IBM HPC software stack o addkitcomp -a -i rhels7.2-ppc64le-install-compute \ pessl-computenode-3264rtempich-5.2.0-0-rhels-7.2-ppc64le - + #. Add the **PE DE** kitcomponents to osimage: :: @@ -124,11 +124,11 @@ The following software kits will be used to install the IBM HPC software stack o addkitcomp -a -i rhels7.2-ppc64le-install-compute \ ppedev.compute-2.2.0-0-rhels-7.2-ppc64le - + 3. The updated osimage now contains the configuration to install using xCAT software kits: :: - lsdef -t osimage rhels7.2-ppc64le-install-compute + lsdef -t osimage rhels7.2-ppc64le-install-compute Object name: rhels7.2-ppc64le-install-compute exlist=/install/osimages/rhels7.2-ppc64le-install-compute-kits/kits/KIT_COMPONENTS.exlist imagetype=linux @@ -146,4 +146,4 @@ The following software kits will be used to install the IBM HPC software stack o provmethod=install template=/opt/xcat/share/xcat/install/rh/compute.rhels7.tmpl -4. The osimage is now ready to deploy to the compute nodes. +4. The osimage is now ready to deploy to the compute nodes. From f74daf4100025c8a1dead5dbf242ef5231bee4a4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0085/1681] Remove trailing spaces in file docs/source/advanced/kit/hpc/software/compilers.rst --- docs/source/advanced/kit/hpc/software/compilers.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/advanced/kit/hpc/software/compilers.rst b/docs/source/advanced/kit/hpc/software/compilers.rst index 736262e42..467781b2f 100644 --- a/docs/source/advanced/kit/hpc/software/compilers.rst +++ b/docs/source/advanced/kit/hpc/software/compilers.rst @@ -1,13 +1,13 @@ IBM XL Compilers ================ -IBM provides XL compilers with advanced optimizing on IBM Power Systems running Linux. +IBM provides XL compilers with advanced optimizing on IBM Power Systems running Linux. For more information, http://www-03.ibm.com/software/products/en/xlcpp-linux Partial Kits ------------ -The IBM XL compilers are dependencies for some of the HPC software products and is **not** available in xCAT Software Kit format. +The IBM XL compilers are dependencies for some of the HPC software products and is **not** available in xCAT Software Kit format. To assist customers in creating a software kit for the IBM XL compilers, xCAT provides partial kits at: https://xcat.org/files/kits/hpckits/ @@ -46,7 +46,7 @@ To use software kits that require compiler kit components, a compiler software k xlsmp.lib-3.1.0.8-151013.ppc64.rpm xlsmp.msg.rte-3.1.0.8-151013.ppc64.rpm xlsmp.rte-3.1.0.8-151013.ppc64.rpm - + #. Obtain the corresponding compiler partial kit from https://xcat.org/files/kits/hpckits/. [#]_ **xlc-12.1.0.8-151013-ppc64.NEED_PRODUCT_PKGS.tar.bz2** is downloaded to ``/tmp/kits``: :: @@ -56,11 +56,11 @@ To use software kits that require compiler kit components, a compiler software k #. Complete the partial kit by running the ``buildkit addpkgs`` command: :: - buildkit addpkgs xlc-12.1.0.8-151013-ppc64.NEED_PRODUCT_PKGS.tar.bz2 \ + buildkit addpkgs xlc-12.1.0.8-151013-ppc64.NEED_PRODUCT_PKGS.tar.bz2 \ --pkgdir /tmp/kits/xlc-12.1.0.8 Sample output: :: - + Extracting tar file /tmp/kits/xlc-12.1.0.8-151013-ppc64.NEED_PRODUCT_PKGS.tar.bz2. Please wait. Spawning worker 0 with 5 pkgs Spawning worker 1 with 5 pkgs @@ -73,7 +73,7 @@ To use software kits that require compiler kit components, a compiler software k Generating sqlite DBs Sqlite DBs complete Creating tar file /tmp/kits/xlc-12.1.0.8-151013-ppc64.tar.bz2. - Kit tar file /tmp/kits/xlc-12.1.0.8-151013-ppc64.tar.bz2 successfully built. + Kit tar file /tmp/kits/xlc-12.1.0.8-151013-ppc64.tar.bz2 successfully built. From d4b08d1f1fc5356a26f66c2804cb74f4f89ec5e0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0086/1681] Remove trailing spaces in file docs/source/advanced/kit/hpc/software/index.rst --- docs/source/advanced/kit/hpc/software/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/kit/hpc/software/index.rst b/docs/source/advanced/kit/hpc/software/index.rst index 2ec80c8fc..1ae8bb3dd 100644 --- a/docs/source/advanced/kit/hpc/software/index.rst +++ b/docs/source/advanced/kit/hpc/software/index.rst @@ -10,4 +10,4 @@ Refer to the following pages for product specific details and known issues. pe_rte.rst pe_de.rst essl.rst - pessl.rst + pessl.rst From 8c6403a2e04f9edf4c7c16e56463cd85886c3fc1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0087/1681] Remove trailing spaces in file docs/source/advanced/kit/hpc/software/pe_de.rst --- docs/source/advanced/kit/hpc/software/pe_de.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/kit/hpc/software/pe_de.rst b/docs/source/advanced/kit/hpc/software/pe_de.rst index 2f05f9bff..400f7035b 100644 --- a/docs/source/advanced/kit/hpc/software/pe_de.rst +++ b/docs/source/advanced/kit/hpc/software/pe_de.rst @@ -3,7 +3,7 @@ Parallel Environment Developer Edition (PE DE) xCAT software kits for PE DE for Linux is available on: [#]_ - * PE DE 1.2.0.1 and newer (SystemX) + * PE DE 1.2.0.1 and newer (SystemX) * PE DE 1.2.0.3 and newer (SystemP) From 5fefbad363da5d72e68331e93d005746a98de578 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0088/1681] Remove trailing spaces in file docs/source/advanced/kit/hpc/software/pe_rte.rst --- docs/source/advanced/kit/hpc/software/pe_rte.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/advanced/kit/hpc/software/pe_rte.rst b/docs/source/advanced/kit/hpc/software/pe_rte.rst index 5db73c479..900c2d0fe 100644 --- a/docs/source/advanced/kit/hpc/software/pe_rte.rst +++ b/docs/source/advanced/kit/hpc/software/pe_rte.rst @@ -7,7 +7,7 @@ xCAT software kits for PE RTE for Linux is available on: [#]_ -PE RTE and ``mlnxofed_ib_install`` Conflict +PE RTE and ``mlnxofed_ib_install`` Conflict ------------------------------------------- PPE requires the 32-bit version of ``libibverbs``. The default behavior of the ``mlnxofed_ib_install`` postscript used to install the Mellanox OFED Infiniband (IB) driver is to remove any of the old IB related packages when installing. To bypass this behavior, set the variable ``mlnxofed_options=--force`` when running the ``mlnxofed_ib_install`` script. @@ -18,8 +18,8 @@ Install Multiple Versions Beginning with **PE RTE 1.2.0.10**, the packages are designed to allow for multiple versions of PE RTE to coexist on the same machine. -The default behavior of xCAT software kits is to only allow one version of a ``kitcomponent`` to be associated with an xCAT osimage. -When using ``addkitcomp`` to add a newer version of a kit component, xCAT will first remove the old version of the kit component before adding the new one. +The default behavior of xCAT software kits is to only allow one version of a ``kitcomponent`` to be associated with an xCAT osimage. +When using ``addkitcomp`` to add a newer version of a kit component, xCAT will first remove the old version of the kit component before adding the new one. To add multiple versions of PE RTE kit components to the same osimage, use the ``-n | --noupgrade`` option. For example, to add PE RTE 1.3.0.1 and PE RTE 1.3.0.2 to the ``compute`` osimage: :: @@ -36,11 +36,11 @@ When running parallel jobs, POE requires the user pass it a host list file. xCA Known Issues ------------ -* **[PE RTE 1.3.0.7]** - For developers creating the complete software kit. The src rpm is no longer required. It is recommended to create the new software kit for PE RTE 1.3.0.7 from scratch and not to use the older kits as a starting point. +* **[PE RTE 1.3.0.7]** - For developers creating the complete software kit. The src rpm is no longer required. It is recommended to create the new software kit for PE RTE 1.3.0.7 from scratch and not to use the older kits as a starting point. -* **[PE RTE 1.3.0.7]** - When upgrading ``ppe_rte_man`` in a diskless image, there may be errors reported during the genimage process. The new packages are actually upgraded, so the errors can be ignored with low risk. +* **[PE RTE 1.3.0.7]** - When upgrading ``ppe_rte_man`` in a diskless image, there may be errors reported during the genimage process. The new packages are actually upgraded, so the errors can be ignored with low risk. -* **[PE RTE 1.3.0.1 to 1.3.0.6]** - When uninstalling or upgrading ppe_rte_man in an diskless image, ``genimage `` may fail and stop an an error. To workaround, simply rerun ``genimage `` to finish the creation of the diskless image +* **[PE RTE 1.3.0.1 to 1.3.0.6]** - When uninstalling or upgrading ppe_rte_man in an diskless image, ``genimage `` may fail and stop an an error. To workaround, simply rerun ``genimage `` to finish the creation of the diskless image From 11e775e8d276eb29cc93e476adc763a1e8be2622 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0089/1681] Remove trailing spaces in file docs/source/advanced/kit/index.rst --- docs/source/advanced/kit/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/kit/index.rst b/docs/source/advanced/kit/index.rst index 83f4d44c1..fda29f7f2 100644 --- a/docs/source/advanced/kit/index.rst +++ b/docs/source/advanced/kit/index.rst @@ -1,9 +1,9 @@ Software Kits ============= -xCAT supports a unique software bundling concept called **software kits**. Software kit combines all of the required product components (packages, license, configuration, scripts, etc) to assist the administrator in the installation of software onto machines managed by xCAT. Software kits are made up of a collection of "kit components", each of which is tailored to one specific environment for that particular version of the software product. +xCAT supports a unique software bundling concept called **software kits**. Software kit combines all of the required product components (packages, license, configuration, scripts, etc) to assist the administrator in the installation of software onto machines managed by xCAT. Software kits are made up of a collection of "kit components", each of which is tailored to one specific environment for that particular version of the software product. -Prebuilt software kits are available as a tar file which can be downloaded and then added to the xCAT installation. After the kits are added to xCAT, kit components are then added to specific xCAT osimages to automatically install the software bundled with the kit during OS deployment. In some instances, software kits may be provided as partial kits. Partial kits need additional effort to complete the kit before it can be used by xCAT. +Prebuilt software kits are available as a tar file which can be downloaded and then added to the xCAT installation. After the kits are added to xCAT, kit components are then added to specific xCAT osimages to automatically install the software bundled with the kit during OS deployment. In some instances, software kits may be provided as partial kits. Partial kits need additional effort to complete the kit before it can be used by xCAT. Software kits are supported for both diskful and diskless image provisioning. From fe197a5afa8c448b3f4bc5b699c966a122f24813 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0090/1681] Remove trailing spaces in file docs/source/advanced/migration/migration.rst --- docs/source/advanced/migration/migration.rst | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/advanced/migration/migration.rst b/docs/source/advanced/migration/migration.rst index 46d84c6af..ebd057929 100644 --- a/docs/source/advanced/migration/migration.rst +++ b/docs/source/advanced/migration/migration.rst @@ -12,24 +12,24 @@ Backup Old xCAT Management Node Backup xCAT management node data to backup server: -1.1 Backup xCAT important files and directories: +1.1 Backup xCAT important files and directories: - #. Get ``installdir`` from ``site`` table, backup ``installdir`` directory, + #. Get ``installdir`` from ``site`` table, backup ``installdir`` directory, in this case, back up ``install`` directory: :: - + lsdef -t site clustersite -i installdir Object name: clustersite installdir=/install - - #. Backup these two xCAT directories: :: + + #. Backup these two xCAT directories: :: ~/.xcat /etc/xcat - .. note:: Backing up ``~/.xcat`` is for all users who have xCAT client certs. + .. note:: Backing up ``~/.xcat`` is for all users who have xCAT client certs. #. If there are customized files and directories for ``otherpkgdir``, ``pkgdir``, ``pkglist`` or ``template`` in some `osimage` definitions, backup these files and directories. for example: :: - + lsdef -t osimage customized_rhels7.4-x86_64-install-compute -i otherpkgdir,pkgdir,pkglist,template Object name: customized_rhels7.4-x86_64-install-compute otherpkgdir=//post/otherpkgs/rhels7.4/x86_64 @@ -87,10 +87,10 @@ Backup xCAT management node data to backup server: /etc/ntp.conf -1.11 Backup database configure files (optional): +1.11 Backup database configure files (optional): * **[PostgreSQL]** :: - + /var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/data/postgresql.conf @@ -140,17 +140,17 @@ Restore xCAT management node 2.1 Power off old xCAT management server before configuring new xCAT management server 2.2 Configure new xCAT management server using the same ip and hostname as old xCAT management server. Configure the same additional network for hardware management network if needed, for example, bmc network or hmc network. xCAT management server setup refer to :doc:`Prepare the Management Node <../../guides/install-guides/yum/prepare_mgmt_node>` - + 2.3 Overwrite files/directories methioned in above 1.2, 1.3, 1.4 from backup server to new xCAT management server 2.4 Download xcat-core and xcat-dep tar ball, then install xCAT in new xCAT management server, refer to :doc:`install xCAT <../../guides/install-guides/yum/install>` -2.5 Use ``rpm -qa|grep -i xCAT`` to list all xCAT RPMs in new xCAT management node, compare these RPMs base name with those in ``xcat_rpm_names`` from above 1.15. If some RPMs are missing, use ``yum install `` to install missing RPMs. +2.5 Use ``rpm -qa|grep -i xCAT`` to list all xCAT RPMs in new xCAT management node, compare these RPMs base name with those in ``xcat_rpm_names`` from above 1.15. If some RPMs are missing, use ``yum install `` to install missing RPMs. 2.6 If use ``MySQL``/``MariaDB``/``PostgreSQL``, migrate xCAT to use ``MySQL/MariaDB/PostgreSQL`` refer to :doc:`Configure a Database <../hierarchy/databases/index>` 2.7 To restore the xCAT database - + a. Restore xCAT database from the ``/dbbackup/db`` directory without ``auditlog`` and ``eventlog``, enter: :: restorexCATdb -p /dbbackup/db @@ -160,7 +160,7 @@ Restore xCAT management node restorexCATdb -a -p /dbbackup/db c. (optinal) Overwrite files in above 1.11, restart ``PostgreSQL``: :: - + service postgresql restart 2.8 Overwrite remaining files/directories methioned in above 1.1, 1.5, 1.6, 1.7, 1.8, 1.9, 1.10, 1.12; If needed, check if files exist based on above 1.13 and 1.16. From 1896a9f2b223e46c3cdb21d3432c3389af80164d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0091/1681] Remove trailing spaces in file docs/source/advanced/mixed_cluster/building_stateless_images.rst --- .../building_stateless_images.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/advanced/mixed_cluster/building_stateless_images.rst b/docs/source/advanced/mixed_cluster/building_stateless_images.rst index 4c9f9a344..daec246f5 100644 --- a/docs/source/advanced/mixed_cluster/building_stateless_images.rst +++ b/docs/source/advanced/mixed_cluster/building_stateless_images.rst @@ -3,11 +3,11 @@ Building Stateless/Diskless Images A **stateless**, or **diskless**, provisioned nodes is one where the operating system image is deployed and loaded into memory. The Operating System (OS) does not store its files directly onto persistent storage (i.e. hard disk drive, shared drive, usb, etc) and so subsequent rebooting of the machine results in loss of any state changes that happened while the machine was running. -To deploy stateless compute nodes, you must first create a stateless image. The "netboot" osimages created from ``copycds`` in the **osimage** table are sample osimage definitions that can be used for deploying stateless nodes. +To deploy stateless compute nodes, you must first create a stateless image. The "netboot" osimages created from ``copycds`` in the **osimage** table are sample osimage definitions that can be used for deploying stateless nodes. -In a homogeneous cluster, the management node is the same hardware architecture and running the same Operating System (OS) as the compute nodes, so ``genimage`` can directly be executed from the management node. +In a homogeneous cluster, the management node is the same hardware architecture and running the same Operating System (OS) as the compute nodes, so ``genimage`` can directly be executed from the management node. -The issues arises in a heterogeneous cluster, where the management node is running a different level operating system *or* hardware architecture as the compute nodes in which to deploy the image. The ``genimage`` command that builds stateless images depends on various utilities provided by the base operating system and needs to be run on a node with the same hardware architecture and *major* Operating System release as the nodes that will be booted from the image. +The issues arises in a heterogeneous cluster, where the management node is running a different level operating system *or* hardware architecture as the compute nodes in which to deploy the image. The ``genimage`` command that builds stateless images depends on various utilities provided by the base operating system and needs to be run on a node with the same hardware architecture and *major* Operating System release as the nodes that will be booted from the image. Same Operating System, Different Architecture --------------------------------------------- @@ -19,9 +19,9 @@ The following describes creating stateless images of the same Operating System, #. On xCAT management node, ``xcatmn``, select the osimage you want to create from the list of osimage definitions. To list out the osimage definitions: :: - lsdef -t osimage + lsdef -t osimage -#. **optional:** Create a copy of the osimage definition that you want to modify. +#. **optional:** Create a copy of the osimage definition that you want to modify. To take the sample ``rhels6.3-x86_64-netboot-compute`` osimage definition and create a copy called ``mycomputeimage``, run the following command: :: @@ -38,15 +38,15 @@ The following describes creating stateless images of the same Operating System, ./genimage -a x86_64 -o rhels6.3 -p compute --permission 755 --srcdir /install/rhels6.3/x86_64 --pkglist \ /opt/xcat/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist --otherpkgdir /install/post/otherpkgs/rhels6.3/x86_64 --postinstall \ /opt/xcat/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall --rootimgdir /install/netboot/rhels6.3/x86_64/compute mycomputeimage - - + + #. Go to the target node, ``n01`` and run the following: #. mount the ``/install`` directory from the xCAT Management Node: :: - + mkdir /install mount -o soft xcatmn:/install /install - + #. Copy the executable files from the ``/opt/xcat/share/xcat/netboot`` from the xCAT Management node to the target node: :: mkdir -p /opt/xcat/share/xcat/ @@ -61,7 +61,7 @@ The following describes creating stateless images of the same Operating System, **If problems creating the stateless image, provide a local directory for --rootimgdir:** :: - + mkdir -p /tmp/compute Rerun ``genimage``, replacing ``--rootimgdir /tmp/compute``: :: @@ -70,8 +70,8 @@ The following describes creating stateless images of the same Operating System, ./genimage -a x86_64 -o rhels6.3 -p compute --permission 755 --srcdir /install/rhels6.3/x86_64 --pkglist \ /opt/xcat/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist --otherpkgdir /install/post/otherpkgs/rhels6.3/x86_64 --postinstall \ /opt/xcat/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall --rootimgdir /tmp/compute mycomputeimage - - Then copy the contents from ``/tmp/compute`` to ``/install/netboot/rhels6.3/compute`` + + Then copy the contents from ``/tmp/compute`` to ``/install/netboot/rhels6.3/compute`` #. Now return to the management node and execute ``packimage`` on the osimage and continue provisioning the node :: From 41bd193a7829eef47d814d96bfcac333c17c9e41 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0092/1681] Remove trailing spaces in file docs/source/advanced/mixed_cluster/power/diskless.rst --- docs/source/advanced/mixed_cluster/power/diskless.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/mixed_cluster/power/diskless.rst b/docs/source/advanced/mixed_cluster/power/diskless.rst index d5ac96e0b..88ca74a9b 100644 --- a/docs/source/advanced/mixed_cluster/power/diskless.rst +++ b/docs/source/advanced/mixed_cluster/power/diskless.rst @@ -8,8 +8,8 @@ Troubleshooting Error: Unable to find pxelinux.0 at /opt/xcat/share/xcat/netboot/syslinux/pxelinux.0 -**Resolution:** +**Resolution:** -The syslinux network booting files are missing. +The syslinux network booting files are missing. Install the sylinux-xcat package provided in the xcat-deps repository: ``yum -y install syslinux-xcat`` From 19e9a66af6940ab421878a381de2db97b4431af6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0093/1681] Remove trailing spaces in file docs/source/advanced/mixed_cluster/x86/index.rst --- docs/source/advanced/mixed_cluster/x86/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/mixed_cluster/x86/index.rst b/docs/source/advanced/mixed_cluster/x86/index.rst index 9dfd77d06..f95a042b1 100644 --- a/docs/source/advanced/mixed_cluster/x86/index.rst +++ b/docs/source/advanced/mixed_cluster/x86/index.rst @@ -4,4 +4,4 @@ x86 Management Node .. toctree:: :maxdepth: 2 - + From bb53d5a91b29e2c928299b45a9b63585abe7df20 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0094/1681] Remove trailing spaces in file docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst --- .../ethernet_switches/ethernet_switches.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst b/docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst index 905baba92..2ce4ba05d 100644 --- a/docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst +++ b/docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst @@ -9,9 +9,9 @@ It is recommended that lldp protocol in the switches is enabled to collect the s xCAT will use the ethernet switches during node discovery to find out which switch port a particular MAC address is communicating over. This allows xCAT to match a random booting node with the proper node name in the database. To set up a switch, give it an IP address on its management port and enable basic **SNMP** functionality. (Typically, the **SNMP** agent in the switches is disabled by default.) The easiest method is to configure the switches to give the **SNMP** version 1 community string called "public" read access. This will allow xCAT to communicate to the switches without further customization. (xCAT will get the list of switches from the **switch** table.) If you want to use **SNMP** version 3 (e.g. for better security), see the example below. With **SNMP** V3 you also have to set the user/password and AuthProto (default is **md5**) in the switches table. -If for some reason you can't configure **SNMP** on your switches, you can use sequential discovery or the more manual method of entering the nodes' MACs into the database. +If for some reason you can't configure **SNMP** on your switches, you can use sequential discovery or the more manual method of entering the nodes' MACs into the database. -**SNMP** V3 Configuration example: +**SNMP** V3 Configuration example: xCAT supports many switch types, such as **BNT** and **Cisco**. Here is an example of configuring **SNMP V3** on the **Cisco** switch 3750/3650: @@ -62,14 +62,14 @@ Switch Management When managing Ethernet switches, the admin often logs into the switches one by one using SSH or Telnet and runs the switch commands. However, it becomes time consuming when there are a lot of switches in a cluster. In a very large cluster, the switches are often identical and the configurations are identical. It helps to configure and monitor them in parallel from a single command. -For managing Mellanox IB switches and Qlogic IB switches, see :doc:`Mellanox IB switches and Qlogic IB switches ` +For managing Mellanox IB switches and Qlogic IB switches, see :doc:`Mellanox IB switches and Qlogic IB switches ` xCAT will not do a lot of switch management functions. Instead, it will configure the switch so that the admin can run remote command such as ``xdsh`` for it. Thus, the admin can use the ``xdsh`` to run proprietary switch commands remotely from the xCAT mn to enable **VLAN**, **bonding**, **SNMP** and others. Running Remote Commands in Parallel ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -You can use xdsh to run parallel commands on Ethernet switches. The following shows how to configure xCAT to run xdsh on the switches: +You can use xdsh to run parallel commands on Ethernet switches. The following shows how to configure xCAT to run xdsh on the switches: .. note:: For this to work, configure the switch to allow **ssh** or **telnet**. The procedure varies from switch to switch, consult the reference guides for your switch to find out how to do this. @@ -82,7 +82,7 @@ Set the ssh or telnet username an d password. :: chdef bntc125 username=admin \ password=password \ protocol=ssh - or + or chdef bntc125 username=admin \ password=password \ protocol=telnet @@ -101,8 +101,8 @@ Set the ssh or telnet username an d password. :: Also note that --devicetype is used here. xCAT supports the following switch types out of the box: :: - * BNT - * Cisco + * BNT + * Cisco * Juniper * Mellanox (for IB and Ethernet switches) @@ -121,7 +121,7 @@ Here is what result will look like: :: bntc125: end bntc125: show vlan bntc125: VLAN Name Status Ports - bntc125: ---- -------------------------------- ------ ------------------------ + bntc125: ---- -------------------------------- ------ ------------------------ bntc125: 1 Default VLAN ena 45-XGE4 bntc125: 3 VLAN 3 dis empty bntc125: 101 xcatpriv101 ena 24-44 From 954b3a471a95cdbe91238632680716704ce9230e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0095/1681] Remove trailing spaces in file docs/source/advanced/networks/getadapter.rst --- docs/source/advanced/networks/getadapter.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/networks/getadapter.rst b/docs/source/advanced/networks/getadapter.rst index 38188f486..b3aa71fd8 100644 --- a/docs/source/advanced/networks/getadapter.rst +++ b/docs/source/advanced/networks/getadapter.rst @@ -39,4 +39,4 @@ Below are the information ``getadapter`` trying to inspect: * **candidatename**: All the names which satisfy predictable network device naming scheme, if customer needs to customize their network adapter name, they can choose one of them. (``confignetwork`` needs to do more work to support this. if customer want to use their own name, xcat should offer a interface to get customer’s input and change this column) -* **linkstate**: The link state of network device \ No newline at end of file +* **linkstate**: The link state of network device From 3448e7cace8dc18210465b873f4dc90ba3ddf27a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0096/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/firmware_updates.rst --- .../advanced/networks/infiniband/firmware_updates.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/networks/infiniband/firmware_updates.rst b/docs/source/advanced/networks/infiniband/firmware_updates.rst index aaec19b64..2c2eb653a 100644 --- a/docs/source/advanced/networks/infiniband/firmware_updates.rst +++ b/docs/source/advanced/networks/infiniband/firmware_updates.rst @@ -21,9 +21,9 @@ Burn new firmware on each ibaX: :: mstflint -d 0002:01:00.0 -i b -.. note:: If this is a PureFlex MezzanineP adapter, you must select the correct image for each ibaX device. +.. note:: If this is a PureFlex MezzanineP adapter, you must select the correct image for each ibaX device. - The difference in the firmware image at the end of the file name: + The difference in the firmware image at the end of the file name: * _0.bin (iba0/iba2) * _1.bin (iba1/iba3) @@ -96,7 +96,7 @@ Save the changes made for new IB image: :: configuration write Activate the new IB image (reboot switch): :: - + reload From 2a07b50d23f57379bdfc9d98259394d5482420a2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0097/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst --- .../advanced/networks/infiniband/mlnxofed_configuration.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst b/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst index 24e9e912a..046e0a0a7 100644 --- a/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst +++ b/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst @@ -1,11 +1,11 @@ Configuration ============= -The process to configure the osimage to install the Mellanox OFED Drivers for Diskful and Diskless scenarios are outlined below. +The process to configure the osimage to install the Mellanox OFED Drivers for Diskful and Diskless scenarios are outlined below. .. toctree:: :maxdepth: 2 mlnxofed_ib_install_v2_diskful.rst mlnxofed_ib_install_v2_diskless.rst - + From 61f390bc125a9793d0877aafb4795b1ff0ba6c06 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0098/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst --- .../advanced/networks/infiniband/mlnxofed_ib_install_v2.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst index 8a3a5a75c..25f856007 100644 --- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst +++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst @@ -1,7 +1,7 @@ Mellanox OFED Installation Script ================================= -Mellanox provides a tested and packaged version of the OpenFabrics Enterprise Distribution (OFED) driver, named Mellanox OFED (MLNX_OFED). To assist with the installation of the MLNX_OFED driver, xCAT provides a sample postscript: ``mlnxofed_ib_install.v2``. +Mellanox provides a tested and packaged version of the OpenFabrics Enterprise Distribution (OFED) driver, named Mellanox OFED (MLNX_OFED). To assist with the installation of the MLNX_OFED driver, xCAT provides a sample postscript: ``mlnxofed_ib_install.v2``. .. toctree:: :maxdepth: 2 @@ -10,4 +10,4 @@ Mellanox provides a tested and packaged version of the OpenFabrics Enterprise Di mlnxofed_configuration.rst mlnxofed_ib_verified_scenario_matrix.rst mlnxofed_ib_known_issue.rst - + From 2084197cebd420b8ffb235cdeca1287f1be94531 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0099/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst --- .../infiniband/mlnxofed_ib_install_v2_diskful.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst index 689c7d265..5c476ab19 100644 --- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst +++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst @@ -11,16 +11,16 @@ Diskful Installation #. Configure the ``mlnxofed_ib_install`` script to install the MNLX_OFED drivers - xCAT has a concept of postscripts that can be used to customize the node after the operating system is installed. + xCAT has a concept of postscripts that can be used to customize the node after the operating system is installed. Mellanox recommends that the operating system is rebooted after the drivers are installed, so xCAT recommends using the ``postscripts`` attribute to avoid the need for a second reboot. To invoke the ``mlnxofed_ib_install`` as a postscript :: - - chdef -t node -o \ + + chdef -t node -o \ -p postscripts="mlnxofed_ib_install -p /install//" **[kernel mismatch issue]** The Mellanox OFED ISO is built against a series of specific kernel version. If the version of the linux kernel does not match any of the Mellanox offered pre-built kernel modules, you can pass the ``--add-kernel-support --force`` argument to the Mellanox installation script to build the kernel modules based on the version you are using. :: - chdef -t node -o \ + chdef -t node -o \ -p postscripts="mlnxofed_ib_install -p /install// \ -m --add-kernel-support --force -end-" @@ -37,8 +37,8 @@ Diskful Installation service openibd status systemd: :: - - systemctl status openibd.service + + systemctl status openibd.service * Verify that the Mellanox IB drivers are located at: ``/lib/modules//extra/`` From 52b3ad689bb1b2300d470cf768cd405e8ee1b53b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0100/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst --- .../mlnxofed_ib_install_v2_diskless.rst | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst index 0db52fb4e..9c3d8b871 100644 --- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst +++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst @@ -1,7 +1,7 @@ Diskless Installation ===================== -#. Prepare dependency packages in the pkglist +#. Prepare dependency packages in the pkglist In order for the Mellanox installation script to execute successfully, certain dependency packages are required to be installed on the compute node. xCAT provides sample package list files to help resolve these dependencies. The samples are located at ``/opt/xcat/share/xcat/ib/netboot//``. @@ -11,36 +11,36 @@ Diskless Installation #. Configure the ``mlnxofed_ib_install`` script to install the MNLX_OFED drivers - Edit the ``postinstall`` script on the osimage to invoke the ``mlnxofed_ib_install`` install script. + Edit the ``postinstall`` script on the osimage to invoke the ``mlnxofed_ib_install`` install script. - For example, take ``rhels7.2-ppc64le-netboot-compute``: + For example, take ``rhels7.2-ppc64le-netboot-compute``: + + #. Find the path to the ``postinstall`` script: :: - #. Find the path to the ``postinstall`` script: :: - # lsdef -t osimage -o rhels7.2-ppc64le-netboot-compute -i postinstall Object name: rhels7.2-ppc64le-netboot-compute postinstall=/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.postinstall #. Edit the ``/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.postinstall`` and add the following: :: - + /install/postscripts/mlnxofed_ib_install \ -p /install// -i $1 -n genimage - + .. note:: The ``$1`` is a argument that is passed to the the postinstall script at runtime. - .. tip:: **Kernel Mismatch** - - The Mellanox OFED ISO is built against a series of specific kernel version. If the version of the linux kernel being used does not match any of the pre-built kernels, pass ``--add-kernel-support --without-32bit --without-fw-update --force`` to the Mellanox installation script to build the kernel modules based on the kernel you are using. Example: :: + .. tip:: **Kernel Mismatch** + + The Mellanox OFED ISO is built against a series of specific kernel version. If the version of the linux kernel being used does not match any of the pre-built kernels, pass ``--add-kernel-support --without-32bit --without-fw-update --force`` to the Mellanox installation script to build the kernel modules based on the kernel you are using. Example: :: /install/postscripts/mlnxofed_ib_install \ -p /install// -m --add-kernel-support --without-32bit --without-fw-update --force -end- \ -i $1 -n genimage - -#. Generate the diskless image + +#. Generate the diskless image Use the ``genimage`` command to generate the diskless image from the osimage definition :: - + genimage Use the ``packimage`` command to pack the diskless image for deployment :: @@ -50,7 +50,7 @@ Diskless Installation #. Provision the node :: rinstall osimage=rhels7.2-ppc64le-netboot-compute - + #. Verification * Check the status of ``openibd`` service @@ -60,8 +60,8 @@ Diskless Installation service openibd status systemd: :: - - systemctl status openibd.service + + systemctl status openibd.service * Verify that the Mellanox IB drivers are located at: ``/lib/modules//extra/`` From 717fa816fcaff7860911c04bc6309fee7e7fea2b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0101/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst --- .../infiniband/mlnxofed_ib_install_v2_preparation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst index 48e40f8a2..b4a646868 100644 --- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst +++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst @@ -4,7 +4,7 @@ Preparation Download MLNX_OFED ISO ---------------------- -**xCAT only supports installation using the ISO format.** +**xCAT only supports installation using the ISO format.** Download the Mellanox OFED ISO file `here (MLNX_OFED) `_. @@ -22,7 +22,7 @@ The ``mlnxofed_ib_install.v2`` is a sample script intended to assist with the in # ensure the script has execute permission chmod +x /install/postscripts/mlnxofed_ib_install -#. Familiarize the options available for the xCAT ``mlnxofed_ib_install`` script. +#. Familiarize the options available for the xCAT ``mlnxofed_ib_install`` script. +---------+------------------+----------------------------------------------------------+ | Option | Required | Description | @@ -55,5 +55,5 @@ The ``mlnxofed_ib_install.v2`` is a sample script intended to assist with the in To pass the ``--add-kernel-support`` option to ``mlnxofedinstall``, use the following command: :: /install/postscripts/mlnxofed_ib_install -p /install// \ - -m --without-32bit --without-fw-update --add-kernel-support --force -end- + -m --without-32bit --without-fw-update --add-kernel-support --force -end- From 0b51f619f00107d6b9d5d7c5834cc58fd38ef58e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0102/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst --- .../networks/infiniband/mlnxofed_ib_known_issue.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst index 2d337a588..8fa26c52c 100644 --- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst +++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst @@ -4,16 +4,16 @@ Known Issues Preventing upgrade of the Mellanox Drivers ------------------------------------------ -On RedHat operating systems, after the Mellanox drivers are installed, you may have a requirement to update your operating system to a later version. -Some operating systems may ship InfiniBand drivers that are higher version than the Mellanox drivers you have installed and therefor may update the existing drivers. +On RedHat operating systems, after the Mellanox drivers are installed, you may have a requirement to update your operating system to a later version. +Some operating systems may ship InfiniBand drivers that are higher version than the Mellanox drivers you have installed and therefor may update the existing drivers. To prevent this from happening, add the following in the ``/etc/yum.conf`` :: exclude=dapl* libib* ibacm infiniband* libmlx* librdma* opensm* ibutils* -Development packages in SLES +Development packages in SLES ---------------------------- -If using the ``--add-kernel-support`` attribute on SLES operating systems, you may find problems with installing some dependency packages which are not shipped by the SLES server DVDs. The development rpms are provided by the SDK DVDs. Refer to :doc:`Add Additional Software Packages ` to configure the SDK repositories. +If using the ``--add-kernel-support`` attribute on SLES operating systems, you may find problems with installing some dependency packages which are not shipped by the SLES server DVDs. The development rpms are provided by the SDK DVDs. Refer to :doc:`Add Additional Software Packages ` to configure the SDK repositories. From bbb51fa7a8de6206b3932096f5f80a6e022b022a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0103/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst --- .../infiniband/mlnxofed_ib_verified_scenario_matrix.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst index 9849d2091..ad8f9c733 100644 --- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst +++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst @@ -1,7 +1,7 @@ MLNX_OFED Support Matrix ======================== -The following ISO images and attributes have been verified by the xCAT Team. +The following ISO images and attributes have been verified by the xCAT Team. **RedHat Enterprise Linux** From 4cbb30609c448506eedf48d06d025d86df4c15f1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0104/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/network_configuration.rst --- .../advanced/networks/infiniband/network_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/networks/infiniband/network_configuration.rst b/docs/source/advanced/networks/infiniband/network_configuration.rst index bd8eca1db..ba2716a3d 100644 --- a/docs/source/advanced/networks/infiniband/network_configuration.rst +++ b/docs/source/advanced/networks/infiniband/network_configuration.rst @@ -11,7 +11,7 @@ If your target Mellanox IB adapter has 2 ports, and you plan to give port ib0 4 1. Define your networks in networks table :: - chdef -t network -o ib0ipv41 net=20.0.0.0 mask=255.255.255.0 mgtifname=ib0 + chdef -t network -o ib0ipv41 net=20.0.0.0 mask=255.255.255.0 mgtifname=ib0 chdef -t network -o ib0ipv42 net=30.0.0.0 mask=255.255.255.0 mgtifname=ib0 chdef -t network -o ib0ipv61 net=1:2::/64 mask=/64 mgtifname=ib0 gateway=1:2::2 chdef -t network -o ib0ipv62 net=2:2::/64 mask=/64 mgtifname=ib0 gateway= From 1b13317eb7f6ae6d0ffa2d9da361cf39aa086e33 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0105/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/switch_configuration.rst --- .../advanced/networks/infiniband/switch_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/networks/infiniband/switch_configuration.rst b/docs/source/advanced/networks/infiniband/switch_configuration.rst index bdb647741..ab1d45c12 100644 --- a/docs/source/advanced/networks/infiniband/switch_configuration.rst +++ b/docs/source/advanced/networks/infiniband/switch_configuration.rst @@ -18,7 +18,7 @@ Add the login user name and password to the switches table: :: The switches table will look like this: :: - #switch,...,sshusername,sshpassword,switchtype,.... + #switch,...,sshusername,sshpassword,switchtype,.... "mswitch",,,,,,,"admin","admin","MellanoxIB",, If there is only one admin and one password for all the switches then put the entry in the xCAT passwd table for the admin id and password to use to login. :: From 196fd2c8beb89fe683311cecc4c689969943c1ef Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0106/1681] Remove trailing spaces in file docs/source/advanced/networks/infiniband/ufm_configuration.rst --- docs/source/advanced/networks/infiniband/ufm_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/networks/infiniband/ufm_configuration.rst b/docs/source/advanced/networks/infiniband/ufm_configuration.rst index 3c64c079e..1bce7e480 100644 --- a/docs/source/advanced/networks/infiniband/ufm_configuration.rst +++ b/docs/source/advanced/networks/infiniband/ufm_configuration.rst @@ -75,4 +75,4 @@ If it is not running, then run the following commands: :: monadd snmpmon monstart snmpmon - \ No newline at end of file + From 27910a4cadcb1560fc39eb280a0777755143f9e6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0107/1681] Remove trailing spaces in file docs/source/advanced/networks/onie_switches/index.rst --- docs/source/advanced/networks/onie_switches/index.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/networks/onie_switches/index.rst b/docs/source/advanced/networks/onie_switches/index.rst index 8c59c6c46..44b381f77 100644 --- a/docs/source/advanced/networks/onie_switches/index.rst +++ b/docs/source/advanced/networks/onie_switches/index.rst @@ -1,13 +1,13 @@ -Open Network Install Environment Switches +Open Network Install Environment Switches ========================================= -The Open Network Install Environment, or "ONIE" [1]_. is an open source project definining an **install environment** for bare metal switches. This environment allows choice for the end users when selecting a network operating system to install onto these bare metal switches. +The Open Network Install Environment, or "ONIE" [1]_. is an open source project definining an **install environment** for bare metal switches. This environment allows choice for the end users when selecting a network operating system to install onto these bare metal switches. .. toctree:: :maxdepth: 2 - os_cumulus/index.rst - os_cumulus/ztp.rst + os_cumulus/index.rst + os_cumulus/ztp.rst .. [1] Open Network Install Environment: Created by Cumulus Networks, Inc. in 2012, the Open Network Install Environment (ONIE) Project is a small operating system, pre-installed as firmware on bare metal network switches, that provides an environment for automated operating system provisioning. From ad762f3bb316d4687d0f432b1ceb4f209edf6336 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0108/1681] Remove trailing spaces in file docs/source/advanced/networks/onie_switches/os_cumulus/install.rst --- .../onie_switches/os_cumulus/install.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/install.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/install.rst index 8e40e0007..4be0107b8 100644 --- a/docs/source/advanced/networks/onie_switches/os_cumulus/install.rst +++ b/docs/source/advanced/networks/onie_switches/os_cumulus/install.rst @@ -10,18 +10,18 @@ xCAT provides support for detecting and installing the Cumulus Linux OS into ONI #. Create a pre-defined switch definition for the ONIE switch using the ``onieswitch`` template. - The mac address of the switch management port is required for xCAT to configure the DHCP information and send over the OS to install on the switch. + The mac address of the switch management port is required for xCAT to configure the DHCP information and send over the OS to install on the switch. - **Small Clusters** + **Small Clusters** If you know the mac address of the management port on the switch, create the pre-defined switch definition providing the mac address. :: mkdef frame01sw1 --template onieswitch arch=armv71 \ ip=192.168.1.1 mac="aa:bb:cc:dd:ee:ff" - **Large Clusters** + **Large Clusters** - xCAT's :doc:`switchdiscover ` command can be used to discover the mac address and fill in the predefined switch definitions based on the switch/switchport mapping. + xCAT's :doc:`switchdiscover ` command can be used to discover the mac address and fill in the predefined switch definitions based on the switch/switchport mapping. #. Define all the switch objects providing the switch/switchport mapping: :: @@ -34,8 +34,8 @@ xCAT provides support for detecting and installing the Cumulus Linux OS into ONI ip=192.168.3.1 switch=coresw1 switchport=3 mkdef frame04sw1 --template onieswitch arch=armv71 \ ip=192.168.4.1 switch=coresw1 switchport=4 - ... - + ... + #. Leverage ``switchdiscover`` over the DHCP range to automatically detect the MAC address and write them into the predefined switches above. :: switchdiscover --range @@ -43,9 +43,9 @@ xCAT provides support for detecting and installing the Cumulus Linux OS into ONI #. Run the ``nodeset`` command to set the ``provmethod`` attribute of the target switch(es) to the Cumulus Linux install image and prepare the DHCP/BOOTP lease information for the switch: :: - # nodeset frame01sw1 osimage=cumulus3.5.2-armel + # nodeset frame01sw1 osimage=cumulus3.5.2-armel # lsdef frame01sw1 - Object name: frame01sw1 + Object name: frame01sw1 arch=armv7l groups=switch,edge_switch ip=172.21.208.03 @@ -82,11 +82,11 @@ Configure xCAT Remote Commands After Cumulus Linux OS is installed, a default user ``cumulus`` will be created with default password: ``CumulusLinux!``. -To ease in the management of the switch, xCAT provides a script to help configure password-less ssh as the ``root`` user. This script sends over the xCAT ssh keys so that the xCAT remote commands (``xdsh``, ``xdcp``, etc) can be run against the ONIE switches. +To ease in the management of the switch, xCAT provides a script to help configure password-less ssh as the ``root`` user. This script sends over the xCAT ssh keys so that the xCAT remote commands (``xdsh``, ``xdcp``, etc) can be run against the ONIE switches. Execute the following to sync the xCAT keys to the switch: :: - /opt/xcat/share/xcat/scripts/configonie --switches frame01sw1 --ssh + /opt/xcat/share/xcat/scripts/configonie --switches frame01sw1 --ssh Validate the ssh keys are correctly configured by running a ``xdsh`` command: :: @@ -98,7 +98,7 @@ Validate the ssh keys are correctly configured by running a ``xdsh`` command: :: Activate the License -------------------- -After Cumulus Linux OS is installed onto the ONIE switch, only the serial port console and the management ethernet port is enabled. To activate the rest of the switch ports, the license file needs to be installed onto the switch. +After Cumulus Linux OS is installed onto the ONIE switch, only the serial port console and the management ethernet port is enabled. To activate the rest of the switch ports, the license file needs to be installed onto the switch. #. Copy the license file to the switch: :: @@ -159,6 +159,6 @@ To verify the SNMPv3 configuration, run ``xcatprobe switch_macmap`` command, wil ...........................more output..................... - + From 2a4158842a182c0676404bc7aed443814061becc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0109/1681] Remove trailing spaces in file docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst --- .../networks/onie_switches/os_cumulus/manage.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst index 232cbe9bf..325e0f1f6 100644 --- a/docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst +++ b/docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst @@ -4,9 +4,9 @@ Switch Management Sync File support ------------------ -xCAT supports synchronize of configuration files for cumulus switches. +xCAT supports synchronize of configuration files for cumulus switches. -#. Use instructions in doc: :ref:`The_synclist_file` to set up syncfile. +#. Use instructions in doc: :ref:`The_synclist_file` to set up syncfile. #. Add syncfile to cumulus osimage. :: # chdef -t osimage cumulus3.5.2-armel synclists=/tmp/synclists @@ -24,12 +24,12 @@ Switch Port and VLAN Configuration xCAT places the front-panel port configuration in ``/etc/network/interfaces.d/xCAT.intf``. -The ``configinterface`` postscript can be used to pull switch interface configuration from the xCAT Management Node (MN) to the switch. Place the switch specific confguration files in the following directory on the MN: ``/install/custom/sw_os/cumulus/interface/``. +The ``configinterface`` postscript can be used to pull switch interface configuration from the xCAT Management Node (MN) to the switch. Place the switch specific confguration files in the following directory on the MN: ``/install/custom/sw_os/cumulus/interface/``. xCAT will look for files in the above directory in the following order: - 1. file name that matches the switch hostname - 2. file name that matches the switch group name + 1. file name that matches the switch hostname + 2. file name that matches the switch group name 3. file name that has the word 'default' .. note:: If the postscript cannot find a configuration file on the MN, it will set all ports on the switch to be part of VLAN 1. @@ -42,7 +42,7 @@ Execute the script using the following command: :: Re-install OS ------------- -There may be occasions where a re-install of the Cumulus Linux OS is required. The following commands can be used to invoke the install: +There may be occasions where a re-install of the Cumulus Linux OS is required. The following commands can be used to invoke the install: .. important:: This assumes that the Cumulus Linux files are on the xCAT MN in the correct place. @@ -50,11 +50,11 @@ There may be occasions where a re-install of the Cumulus Linux OS is required. # to clear out all the previous configuration, use the -k option (optional) xdsh "/usr/cumulus/bin/onie-select -k - + # to invoke the reinstall of the OS xdsh "/usr/cumulus/bin/onie-select -i -f;reboot" * **Manually**, log into the switch and run the following commands: :: sudo onie-select -i - sudo reboot + sudo reboot From 80b3b7ed87db0998eba216e85ad11f54d6b015b0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0110/1681] Remove trailing spaces in file docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst --- .../networks/onie_switches/os_cumulus/prepare.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst index 8fbdc1073..e38d97f65 100644 --- a/docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst +++ b/docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst @@ -1,7 +1,7 @@ Preparation =========== -Prepare the Cumulus Linux files on the xCAT Management Node. +Prepare the Cumulus Linux files on the xCAT Management Node. #. Obtain a valid Cumulus Linux License and download the Cumulus Linux OS installer. @@ -10,18 +10,18 @@ Prepare the Cumulus Linux files on the xCAT Management Node. # Create a directory to hold the cumulus linux files mkdir -p /install/custom/sw_os/cumulus/ - # copy the license file + # copy the license file cp licensefile.txt /install/custom/sw_os/cumulus/ - # copy the installer + # copy the installer cp cumulus-linux-3.1.0-bcm-armel.bin /install/custom/sw_os/cumulus/ -Cumulus osimage +Cumulus osimage --------------- xCAT can able to create a cumulus osimage defintion via ``copycds`` command. ``copycds`` will copy cumulus installer to a destination directory, and create several relevant osimage definitions. **cumulus-** is the default osimage name. :: - + #run copycds command # copycds cumulus-linux-3.5.2-bcm-armel.bin From 4a33008080cd0b3427e57ee835dc0184cdfe543c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0111/1681] Remove trailing spaces in file docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst --- .../onie_switches/os_cumulus/upgrade.rst | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst index fdbae9844..dda586c88 100644 --- a/docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst +++ b/docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst @@ -6,23 +6,23 @@ The Cumulus OS on the ONIE switches can be upgraded using one of the following m Full Install ------------ -Perform a full install from the ``.bin`` file of the new Cumulus Linux OS version, using ONIE. +Perform a full install from the ``.bin`` file of the new Cumulus Linux OS version, using ONIE. -.. important:: Make sure you back up all your data and configuration files as the binary install will erase all previous configuration. - -#. Place the binary image under ``/install`` on the xCAT MN node. +.. important:: Make sure you back up all your data and configuration files as the binary install will erase all previous configuration. + +#. Place the binary image under ``/install`` on the xCAT MN node. In this example, IP=172.21.253.37 is the IP on the Management Node. :: mkdir -p /install/onie/ cp cumulus-linux-3.4.1.bin /install/onie/ - + #. Invoke the upgrade on the switches using :doc:`xdsh `: :: - + xdsh switch1 "/usr/cumulus/bin/onie-install -a -f -i \ http://172.21.253.37/install/onie/cumulus-linux-3.4.1.bin && reboot" - .. attention:: The full upgrade process may run 30 minutes or longer. + .. attention:: The full upgrade process may run 30 minutes or longer. #. After upgrading, the license should be installed, see :ref:`Activate the License ` for details. @@ -33,35 +33,35 @@ Perform a full install from the ``.bin`` file of the new Cumulus Linux OS versio Update Changed Packages ----------------------- -This is the preferred method for upgrading the switch OS for incremental OS updates. +This is the preferred method for upgrading the switch OS for incremental OS updates. Create Local Mirror ``````````````````` -If the switches do not have access to the public Internet, you can create a local mirror of the Cumulus Linux repo. +If the switches do not have access to the public Internet, you can create a local mirror of the Cumulus Linux repo. #. Create a local mirror on the Management Node: :: - + mkdir -p /install/mirror/cumulus cd /install/mirror/cumulus - wget -m --no-parent http://repo3.cumulusnetworks.com/repo/ - + wget -m --no-parent http://repo3.cumulusnetworks.com/repo/ + #. Create a ``sources.list`` file to point to the local repo on the Management node. In this example, IP=172.21.253.37 is the IP on the Management Node. :: # cat /tmp/sources.list deb http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3 cumulus upstream deb-src http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3 cumulus upstream - + deb http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-security-updates cumulus upstream deb-src http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-security-updates cumulus upstream - + deb http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-updates cumulus upstream - deb-src http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-updates cumulus upstream + deb-src http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-updates cumulus upstream #. Distribute the ``sources.list`` file to your switches using :doc:`xdcp `. :: - xdcp switch1 /tmp/sources.list /etc/apt/sources.list + xdcp switch1 /tmp/sources.list /etc/apt/sources.list Invoke the Update ````````````````` @@ -69,11 +69,11 @@ Invoke the Update #. Use xCAT :doc:`xdsh ` to invoke the update: :: # - # A reboot may be needed after the upgrade - # + # A reboot may be needed after the upgrade + # xdsh switch1 'apt-get update && apt-get upgrade && reboot' -#. Check in ``/etc/os-release`` file to verify that the OS has been upgraded. +#. Check in ``/etc/os-release`` file to verify that the OS has been upgraded. From 0ffb90e2e20aa9e6bc01f603975a4b4b392fca4b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0112/1681] Remove trailing spaces in file docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst --- .../networks/onie_switches/os_cumulus/ztp.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst index b620683e0..c8ba68d6b 100644 --- a/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst +++ b/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst @@ -1,4 +1,4 @@ -Setup ONIE switches with ZTP in large cluster +Setup ONIE switches with ZTP in large cluster ============================================= Zero Touch Provisioning (ZTP) is a feature shipped in many network devices to enable them to be quickly deployed in large-scale environments. In Cumulus OS on ONIE switches with ZTP enabled, the URL of an user provided script can be specified in the DHCP response for the DHCP request trigged by one of the following events: @@ -14,29 +14,29 @@ Leveraging the ZTP mechanism, xCAT provides the capability to setup ONIE switche 1. Ensure that xCAT is configured with an DHCP open range to detect when new switches request DHCP IPs (1). Make sure the network in which the management interface of the ONIE switches are connected has been defined in ``networks`` table :: - + # tabdump networks #netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers,dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,mtu,comments,disable "172_21_0_0-255_255_0_0","172.21.0.0","255.255.0.0","enP3p3s0d1","","172.21.253.27","172.21.253.27",,,,"172.21.253.100-172.21.253.200",,,,,,,,, - + (2). Prepare the DHCP configuration for ONIE switches setup - + Add the management node's NIC facing the ONIE switches' management interface to the ``site.dhcpinterfaces`` :: - - chdef -t site -p dhcpinterfaces=enP3p3s0d1 - + + chdef -t site -p dhcpinterfaces=enP3p3s0d1 + Add dynamic range for the temporary IP addresses used in the OS provision and discovery of ONIE switches :: - + chdef -t network 172_21_0_0-255_255_0_0 dynamicrange="172.21.253.100-172.21.253.200" - + Update DHCP configuration file :: - + makedhcp -n 2. Predefine ONIE switches according to the network plan :: - mkdef mid05tor10 --template onieswitch ip=172.21.205.10 switch=mgmtsw01 switchport=10 - + mkdef mid05tor10 --template onieswitch ip=172.21.205.10 switch=mgmtsw01 switchport=10 + ``ip`` is the IP address of the management interface of the ONIE switch ``switch`` is the core switch to which the management interface of ONIE switch is connected. @@ -44,16 +44,16 @@ Leveraging the ZTP mechanism, xCAT provides the capability to setup ONIE switche ``switchport`` is the port on the core switch to which the management interface of ONIE switch is connected. 3. Add the predefined switches into ``/etc/hosts`` :: - + makehosts mid05tor10 4. [If the Cumulus OS have been installed on the ONIE switches, please skip this step] Prepare the Cumulus installation image, ``/install/onie/onie-installer`` is the hard-coded path of the Cumulus installation image, or the link to the Cumulus installation image on the management node :: - + mkdir -p /install/onie/ - cp /install/custom/sw_os/cumulus/cumulus-linux-3.1.0-bcm-armel.bin /install/onie/ + cp /install/custom/sw_os/cumulus/cumulus-linux-3.1.0-bcm-armel.bin /install/onie/ ln -s /install/onie/cumulus-linux-3.1.0-bcm-armel.bin /install/onie/onie-installer -5. Plug the ONIE switches into the cluster according to the network plan and power on them. +5. Plug the ONIE switches into the cluster according to the network plan and power on them. For the white-box ONIE switches, the Cumulus OS will be installed, then the switches will be discovered and configured automaticaly, the whole process will take about 1 hour. @@ -88,4 +88,4 @@ Leveraging the ZTP mechanism, xCAT provides the capability to setup ONIE switche switchport=10 switchtype=Edgecore Networks Switch - ``status=configured`` indicates that the switch has been discovered and configured. + ``status=configured`` indicates that the switch has been discovered and configured. From 9819c2d367809c3704ce16a537388d5710e48452 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0113/1681] Remove trailing spaces in file docs/source/advanced/networks/switchdiscover/index.rst --- docs/source/advanced/networks/switchdiscover/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/networks/switchdiscover/index.rst b/docs/source/advanced/networks/switchdiscover/index.rst index 73f7e8178..f60e90c8b 100644 --- a/docs/source/advanced/networks/switchdiscover/index.rst +++ b/docs/source/advanced/networks/switchdiscover/index.rst @@ -1,8 +1,8 @@ -Switch Discover +Switch Discover =============== .. toctree:: :maxdepth: 2 - switches_discovery.rst + switches_discovery.rst switch_based_switch_discovery.rst From ecf01c53038904473ba6fd0ee8629b081e2ade2c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0114/1681] Remove trailing spaces in file docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst --- .../switch_based_switch_discovery.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst b/docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst index 2f207d0ff..c2ef30876 100644 --- a/docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst +++ b/docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst @@ -1,12 +1,12 @@ Switch-based Switch Discovery ============================= -Currently, xCAT supports switch based hardware discovery, the servers are identified through the switches and switch ports they are directly connected to. A similar method can be used to discover switches using switch-based discovery within the user defined dynamic IP range. +Currently, xCAT supports switch based hardware discovery, the servers are identified through the switches and switch ports they are directly connected to. A similar method can be used to discover switches using switch-based discovery within the user defined dynamic IP range. Pre-requirement ~~~~~~~~~~~~~~~ -In order to do switch-based switch discovery, the admin +In order to do switch-based switch discovery, the admin 1. Needs to manually setup and configure core-switch, SNMP v3 needs to be enabled in order for xCAT access to it. **username** and **userpassword** attributes are for the remote login. It can be for **ssh** or **telnet**. If it is for **telnet**, set protocol to “telnet”. If the **username** is blank, the **username** and **password** will be retrieved from the passwd table with “switch” as the key. SNMP attributes will used for SNMPv3 communication. **nodetype** has to be set to "switch" to differentiate between switch-based node discovery or switch-based switch discovery. Refer to switches table attributes. Example of core-switch definition: :: @@ -71,10 +71,10 @@ For the switch-based switch discovery, we add **–setup** flag: :: if **--setup** flag is specified, the command will perform following steps: -1. Use snmp or nmap scan methods to find all switches in the dynamic IP ranges specified by --range, the available switches will be stored in switch hash table with hostname, switchtype, vendor info and mac address. +1. Use snmp or nmap scan methods to find all switches in the dynamic IP ranges specified by --range, the available switches will be stored in switch hash table with hostname, switchtype, vendor info and mac address. -2. Based on mac address for each switch defined in the hash table, call **find_mac** subroutine. The **find_mac** subroutine will go thought the switch and switch ports and find matched mac address. +2. Based on mac address for each switch defined in the hash table, call **find_mac** subroutine. The **find_mac** subroutine will go thought the switch and switch ports and find matched mac address. * If discovered switch didn't find any predefined switch matches, it will log the message ``NO predefined switch matched``. * If discovered switch matched with one of pre-defined switch, it will update the predefined switch with :: @@ -87,7 +87,7 @@ if **--setup** flag is specified, the command will perform following steps: 3. After switches are matched, the command will call config files to set up static IP address, hostname and enable the snmpv3. Currently, BNT and Mellanox switches are supported. The two config files are located in the **/opt/xcat/share/xcat/scripts/config.BNT** and **/opt/xcat/share/xcat/scripts/config.Mellanox**. the log message ``the switch type is not support for config`` is displayed if switchtype is something other than BNT or Mellanox. -4. After discovery process, the predefined node attribute in the xCATdb will be updated. +4. After discovery process, the predefined node attribute in the xCATdb will be updated. :: @@ -119,9 +119,9 @@ if **--setup** flag is specified, the command will perform following steps: Configure switches ~~~~~~~~~~~~~~~~~~ -The **switchdiscover** command with ``--setup`` flag will set up switches with static IP address, change the hostname from predefine switches and enable snmpv3 configuration. For other switches configuration, refer to :doc:`/advanced/networks/ethernet_switches/ethernet_switches` and :doc:`/advanced/networks/infiniband/switch_configuration`. +The **switchdiscover** command with ``--setup`` flag will set up switches with static IP address, change the hostname from predefine switches and enable snmpv3 configuration. For other switches configuration, refer to :doc:`/advanced/networks/ethernet_switches/ethernet_switches` and :doc:`/advanced/networks/infiniband/switch_configuration`. -These two config files are located in the **/opt/xcat/share/xcat/scripts** directory. The **switchdiscover** process will call the config files with ``--all`` option. User can call these scripts to setup one of options manually. +These two config files are located in the **/opt/xcat/share/xcat/scripts** directory. The **switchdiscover** process will call the config files with ``--all`` option. User can call these scripts to setup one of options manually. 1. **configBNT** is for configure BNT switches. :: @@ -142,7 +142,7 @@ These two config files are located in the **/opt/xcat/share/xcat/scripts** direc * set logging destination to xCAT MN :: - + ./configMellanox --help Usage: configMellonax [-?│-h│--help] @@ -155,7 +155,7 @@ These two config files are located in the **/opt/xcat/share/xcat/scripts** direc Switch Status ~~~~~~~~~~~~~ -During the switch-based switch discovery process, there are four states displayed. User may only see **switch_configured** status on node definition if discovery process successfully finished. +During the switch-based switch discovery process, there are four states displayed. User may only see **switch_configured** status on node definition if discovery process successfully finished. **Matched** --- Discovered switch is matched to predefine switch, **otherinterfaces** attribute is updated to dhcp IP address, and mac address, **switch type** and **usercomment** also updated with vendor information for the predefined switch. From 03e7ecc0e788c5e40fc01b8033d2a0765b2ba256 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0115/1681] Remove trailing spaces in file docs/source/advanced/networks/vlan/vlan.rst --- docs/source/advanced/networks/vlan/vlan.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/networks/vlan/vlan.rst b/docs/source/advanced/networks/vlan/vlan.rst index 927d5d177..3eaf469b1 100644 --- a/docs/source/advanced/networks/vlan/vlan.rst +++ b/docs/source/advanced/networks/vlan/vlan.rst @@ -18,7 +18,7 @@ These VLAN functions are supported for stand-alone nodes as well as virtual mach Install the package ------------------- -Install the ``xCAT-vlan`` package using the package manager on the OS. +Install the ``xCAT-vlan`` package using the package manager on the OS. [RHEL] :: @@ -220,7 +220,7 @@ To make the vlan more secure, the root guard and the bpdu guard are enabled for Limitation ---------- -Current xCAT-vlan package does not work on the following os distributions. More work will be done in the future releases. +Current xCAT-vlan package does not work on the following os distributions. More work will be done in the future releases. * ubuntu * rhel7 and later From e81bf828c02cb19f49a9f072e87e18f2efde69a0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0116/1681] Remove trailing spaces in file docs/source/advanced/pdu/crpdu.rst --- docs/source/advanced/pdu/crpdu.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/pdu/crpdu.rst b/docs/source/advanced/pdu/crpdu.rst index 9933a80bc..6db7151ca 100644 --- a/docs/source/advanced/pdu/crpdu.rst +++ b/docs/source/advanced/pdu/crpdu.rst @@ -1,7 +1,7 @@ Collaborative PDU ================= -Collaborative PDU is also referred as Coral PDU, it controls power for compute Rack. User can access PDU via SSH and can use the **PduManager** command to configure and manage the PDU product. +Collaborative PDU is also referred as Coral PDU, it controls power for compute Rack. User can access PDU via SSH and can use the **PduManager** command to configure and manage the PDU product. Pre-Defined PDU Objects @@ -61,7 +61,7 @@ After pre-defining PDUs, user can use **pdudisocver --range ip_range --setup** t Remote Power Control of PDU --------------------------- -Use the rpower command to remotely power on and off PDU. +Use the rpower command to remotely power on and off PDU. * To check power stat of PDU: :: @@ -85,7 +85,7 @@ Coral PDUs have three relays, the following commands are for individual relay su # rpower coralpdu relay=2 off - * To power on the relay: :: + * To power on the relay: :: # rpower coralpdu relay=3 on From a037de1d0a96c79c8af60d2a79c2c4def96bfe8e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0117/1681] Remove trailing spaces in file docs/source/advanced/pdu/index.rst --- docs/source/advanced/pdu/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/pdu/index.rst b/docs/source/advanced/pdu/index.rst index 625bfb269..4438d4368 100644 --- a/docs/source/advanced/pdu/index.rst +++ b/docs/source/advanced/pdu/index.rst @@ -1,9 +1,9 @@ PDUs ==== -Power Distribution Units (PDUs) are devices that distribute power to servers in a frame. They have the capability of monitoring the amount of power that is being used by devices plugged into it and cycle power to individual receptacles. xCAT can support two kinds of PDUs, infrastructure PDU (irpdu) and collaborative PDU (crpdu). +Power Distribution Units (PDUs) are devices that distribute power to servers in a frame. They have the capability of monitoring the amount of power that is being used by devices plugged into it and cycle power to individual receptacles. xCAT can support two kinds of PDUs, infrastructure PDU (irpdu) and collaborative PDU (crpdu). -The Infrastructure rack PDUs are switched and monitored 1U PDU products which can connect up to nine C19 devices or up to 12 C13 devices and an additional three C13 peripheral devices to a signle dedicated power source. The Collaborative PDU is on the compute rack and has the 6x IEC 320-C13 receptacles that feed the rack switches. These two types of PDU have different design and implementation. xCAT has different code path to maintains PDU commands via **pdutype**. +The Infrastructure rack PDUs are switched and monitored 1U PDU products which can connect up to nine C19 devices or up to 12 C13 devices and an additional three C13 peripheral devices to a signle dedicated power source. The Collaborative PDU is on the compute rack and has the 6x IEC 320-C13 receptacles that feed the rack switches. These two types of PDU have different design and implementation. xCAT has different code path to maintains PDU commands via **pdutype**. .. toctree:: From 692adf7ac6f322ca92976a4094865e6bb93f1c29 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0118/1681] Remove trailing spaces in file docs/source/advanced/pdu/irpdu.rst --- docs/source/advanced/pdu/irpdu.rst | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/source/advanced/pdu/irpdu.rst b/docs/source/advanced/pdu/irpdu.rst index dccaf049a..c42541172 100644 --- a/docs/source/advanced/pdu/irpdu.rst +++ b/docs/source/advanced/pdu/irpdu.rst @@ -18,34 +18,34 @@ Add a ``pdu`` attribute to the compute node definition in the form "PDU_Name:out chdef cn01 pdu=f5pdu3:6,f5pdu3:7 -The following commands are supported against a compute node: +The following commands are supported against a compute node: * Check the pdu status for a compute node: :: - + # rpower cn01 pdustat cn01: f5pdu3 outlet 6 is on cn01: f5pdu3 outlet 7 is on - * Power off the PDU outlets for a compute node: :: - + * Power off the PDU outlets for a compute node: :: + # rpower cn01 pduoff cn01: f5pdu3 outlet 6 is off cn01: f5pdu3 outlet 7 is off - * Power on the PDU outlets for a compute node: :: - + * Power on the PDU outlets for a compute node: :: + # rpower cn01 pduon cn01: f5pdu3 outlet 6 is on cn01: f5pdu3 outlet 7 is on - * Power cycling the PDU outlets for a compute node: :: - + * Power cycling the PDU outlets for a compute node: :: + # rpower cn01 pdureset - cn01: f5pdu3 outlet 6 is reset + cn01: f5pdu3 outlet 6 is reset cn01: f5pdu3 outlet 7 is reset -The following commands are supported against a PDU: +The following commands are supported against a PDU: * To change hostname of IR PDU: :: @@ -72,7 +72,7 @@ The following commands are supported against a PDU: f5pdu3: outlet 12 is on * Power off the full PDU: :: - + # rpower f5pdu3 off f5pdu3: outlet 1 is off f5pdu3: outlet 2 is off @@ -104,7 +104,7 @@ The following commands are supported against a PDU: f5pdu3: outlet 12 is on * Power reset the full PDU: :: - + # rpower f5pdu3 reset f5pdu3: outlet 1 is reset f5pdu3: outlet 2 is reset @@ -148,9 +148,9 @@ The following commands are supported against a PDU: f6pdu15: outlet 3 Max Capacity of the current: 16000 mA f6pdu15: outlet 3 Current Threshold Warning: 9600 mA f6pdu15: outlet 3 Current Threshold Critical: 12800 mA - f6pdu15: outlet 3 Last Power Reading: 217 Wattsv - -**Note:** For BMC based compute nodes, turning the PDU outlet power on does not automatically power on the compute side. Users will need to issue ``rpower on`` to power on the compute side after the BMC boots. + f6pdu15: outlet 3 Last Power Reading: 217 Wattsv + +**Note:** For BMC based compute nodes, turning the PDU outlet power on does not automatically power on the compute side. Users will need to issue ``rpower on`` to power on the compute side after the BMC boots. From ba06eb05e7bf5ae0939073d4890359fe9e40175e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0119/1681] Remove trailing spaces in file docs/source/advanced/pdu/pdu.rst --- docs/source/advanced/pdu/pdu.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/pdu/pdu.rst b/docs/source/advanced/pdu/pdu.rst index 6e0ca6862..84a00e486 100644 --- a/docs/source/advanced/pdu/pdu.rst +++ b/docs/source/advanced/pdu/pdu.rst @@ -41,6 +41,6 @@ Define PDU Objects #. Verify the SNMP command responds against the PDU: :: - snmpwalk -v1 -cpublic -mALL f5pdu3 system + snmpwalk -v1 -cpublic -mALL f5pdu3 system From 37f89d2b209dcf4e6dec8af652206918305b46af Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0120/1681] Remove trailing spaces in file docs/source/advanced/performance_tuning/linux_os_tuning.rst --- docs/source/advanced/performance_tuning/linux_os_tuning.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/performance_tuning/linux_os_tuning.rst b/docs/source/advanced/performance_tuning/linux_os_tuning.rst index 331d140c0..c45a9a65c 100644 --- a/docs/source/advanced/performance_tuning/linux_os_tuning.rst +++ b/docs/source/advanced/performance_tuning/linux_os_tuning.rst @@ -4,8 +4,8 @@ System Tuning Settings for Linux Adjusting Operating System tunables can improve large scale cluster performance, avoid bottlenecks, and prevent failures. The following sections are a collection of suggestions that have been gathered from various large scale HPC clusters. You should investigate and evaluate the validity of each suggestion before applying them to your cluster. -#. Tuning Linux ulimits: - +#. Tuning Linux ulimits: + The open file limits are important to high concurrence network services, such as ``xcatd``. For a large cluster, it is required to increase the number of open file limit to avoid **Too many open files** error. The default value is *1024* in most OS distributions, to add below configuration in ``/etc/security/limits.conf`` to increase to *14096*. :: @@ -24,7 +24,7 @@ Adjusting Operating System tunables can improve large scale cluster performance, net.core.rmem_default = 65536 net.core.wmem_default = 65536 net.core.somaxconn = 8192 - + net.ipv4.tcp_rmem = 4096 33554432 33554432 net.ipv4.tcp_wmem = 4096 33554432 33554432 net.ipv4.tcp_mem= 33554432 33554432 33554432 From c3bfa08e3ad5080f918ba4472329417f2d1354d8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0121/1681] Remove trailing spaces in file docs/source/advanced/ports/xcat_ports.rst --- docs/source/advanced/ports/xcat_ports.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/advanced/ports/xcat_ports.rst b/docs/source/advanced/ports/xcat_ports.rst index 910764007..744b0a94b 100644 --- a/docs/source/advanced/ports/xcat_ports.rst +++ b/docs/source/advanced/ports/xcat_ports.rst @@ -110,7 +110,7 @@ xCAT Port Usage Table * xcatlport - The port used by xcatd to record command log, you can customize it by edit site table, if you don't configure it, 3003 will be used by default. + The port used by xcatd to record command log, you can customize it by edit site table, if you don't configure it, 3003 will be used by default. * echo-udp @@ -126,9 +126,9 @@ xCAT Port Usage Table * domain-tcp - Used when Domain Name Services (DNS) traffic from the Non-trusted nodes and the firewall node to a DNS server is explicitly handled by the firewall. Some firewall applications can be configured to explicitly handle all DNS traffic. This for tcp DNS traffic. + Used when Domain Name Services (DNS) traffic from the Non-trusted nodes and the firewall node to a DNS server is explicitly handled by the firewall. Some firewall applications can be configured to explicitly handle all DNS traffic. This for tcp DNS traffic. -* domain-udp +* domain-udp Used when Domain Name Services (DNS) traffic from the Non-trusted nodes and the firewall node to a DNS server is explicitly handled by the firewall. Some firewall applications can be configured to explicitly handle all DNS traffic. This for udp DNS traffic. @@ -174,9 +174,9 @@ xCAT Port Usage Table * sunrpc-udp - The portmapper service. Needed when installing a Non-trusted node through the firewall. Specifically required mount request that takes place during node install. + The portmapper service. Needed when installing a Non-trusted node through the firewall. Specifically required mount request that takes place during node install. -* shell +* shell Used when rsh/rcp is enabled for Standard (std) authentication protocol. Needed for xdsh operations when using rsh for remote commands. @@ -219,7 +219,7 @@ xCAT Port Usage Table * rpc-mount Remote Procedure Call (RPM) used in conjunction with NFS mount request. See note 2. ssh-tcp Needed to use ssh. This service defines the protocol for tcp. This is required when installing or running updatenode through the firewall. - + * mount-tcp Needed to use the AIX mount command. This service defines the protocol for tcp. Required when installing an Non-trusted node through the firewall. Needed when installp is issued on an Non-trusted node and the resource exists on the Trusted side. Needed to run updatenode command. See note 1. @@ -277,7 +277,7 @@ Produces output similar to: :: 100005 1 udp 37395 mountd 100005 2 udp 37395 mountd 100005 3 udp 37395 mountd 100005 1 tcp 34095 mountd 100005 2 tcp 34095 mountd 100005 3 tcp 34095 mountd -Then :: +Then :: stopsrc -s rpc.mount From 5b5c84a0f88d62e2d50b0c444eb7c7bafb69307e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0122/1681] Remove trailing spaces in file docs/source/advanced/probe/index.rst --- docs/source/advanced/probe/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/probe/index.rst b/docs/source/advanced/probe/index.rst index 4e6932de7..c77283c3e 100644 --- a/docs/source/advanced/probe/index.rst +++ b/docs/source/advanced/probe/index.rst @@ -21,7 +21,7 @@ You can use ``xcatprobe -l`` to list all valid subcommands, output will be as be image.rst osdeploy.rst discovery.rst - switch-macmap.rst + switch-macmap.rst nodecheck.rst osimagecheck.rst From 986f9068a3f52f24fd59d2d87677cb5add5c7638 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0123/1681] Remove trailing spaces in file docs/source/advanced/probe/osdeploy.rst --- docs/source/advanced/probe/osdeploy.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/probe/osdeploy.rst b/docs/source/advanced/probe/osdeploy.rst index c9a36f2f1..1c6eef7df 100644 --- a/docs/source/advanced/probe/osdeploy.rst +++ b/docs/source/advanced/probe/osdeploy.rst @@ -2,9 +2,9 @@ osdeploy ======== **osdeploy** operating system provision process. Supports two modes - 'Realtime monitor' and 'Replay history'. - + Realtime monitor: This is a default. This tool with monitor provision state of the node. Trigger 'Realtime monitor' before rebooting target node to do provisioning. - + Replay history: Used after provisioning is finished to probe the previously completed provisioning. **Note**: Currently, hierarchical structure is not supported. @@ -56,7 +56,7 @@ When all the nodes complete provisioning, the probe will exit and display output ------------------------------------------------------------- Start capturing every message during OS provision process...... ------------------------------------------------------------- - + [c910f03c17k20] Use command rinstall to reboot node c910f03c17k20 [c910f03c17k20] Node status is changed to powering-on [c910f03c17k20] Receive DHCPDISCOVER via enp0s1 @@ -75,7 +75,7 @@ When all the nodes complete provisioning, the probe will exit and display output ==================osdeploy_probe_report================= All nodes provisioned successfully [ OK ] - + If there is something wrong when provisioning, this probe will exit when timeout is reached or ``Ctrl+C`` is pressed by user. The maximum time can be set by using ``-t`` as below(default 30 minutes) :: From 2ec978697b6aa550e77ff96d610c5eec75fee413 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0124/1681] Remove trailing spaces in file docs/source/advanced/raid/hardware_raid.rst --- docs/source/advanced/raid/hardware_raid.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/advanced/raid/hardware_raid.rst b/docs/source/advanced/raid/hardware_raid.rst index 915f2b241..890272369 100644 --- a/docs/source/advanced/raid/hardware_raid.rst +++ b/docs/source/advanced/raid/hardware_raid.rst @@ -6,9 +6,9 @@ Overview In many new compute machines, disks have been formatted into RAID oriented format in manufacturer, so admin must create raid arrays using these disks manually before provisioning OS. How to configure raid arrays in unattended way for hundreds of machines turns to be a problem. -IBM has offered a tool ``iprconfig`` to configure raid for IBM power machine. To leverage this tool, xCAT enabled it in xCAT genesis.ppc64 so that admin can use genesis.ppc64 to configure RAID arrays. +IBM has offered a tool ``iprconfig`` to configure raid for IBM power machine. To leverage this tool, xCAT enabled it in xCAT genesis.ppc64 so that admin can use genesis.ppc64 to configure RAID arrays. -There are two commands (``diskdiscover`` and ``configraid``) shipped in ``xCAT-genesis-scripts`` package to support RAID arrays configuration using ``iprconfig``, you can use the ``runcmd`` facility to configure raid in the hardware discovery procedure using them, ``runcmd`` is a facility which will be run in xcat genesis system. You can also use separated manual steps to use ``configraid`` in xcat genesis system shell. +There are two commands (``diskdiscover`` and ``configraid``) shipped in ``xCAT-genesis-scripts`` package to support RAID arrays configuration using ``iprconfig``, you can use the ``runcmd`` facility to configure raid in the hardware discovery procedure using them, ``runcmd`` is a facility which will be run in xcat genesis system. You can also use separated manual steps to use ``configraid`` in xcat genesis system shell. * **diskdiscover** : Scan disk devices in xcat genesis system, give out disks and RAID arrays information. * **configraid** : Delete RAID arrays, create RAID arrays in xcat genesis system. @@ -38,7 +38,7 @@ Here are steps to use ``diskdiscover``: xdsh cn1 'diskdiscover ' The outputs format is as following: :: - + # xdsh cn1 diskdiscover cn1: -------------------------------------------------------------------------- cn1: PCI_ID PCI_SLOT_NAME Resource_Path Device Description Status @@ -76,12 +76,12 @@ Here are the input parameters introduction: #. **stripe_size** : It is optional used when creating RAID arrays. If stripe size is not specified, it will default to the recommended stripe size for the selected RAID level. -#. **create_raid** : To create a raid array, add a line beginning with create_raid, all attributes keys and values are separated by ``#``. The formats are as followings: +#. **create_raid** : To create a raid array, add a line beginning with create_raid, all attributes keys and values are separated by ``#``. The formats are as followings: * ``rl`` means RAID level, RAID level can be any supported RAID level for the given adapter, such as 0, 10, 5, 6. ``rl`` is a mandatory attribute for every create_raid. Supported RAID level is depend on physical server's RAID adapter. * User can select disks based on following attributes value. User can find these value based on ``diskdiscover`` outputs as above section described. - + a. ``pci_id`` is PCI vendor and device ID. b. ``pci_slot_name`` is the specified PCI location. If using ``pci_slot_name``, this RAID array will be created using disks from it. c. ``disk_names`` is a list of advanced format disk names. If using ``disk_names``, this RAID array will be created using these disks. @@ -104,7 +104,7 @@ More examples of input parameters: #. Create two RAID arrays, RAID level is 0, one array uses one disks from pci_id 1014:034a, the other array uses two disks from pci_slot_name ``0001:08:00.0``: :: - create_raid="rl#0|pci_id#1014:034a|disk_num#1" create_raid="rl#0|pci_slot_name#0001:08:00.0|disk_num#2" + create_raid="rl#0|pci_id#1014:034a|disk_num#1" create_raid="rl#0|pci_slot_name#0001:08:00.0|disk_num#2" #. Create two RAID arrays, RAID level is 0, one array uses disks sg0 and sg1, the other array uses disks sg2 and sg3: :: @@ -119,7 +119,7 @@ Configuring RAID in hardware discovery procedure ''''''''''''''''''''''''''''''''''''''''''''''''' #. Using ``runcmd`` facility to configure raid in the hardware discovery procedure, after configuring RAID, compute node enter xcat genesis system shell. In the following example, ``configraid`` deletes all original RAID arrays, it creates one RAID 0 array with first two disks from pci_id ``1014:034a``: :: - + nodeset cn1 runcmd="configraid delete_raid=all create_raid=rl#0|pci_id#1014:034a|disk_num#2",shell rpower cn1 reset @@ -149,5 +149,5 @@ Monitoring and debuging RAID configuration process #. Logs for ``configraid`` is saved under ``tmp`` in compute node genesis system. User can login compute node and check ``configraid`` logs to debug. #. When configuring RAID in hardware discovery procedure, user can use ``rcons`` command to monitor or debug the process: :: - + rcons cn1 From 9fa5fa6c425e5d953ad04a15040d75741d20706b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0125/1681] Remove trailing spaces in file docs/source/advanced/restapi/index.rst --- docs/source/advanced/restapi/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/restapi/index.rst b/docs/source/advanced/restapi/index.rst index 78ee41b96..9c4c77eee 100644 --- a/docs/source/advanced/restapi/index.rst +++ b/docs/source/advanced/restapi/index.rst @@ -11,4 +11,4 @@ xCAT provides REST API (also called a web services API) that is currently implem restapi_setup/index restapi_usage/index restapi_resource/index - + From 1bb8f5c90032c3fba7e71be5152bd18c06443da8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0126/1681] Remove trailing spaces in file docs/source/advanced/restapi/restapi_resource/restapi_reference.rst --- .../restapi_resource/restapi_reference.rst | 392 +++++++++--------- 1 file changed, 196 insertions(+), 196 deletions(-) diff --git a/docs/source/advanced/restapi/restapi_resource/restapi_reference.rst b/docs/source/advanced/restapi/restapi_resource/restapi_reference.rst index 1d5c37fb5..42c849d72 100644 --- a/docs/source/advanced/restapi/restapi_resource/restapi_reference.rst +++ b/docs/source/advanced/restapi/restapi_resource/restapi_reference.rst @@ -13,9 +13,9 @@ POST - Create a token. * An array of all the global configuration list. -**Example:** +**Example:** -Acquire a token for user 'root'. :: +Acquire a token for user 'root'. :: curl -X POST -k 'https://127.0.0.1/xcatws/tokens?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"userName":"root","userPW":"cluster"}' @@ -47,9 +47,9 @@ Refer to the man page: :doc:`lsdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the attributes for node 'node1'. :: +Get all the attributes for node 'node1'. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1?userName=root&userPW=cluster&pretty=1' @@ -103,9 +103,9 @@ Refer to the man page: :doc:`chdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the attributes {groups,mgt,netboot} for node node1 :: +Get the attributes {groups,mgt,netboot} for node node1 :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/attrs/groups,mgt,netboot?userName=root&userPW=cluster&pretty=1' @@ -183,9 +183,9 @@ Refer to the man page: :doc:`makehosts : { nodestat : } -**Example:** +**Example:** -Get the running status for node node1 :: +Get the running status for node node1 :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/nodestat?userName=root&userPW=cluster&pretty=1' @@ -293,9 +293,9 @@ Refer to the man page: :doc:`nodels : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the children nodes for node 'node1'. :: +Get all the children nodes for node 'node1'. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/subnodes?userName=root&userPW=cluster&pretty=1' @@ -354,9 +354,9 @@ Refer to the man page: :doc:`rpower : { power : } -**Example:** +**Example:** -Get the power status. :: +Get the power status. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/power?userName=root&userPW=cluster&pretty=1' @@ -379,9 +379,9 @@ Refer to the man page: :doc:`rpower : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the energy attributes. :: +Get all the energy attributes. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/energy?userName=root&userPW=cluster&pretty=1' @@ -424,9 +424,9 @@ Refer to the man page: :doc:`renergy : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the energy attributes which are specified in the URI. :: +Get the energy attributes which are specified in the URI. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/energy/cappingmaxmin,cappingstatus?userName=root&userPW=cluster&pretty=1' @@ -467,9 +467,9 @@ Refer to the man page: :doc:`rspconfig : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the snmp community for the service processor of node1. :: +Get the snmp community for the service processor of node1. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/sp/community?userName=root&userPW=cluster&pretty=1' @@ -479,7 +479,7 @@ Get the snmp community for the service processor of node1. :: } } -PUT - Change the specific attributes for the service processor resource. +PUT - Change the specific attributes for the service processor resource. ````````````````````````````````````````````````````````````````````````` Refer to the man page: :doc:`rspconfig ` @@ -492,9 +492,9 @@ Refer to the man page: :doc:`rspconfig : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the bootorder for the next boot. (It's only valid after setting.) :: +Get the bootorder for the next boot. (It's only valid after setting.) :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/nextboot?userName=root&userPW=cluster&pretty=1' @@ -522,7 +522,7 @@ Get the bootorder for the next boot. (It's only valid after setting.) :: } } -PUT - Change the next boot order. +PUT - Change the next boot order. `````````````````````````````````` Refer to the man page: :doc:`rsetboot ` @@ -535,9 +535,9 @@ Refer to the man page: :doc:`rsetboot : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the next boot state for the node1. :: +Get the next boot state for the node1. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/bootstate?userName=root&userPW=cluster&pretty=1' @@ -578,9 +578,9 @@ Refer to the man page: :doc:`nodeset : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the vitails attributes for the node1. :: +Get all the vitails attributes for the node1. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/vitals?userName=root&userPW=cluster&pretty=1' @@ -627,9 +627,9 @@ Refer to the man page: :doc:`rvitals : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the 'fanspeed' vitals attribute. :: +Get the 'fanspeed' vitals attribute. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/vitals/fanspeed?userName=root&userPW=cluster&pretty=1' @@ -658,9 +658,9 @@ Refer to the man page: :doc:`rinv ` * Json format: An object which includes multiple ' : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the inventory attributes for node1. :: +Get all the inventory attributes for node1. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/inventory?userName=root&userPW=cluster&pretty=1' @@ -689,9 +689,9 @@ Refer to the man page: :doc:`rinv ` * Json format: An object which includes multiple ' : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the 'model' inventory attribute for node1. :: +Get the 'model' inventory attribute for node1. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/inventory/model?userName=root&userPW=cluster&pretty=1' @@ -714,9 +714,9 @@ Refer to the man page: :doc:`reventlog : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the eventlog for node1. :: +Get all the eventlog for node1. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/eventlog?userName=root&userPW=cluster&pretty=1' @@ -737,9 +737,9 @@ Refer to the man page: :doc:`reventlog : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get beacon for node1. :: +Get beacon for node1. :: curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/beacon?userName=root&userPW=cluster&pretty=1' @@ -791,9 +791,9 @@ Refer to the man page: :doc:`rbeacon : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Initiate an software maintenance process. :: +Initiate an software maintenance process. :: curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/sw?userName=root&userPW=cluster&pretty=1' @@ -891,9 +891,9 @@ Refer to the man page: :doc:`updatenode : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Initiate an updatenode process. :: +Initiate an updatenode process. :: curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/postscript?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"scripts":["syslog","remoteshell"]}' @@ -927,9 +927,9 @@ Refer to the man page: :doc:`xdsh ` * Json format: An object which includes multiple ' : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Run the 'date' command on the node2. :: +Run the 'date' command on the node2. :: curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/nodeshell?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"command":["date","ls"]}' @@ -957,9 +957,9 @@ Refer to the man page: :doc:`xdcp ` * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}. -**Example:** +**Example:** -Copy files /tmp/f1 and /tmp/f2 from xCAT MN to the node2:/tmp. :: +Copy files /tmp/f1 and /tmp/f2 from xCAT MN to the node2:/tmp. :: curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/nodecopy?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"src":["/tmp/f1","/tmp/f2"],"target":"/tmp"}' @@ -977,7 +977,7 @@ Refer to the man page: :doc:`chvm ` **Parameters:** -* Json format: An object which includes multiple 'att:value' pairs. DataBody: +* Json format: An object which includes multiple 'att:value' pairs. DataBody: Set memory size - {"memorysize":"sizeofmemory(MB)"} Add new disk - {"adddisk":"sizeofdisk1(GB),sizeofdisk2(GB)"} Purge disk - {"purgedisk":"scsi_id1,scsi_id2"} @@ -986,21 +986,21 @@ Refer to the man page: :doc:`chvm ` * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}. -**Example1:** +**Example1:** -Set memory to 3000MB. :: +Set memory to 3000MB. :: curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"memorysize":"3000"}' -**Example2:** +**Example2:** -Add a new 20G disk. :: +Add a new 20G disk. :: curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"adddisk":"20G"}' -**Example3:** +**Example3:** -Purge the disk 'hdb'. :: +Purge the disk 'hdb'. :: curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"purgedisk":"hdb"}' @@ -1011,7 +1011,7 @@ Refer to the man page: :doc:`mkvm ` **Parameters:** -* Json format: An object which includes multiple 'att:value' pairs. DataBody: +* Json format: An object which includes multiple 'att:value' pairs. DataBody: Set CPU count - {"cpucount":"numberofcpu"} Set memory size - {"memorysize":"sizeofmemory(MB)"} Set disk size - {"disksize":"sizeofdisk"} @@ -1021,9 +1021,9 @@ Refer to the man page: :doc:`mkvm ` * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}. -**Example:** +**Example:** -Create the vm node1 with a 30G disk, 2048M memory and 2 cpus. :: +Create the vm node1 with a 30G disk, 2048M memory and 2 cpus. :: curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"disksize":"30G","memorysize":"2048","cpucount":"2"}' @@ -1034,7 +1034,7 @@ Refer to the man page: :doc:`rmvm ` **Parameters:** -* Json format: An object which includes multiple 'att:value' pairs. DataBody: +* Json format: An object which includes multiple 'att:value' pairs. DataBody: Purge disk - {"purge":"yes"} Do it by force - {"force":"yes"} @@ -1042,9 +1042,9 @@ Refer to the man page: :doc:`rmvm ` * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}. -**Example:** +**Example:** -Remove the vm node1 by force and purge the disk. :: +Remove the vm node1 by force and purge the disk. :: curl -X DELETE -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"force":"yes","purge":"yes"}' @@ -1060,7 +1060,7 @@ Refer to the man page: :doc:`clonevm : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the attributes for the specified osimage. :: +Get the attributes for the specified osimage. :: curl -X GET -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute?userName=root&userPW=cluster&pretty=1' @@ -1212,9 +1212,9 @@ Refer to the man page: :doc:`chdef ` * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}. -**Example1:** +**Example1:** -Generates a stateless image based on the specified osimage :: +Generates a stateless image based on the specified osimage :: curl -X POST -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute/instance?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"action":"gen"}' -**Example2:** +**Example2:** -Packs the stateless image from the chroot file system based on the specified osimage :: +Packs the stateless image from the chroot file system based on the specified osimage :: curl -X POST -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute/instance?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"action":"pack"}' -**Example3:** +**Example3:** -Exports an xCAT image based on the specified osimage :: +Exports an xCAT image based on the specified osimage :: curl -X POST -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute/instance?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"action":"export"}' @@ -1324,9 +1324,9 @@ Refer to the man page: :doc:`rmimage : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the attributes for network 'network1'. :: +Get all the attributes for network 'network1'. :: curl -X GET -k 'https://127.0.0.1/xcatws/networks/network1?userName=root&userPW=cluster&pretty=1' @@ -1426,9 +1426,9 @@ Refer to the man page: :doc:`chdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the attributes {groups,mgt,netboot} for network network1 :: +Get the attributes {groups,mgt,netboot} for network network1 :: curl -X GET -k 'https://127.0.0.1/xcatws/networks/network1/attrs/gateway,mask,mgtifname,net,tftpserver?userName=root&userPW=cluster&pretty=1' @@ -1512,9 +1512,9 @@ Refer to the man page: :doc:`lsdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the policy objects. :: +Get all the policy objects. :: curl -X GET -k 'https://127.0.0.1/xcatws/policy?userName=root&userPW=cluster&pretty=1' @@ -1541,9 +1541,9 @@ Refer to the man page: :doc:`lsdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the attribute for policy 1. :: +Get all the attribute for policy 1. :: curl -X GET -k 'https://127.0.0.1/xcatws/policy/1?userName=root&userPW=cluster&pretty=1' @@ -1569,9 +1569,9 @@ Refer to the man page: :doc:`chdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the name and rule attributes for policy 1. :: +Get the name and rule attributes for policy 1. :: curl -X GET -k 'https://127.0.0.1/xcatws/policy/1/attrs/name,rule?userName=root&userPW=cluster&pretty=1' @@ -1663,9 +1663,9 @@ Refer to the man page: :doc:`lsdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the attributes for group 'all'. :: +Get all the attributes for group 'all'. :: curl -X GET -k 'https://127.0.0.1/xcatws/groups/all?userName=root&userPW=cluster&pretty=1' @@ -1714,9 +1714,9 @@ Refer to the man page: :doc:`chdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the attributes {mgt,netboot} for group all :: +Get the attributes {mgt,netboot} for group all :: curl -X GET -k 'https://127.0.0.1/xcatws/groups/all/attrs/mgt,netboot?userName=root&userPW=cluster&pretty=1' @@ -1766,9 +1766,9 @@ Refer to the man page: :doc:`lsdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the global configuration :: +Get all the global configuration :: curl -X GET -k 'https://127.0.0.1/xcatws/globalconf?userName=root&userPW=cluster&pretty=1' @@ -1794,9 +1794,9 @@ Refer to the man page: :doc:`lsdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get the 'master' and 'domain' configuration. :: +Get the 'master' and 'domain' configuration. :: curl -X GET -k 'https://127.0.0.1/xcatws/globalconf/attrs/master,domain?userName=root&userPW=cluster&pretty=1' @@ -1822,9 +1822,9 @@ Refer to the man page: :doc:`chdef : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the nodes which support slp in the network. :: +Get all the nodes which support slp in the network. :: curl -X GET -k 'https://127.0.0.1/xcatws/services/slpnodes?userName=root&userPW=cluster&pretty=1' @@ -1952,9 +1952,9 @@ Refer to the man page: :doc:`lsslp : {att:value, attr:value ...}' pairs. -**Example:** +**Example:** -Get all the CMM nodes which support slp in the network. :: +Get all the CMM nodes which support slp in the network. :: curl -X GET -k 'https://127.0.0.1/xcatws/services/slpnodes/CMM?userName=root&userPW=cluster&pretty=1' @@ -2006,9 +2006,9 @@ GET - Get attributes of tables for a noderange. * An object containing each table. Within each table object is an array of node objects containing the attributes. -**Example1:** +**Example1:** -Get all the columns from table nodetype for node1 and node2. :: +Get all the columns from table nodetype for node1 and node2. :: curl -X GET -k 'https://127.0.0.1/xcatws/tables/nodetype/nodes/node1,node2?userName=root&userPW=cluster&pretty=1' @@ -2031,9 +2031,9 @@ Get all the columns from table nodetype for node1 and node2. :: ] } -**Example2:** +**Example2:** -Get all the columns from tables nodetype and noderes for node1 and node2. :: +Get all the columns from tables nodetype and noderes for node1 and node2. :: curl -X GET -k 'https://127.0.0.1/xcatws/tables/nodetype,noderes/nodes/node1,node2?userName=root&userPW=cluster&pretty=1' @@ -2081,9 +2081,9 @@ PUT - Change the node table attributes for {noderange}. * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}. -**Example:** +**Example:** -Change the nodetype.arch and noderes.netboot attributes for nodes node1,node2. :: +Change the nodetype.arch and noderes.netboot attributes for nodes node1,node2. :: curl -X PUT -k 'https://127.0.0.1/xcatws/tables/nodetype,noderes/nodes/node1,node2?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"nodetype":{"arch":"x86_64"},"noderes":{"netboot":"xnba"}}' @@ -2099,9 +2099,9 @@ GET - Get table attributes for a noderange. * An object containing each table. Within each table object is an array of node objects containing the attributes. -**Example:** +**Example:** -Get OS and ARCH attributes from nodetype table for node1 and node2. :: +Get OS and ARCH attributes from nodetype table for node1 and node2. :: curl -X GET -k 'https://127.0.0.1/xcatws/tables/nodetype/nodes/node1,node2/os,arch?userName=root&userPW=cluster&pretty=1' @@ -2132,9 +2132,9 @@ GET - Get all rows from non-node tables. * An object containing each table. Within each table object is an array of row objects containing the attributes. -**Example:** +**Example:** -Get all rows from networks table. :: +Get all rows from networks table. :: curl -X GET -k 'https://127.0.0.1/xcatws/tables/networks/rows?userName=root&userPW=cluster&pretty=1' @@ -2171,9 +2171,9 @@ GET - Get attributes for rows from non-node tables. * An object containing each table. Within each table object is an array of row objects containing the attributes. -**Example:** +**Example:** -Get rows from networks table where net=192.168.1.0,mask=255.255.255.0. :: +Get rows from networks table where net=192.168.1.0,mask=255.255.255.0. :: curl -X GET -k 'https://127.0.0.1/xcatws/tables/networks/rows/net=192.168.1.0,mask=255.255.255.0?userName=root&userPW=cluster&pretty=1' @@ -2202,9 +2202,9 @@ PUT - Change the non-node table attributes for the row that matches the {keys}. * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}. -**Example:** +**Example:** -Create a route row in the routes table. :: +Create a route row in the routes table. :: curl -X PUT -k 'https://127.0.0.1/xcatws/tables/routes/rows/routename=privnet?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"net":"10.0.1.0","mask":"255.255.255.0","gateway":"10.0.1.254","ifname":"eth1"}' @@ -2215,9 +2215,9 @@ DELETE - Delete rows from a non-node table that have the attribute values specif * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}. -**Example:** +**Example:** -Delete rows from routes table where routename=privnet. :: +Delete rows from routes table where routename=privnet. :: curl -X DELETE -k 'https://127.0.0.1/xcatws/tables/routes/rows/routename=privnet?userName=root&userPW=cluster&pretty=1' @@ -2233,9 +2233,9 @@ GET - Get specific attributes for rows from non-node tables. * An object containing each table. Within each table object is an array of row objects containing the attributes. -**Example:** +**Example:** -Get attributes mgtifname and tftpserver from networks table for each row where net=192.168.1.0,mask=255.255.255.0. :: +Get attributes mgtifname and tftpserver from networks table for each row where net=192.168.1.0,mask=255.255.255.0. :: curl -X GET -k 'https://127.0.0.1/xcatws/tables/networks/rows/net=192.168.1.0,mask=255.255.255.0/mgtifname,tftpserver?userName=root&userPW=cluster&pretty=1' From c4725ce15c5e3ce4fa6491dc2fe264144b3e42ca Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0127/1681] Remove trailing spaces in file docs/source/advanced/restapi/restapi_setup/restapi_setup.rst --- .../restapi/restapi_setup/restapi_setup.rst | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/source/advanced/restapi/restapi_setup/restapi_setup.rst b/docs/source/advanced/restapi/restapi_setup/restapi_setup.rst index b7e6454d7..634876446 100644 --- a/docs/source/advanced/restapi/restapi_setup/restapi_setup.rst +++ b/docs/source/advanced/restapi/restapi_setup/restapi_setup.rst @@ -1,7 +1,7 @@ -Enable the HTTPS service for REST API +Enable the HTTPS service for REST API ===================================== -To improve the security between the REST API client and server, enabling the HTTPS service on the xCAT MN is recommended. And the REST API client should use the 'https' to access web server instead of the 'http'. +To improve the security between the REST API client and server, enabling the HTTPS service on the xCAT MN is recommended. And the REST API client should use the 'https' to access web server instead of the 'http'. * **[RHEL6/7 (x86_64/ppc64) and RHEL5 (x86_64)]** :: @@ -13,7 +13,7 @@ To improve the security between the REST API client and server, enabling the HTT Uninstall httpd.ppc64 and install httpd.ppc: :: - rpm -e --nodeps httpd.ppc64 + rpm -e --nodeps httpd.ppc64 rpm -i httpd.ppc mod_ssl.ppc * **[SLES10/11/12 (x86_64/ppc64)]** :: @@ -31,7 +31,7 @@ To improve the security between the REST API client and server, enabling the HTT sudo a2enmod ssl ln -s ../sites-available/default-ssl.conf /etc/apache2/sites-enabled/ssl.conf sudo service apache2 restart - + # verify it is loaded: sudo apache2ctl -t -D DUMP_MODULES | grep ssl @@ -40,11 +40,11 @@ To improve the security between the REST API client and server, enabling the HTT Enable the Certificate of HTTPs Server (Optional) ================================================= -Enabling the certificate functionality of https server is useful for the Rest API client to authenticate the server. +Enabling the certificate functionality of https server is useful for the Rest API client to authenticate the server. -The certificate for xcatd has already been generated when installing xCAT, it can be reused by the https server. To enable the server certificate authentication, the hostname of xCAT MN must be a fully qualified domain name (FQDN). The REST API client also must use this FQDN when accessing the https server. If the hostname of the xCAT MN is not a FQDN, you need to change the hostname first. +The certificate for xcatd has already been generated when installing xCAT, it can be reused by the https server. To enable the server certificate authentication, the hostname of xCAT MN must be a fully qualified domain name (FQDN). The REST API client also must use this FQDN when accessing the https server. If the hostname of the xCAT MN is not a FQDN, you need to change the hostname first. -Typically the hostname of the xCAT MN is initially set to the NIC which faces to the cluster (usually an internal/private NIC). If you want to enable the REST API for public client, set the hostname of xCAT MN to one of the public NIC. +Typically the hostname of the xCAT MN is initially set to the NIC which faces to the cluster (usually an internal/private NIC). If you want to enable the REST API for public client, set the hostname of xCAT MN to one of the public NIC. To change the hostname, edit /etc/sysconfig/network (RHEL) or /etc/HOSTNAME (SLES) and run: :: @@ -62,9 +62,9 @@ The steps to configure the certificate for https server: :: export sslcfgfile=/etc/apache2/vhosts.d/vhost-ssl.conf # sles export sslcfgfile=/etc/apache2/sites-enabled/ssl.conf # ubuntu - sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' $sslcfgfile + sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' $sslcfgfile sed -i 's/^\(\s*SSLCertificateKeyFile.*\)$/#\1/' $sslcfgfile - + service httpd restart # rhel service apache2 restart # sles/ubuntu @@ -92,11 +92,11 @@ Some operations like 'create osimage' (copycds) need a long time (longer than 3 Set Up an Account for Web Service Access ======================================== -User needs a username and password to access the REST API. When the REST API request is passed to xcatd, the username and password will be verified based on the :doc:`xCAT passwd Table `, and then xcatd will look in the :doc:`xCAT policy Table ` to see if the user is allowed to perform the requested operation. +User needs a username and password to access the REST API. When the REST API request is passed to xcatd, the username and password will be verified based on the :doc:`xCAT passwd Table `, and then xcatd will look in the :doc:`xCAT policy Table ` to see if the user is allowed to perform the requested operation. -The account with key of **xcat** will be used for the REST API authentication. The username and password should be passed in as the attirbutes of URL: +The account with key of **xcat** will be used for the REST API authentication. The username and password should be passed in as the attirbutes of URL: -* userName: Pass the username of the account +* userName: Pass the username of the account * userPW: Pass the password of the account (xCAT 2.10) * password: Pass the password of the account (xCAT earlier than 2.10) @@ -123,7 +123,7 @@ Create new user and setup the password and policy rules. :: # add user to policy table mkdef -t policy 6 name= rule=allow -``Note:`` in the tabch command above you can put the salted password (from /etc/shadow) in the xCAT passwd table instead of the clear text password, if you prefer. +``Note:`` in the tabch command above you can put the salted password (from /etc/shadow) in the xCAT passwd table instead of the clear text password, if you prefer. Identical user with the same name and uid need to be created on each compute node. :: @@ -136,7 +136,7 @@ Create the SSL certificate under that user's home directory so that user can be /opt/xcat/share/xcat/scripts/setup-local-client.sh -When running this command you'll see SSL certificates created. Enter "y" where prompted and take the defaults. +When running this command you'll see SSL certificates created. Enter "y" where prompted and take the defaults. To enable the POST method of resources like nodeshell, nodecopy, updating and filesyncing for the non-root user, you need to enable the ssh communication between xCAT MN and CN without password. Log in as and run following command: :: @@ -150,9 +150,9 @@ or if you did not set up the certificate: :: curl -X GET -k 'https:///xcatws/nodes?userName=&userPW=' -You should see some output that includes your list of nodes. +You should see some output that includes your list of nodes. If errors returned, check `/var/log/httpd/ssl_error_log` on xCAT MN. -``Note:`` if passwords need to be changed in the future, make sure to update the xCAT passwd table. xCAT REST API uses passwords stored in that table to authenticate users. +``Note:`` if passwords need to be changed in the future, make sure to update the xCAT passwd table. xCAT REST API uses passwords stored in that table to authenticate users. From afbae5dd910e1acac2d59c7a8a725622be161eab Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0128/1681] Remove trailing spaces in file docs/source/advanced/restapi/restapi_usage/restapi_usage.rst --- docs/source/advanced/restapi/restapi_usage/restapi_usage.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/restapi/restapi_usage/restapi_usage.rst b/docs/source/advanced/restapi/restapi_usage/restapi_usage.rst index 53490eb13..ecca3b8e8 100644 --- a/docs/source/advanced/restapi/restapi_usage/restapi_usage.rst +++ b/docs/source/advanced/restapi/restapi_usage/restapi_usage.rst @@ -58,7 +58,7 @@ Then in the subsequent REST API access, the token can be used to replace the use curl -X GET -k -H X-Auth-Token:5cabd675-bc2e-4318-b1d6-831fd1f32f97 'https:///xcatws/? -The default validity of a token is 1 day. This default can be changed by the setting of `tokenexpiredays` attribute in `site` table. :: +The default validity of a token is 1 day. This default can be changed by the setting of `tokenexpiredays` attribute in `site` table. :: chdef -t site clustersite tokenexpiredays= From edf5f37751da15b1a7c5715a485ca93c59d1ceab Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0129/1681] Remove trailing spaces in file docs/source/advanced/security/certs.rst --- docs/source/advanced/security/certs.rst | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/advanced/security/certs.rst b/docs/source/advanced/security/certs.rst index f23fe1a83..ee6e98b01 100644 --- a/docs/source/advanced/security/certs.rst +++ b/docs/source/advanced/security/certs.rst @@ -10,47 +10,47 @@ The xCAT daemon on the management node and service node listens on a SSL socket xCAT creates 1 CA certificate and 2 credentials (private key and certificate pairs): - 1. xCAT CA certificate(ca.pem): + 1. xCAT CA certificate(ca.pem): * a self-signed certificate used as Certificate Authority in xcatd SSL communication; - * generated by ``/opt/xcat/share/xcat/scripts/setup-xcat-ca.sh`` script on xCAT installation; + * generated by ``/opt/xcat/share/xcat/scripts/setup-xcat-ca.sh`` script on xCAT installation; * will be generated (or updated) on xCAT management node when: - * install or update xCAT when "/etc/xcat/ca" directory does not exist - * or run ``xcatconfig -f|--force`` + * install or update xCAT when "/etc/xcat/ca" directory does not exist + * or run ``xcatconfig -f|--force`` * or run ``xcatconfig -c|--credentials`` - * files on management node: + * files on management node: * ``/etc/xcat/ca/ca-cert.pem`` * ``/etc/xcat/cert/ca.pem`` ,copied by ``/opt/xcat/share/xcat/scripts/setup-server-cert.sh`` * ``/root/.xcat/ca.pem`` ,copied by ``/opt/xcat/share/xcat/scripts/setup-local-client.sh`` * file on service node: ``/root/.xcat/ca.pem`` - * distribution path: + * distribution path: **/etc/xcat/cert/ca.pem (MN)** ===(run ``xcatconfig`` command)===> **/install/postscripts/_xcat/ca.pem (MN)** ===(node provision/updatenode)==> **/xcatpost/_xcat/ca.pem (SN and CN)** ==(run "servicenode" postscript)==> **/root/.xcat/ca.pem (SN)** - 2. xCAT server credential(server-cred.pem): + 2. xCAT server credential(server-cred.pem): * a concatenation of server private key and certificate(signed with xCAT CA certificate) * generated by ``/opt/xcat/share/xcat/scripts/setup-server-cert.sh`` on xCAT installation; * will be generated (or updated) on xCAT management node when: - * install or update xCAT when ``/etc/xcat/cert`` directory does not exist - * or run ``xcatconfig -f|--force`` + * install or update xCAT when ``/etc/xcat/cert`` directory does not exist + * or run ``xcatconfig -f|--force`` * or run ``xcatconfig -c|--credentials`` * file on management node: ``/etc/xcat/cert/server-cred.pem`` - * file on service node: ``/etc/xcat/cert/server-cred.pem`` - * distribution path: + * file on service node: ``/etc/xcat/cert/server-cred.pem`` + * distribution path: **/etc/xcat/cert/server-cred.pem (MN)** ==(run ``xcatserver`` script called by ``servicenode`` postscript)===> **/etc/xcat/cert/server-cred.pem(SN)** 3. xCAT client credential(client-cred.pem): * a concatenation of client private key and certificate (signed with xCAT CA certificate) * generated by ``/opt/xcat/share/xcat/scripts/setup-local-client.sh`` on xCAT installation - * will be generated (or updated) on xCAT management node when: - * install or update xCAT when ``/root/.xcat/client-key.pem`` does not exist; - * or run ``xcatconfig -f|--force`` + * will be generated (or updated) on xCAT management node when: + * install or update xCAT when ``/root/.xcat/client-key.pem`` does not exist; + * or run ``xcatconfig -f|--force`` * or run ``xcatconfig -c|--credentials`` * file on management node: ``/root/.xcat/client-cred.pem`` - * file on service node: ``/root/.xcat/client-cred.pem`` - * distribution path: - **/root/.xcat/client-cred.pem (MN)** ===(run ``xcatclient`` script called by ``servicenode`` postscript")===> **/root/.xcat/client-cred.pem(SN)** + * file on service node: ``/root/.xcat/client-cred.pem`` + * distribution path: + **/root/.xcat/client-cred.pem (MN)** ===(run ``xcatclient`` script called by ``servicenode`` postscript")===> **/root/.xcat/client-cred.pem(SN)** The usage of the credentials in the xCAT SSL communication is: From 04b63284c92227cff9e089e1416a995e00347ada Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0130/1681] Remove trailing spaces in file docs/source/advanced/security/security.rst --- docs/source/advanced/security/security.rst | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/source/advanced/security/security.rst b/docs/source/advanced/security/security.rst index e47ca74e9..2d3e16fb4 100644 --- a/docs/source/advanced/security/security.rst +++ b/docs/source/advanced/security/security.rst @@ -12,7 +12,7 @@ The xCAT daemon uses SSL to only allow authorized users to run xCAT commands. Al Commands Access Control ----------------------- -Except SSL channel, xCAT only authorize root on the management node to run **xCAT** commands by default. But xCAT can be configured to allow both **non-root users** and **remote users** to run limited xCAT commands. For remote users, we mean the users who triggers the xCAT commands from other nodes and not have to login to the management node. xCAT uses the **policy** table to control who has authority to run specific xCAT commands. For a full explanation of the **policy** table, refer to :doc:`policy ` man page. +Except SSL channel, xCAT only authorize root on the management node to run **xCAT** commands by default. But xCAT can be configured to allow both **non-root users** and **remote users** to run limited xCAT commands. For remote users, we mean the users who triggers the xCAT commands from other nodes and not have to login to the management node. xCAT uses the **policy** table to control who has authority to run specific xCAT commands. For a full explanation of the **policy** table, refer to :doc:`policy ` man page. .. _granting_xcat_privileges: @@ -40,17 +40,17 @@ CLI can also be used: :: **Note** Make sure the directories that contain the xCAT commands are in the user's ``$PATH``. If not, add them to ``$PATH`` as appropriate in your system. :: echo $PATH | grep xcat - /opt/xcat/bin:/opt/xcat/sbin: ....... + /opt/xcat/bin:/opt/xcat/sbin: ....... Extra Setup for Remote Commands ``````````````````````````````` To give a user the ability to run remote commands (``xdsh``, ``xdcp``, ``psh``, ``pcp``) in some node, in addition to above steps, also need to run below steps: :: - + su - xdsh -K -This will setup the user and root ssh keys for the user under the ``$HOME/.ssh`` directory of the user on the nodes. The root ssh keys are needed for the user to run the xCAT commands under the xcatd daemon, where the user will be running as root. **Note**: the uid and the password for the user on the management node, should match the uid and password on the managed nodes. +This will setup the user and root ssh keys for the user under the ``$HOME/.ssh`` directory of the user on the nodes. The root ssh keys are needed for the user to run the xCAT commands under the xcatd daemon, where the user will be running as root. **Note**: the uid and the password for the user on the management node, should match the uid and password on the managed nodes. Set Up Login Node (Remote Client) @@ -67,25 +67,25 @@ Below are the steps of how to set up a login node. * :doc:`Configure xCAT Software Repository in RHEL` * :ref:`Configure the Base OS Repository in SUSE ` - + * :ref:`Configure the Base OS Repository in Ubuntu ` Then install ``xCAT-client``. **[RHEL]** :: - + yum install xCAT-client **[SUSE]** :: - + zypper install xCAT-client **[Ubuntu]** :: apt-get install xCAT-client -2. Configure login node +2. Configure login node When running on the login node, the environment variable **XCATHOST** must be export to the name or address of the management node and the port for connections (usually 3001). :: @@ -99,11 +99,11 @@ Below are the steps of how to set up a login node. The remote not-root user still needs to set up the credentials for communication with management node. By running the ``/opt/xcat/share/xcat/scripts/setup-local-client.sh `` command as root in management node, the credentials are generated in 's ``$HOME/.xcat`` directory in management node. These credential files must be copied to the 's ``$HOME/.xcat`` directory on the login node. **Note**: After ``scp``, in the login node, you must make sure the owner of the credentials is . - Setup your ``policy`` table on the management node with the permissions that you would like the non-root id to have. + Setup your ``policy`` table on the management node with the permissions that you would like the non-root id to have. At this time, the non-root id should be able to execute any commands that have been set in the ``policy`` table from the Login Node. - If any remote shell commands (psh,xdsh) are needed, then you need to follow `Extra Setup For Remote Commands`_. + If any remote shell commands (psh,xdsh) are needed, then you need to follow `Extra Setup For Remote Commands`_. Auditing @@ -122,7 +122,7 @@ xCAT logs all xCAT commands run by the xcatd daemon to both the syslog and the a args: The command argument list. status: Allowed or Denied. comments: Any user-provided notes. - disable: Do not use. tabprune will not work if set to yes or 1 + disable: Do not use. tabprune will not work if set to yes or 1 Password Management @@ -130,7 +130,7 @@ Password Management xCAT is required to store passwords for various logons so that the application can login to the devices without having to prompt for a password. The issue is how to securely store these passwords. -Currently xCAT stores passwords in ``passwd`` table. You can store them as plain text, you can also store them as MD5 ciphertext. +Currently xCAT stores passwords in ``passwd`` table. You can store them as plain text, you can also store them as MD5 ciphertext. Here is an example about how to store a MD5 encrypted password for root in ``passwd`` table. :: @@ -151,7 +151,7 @@ Nodes Inter-Access in The Cluster --------------------------------- -xCAT performs the setup for root to be able to ssh without password from the Management Node(MN) to all the nodes in the cluster. All nodes are able to ssh to each other without password or being prompted for a ``known_host`` entry, unless restricted. Nodes cannot ssh back to the Management Node or Service Nodes without a password by default. +xCAT performs the setup for root to be able to ssh without password from the Management Node(MN) to all the nodes in the cluster. All nodes are able to ssh to each other without password or being prompted for a ``known_host`` entry, unless restricted. Nodes cannot ssh back to the Management Node or Service Nodes without a password by default. xCAT generates, on the MN, a new set of ssh hostkeys for the nodes to share, which are distributed to all the nodes during install. If ssh keys do not already exist for root on the MN, it will generate an id_rsa public and private key pair. @@ -160,7 +160,7 @@ During node install, xCAT sends the ssh hostkeys to ``/etc/ssh`` on the node, th On the MN and the nodes, xCAT sets the ssh configuration file to ``strictHostKeyChecking no``, so that a ``known_host`` file does not have to be built in advanced. Each node can ssh to every other cluster node without being prompted for a password, and because they share the same ssh host keys there will be no prompting to add entries to ``known_hosts``. On the MN, you will be prompted to add entries to ``known_hosts`` file for each node once. See makeknownhosts command for a quick way to build a ``known_hosts`` file on the MN, if your nodes are defined in the xCAT database. - + Restricting Node to Node SSH ```````````````````````````` @@ -169,7 +169,7 @@ By default, all nodes installed by one management node are able to ssh to each w This setting of site.sshbetweennodes will only enable root ssh between nodes of the compute1 and compute 2 groups and all service nodes. :: - "sshbetweennodes","compute1,compute2",, + "sshbetweennodes","compute1,compute2",, Secure Zones From 1b12c5417826b27156e5388387041afae269a658 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0131/1681] Remove trailing spaces in file docs/source/advanced/security/ssl_config.rst --- docs/source/advanced/security/ssl_config.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/advanced/security/ssl_config.rst b/docs/source/advanced/security/ssl_config.rst index 3ea6f360b..58f01bc3a 100644 --- a/docs/source/advanced/security/ssl_config.rst +++ b/docs/source/advanced/security/ssl_config.rst @@ -3,7 +3,7 @@ OpenSSL Configuration xCAT does not ship OpenSSL RPMS nor does it statically link to any OpenSSL libraries. Communication between the xCAT client and daemon utilizes OpenSSL and the administrator can configure SSL_version and SSL_cipher that should be used by xCAT daemons. -The configuration is stored in the xCAT site table using the ``site.xcatsslversion`` and ``site.xcatsslciphers`` variables. +The configuration is stored in the xCAT site table using the ``site.xcatsslversion`` and ``site.xcatsslciphers`` variables. Configuration ------------- @@ -14,7 +14,7 @@ By default, xCAT ships with ``TLSv1`` configured. The current highest SSL versi chtab key=xcatsslversion site.value=TLSv12 -* For ubuntu 14.x and higher: :: +* For ubuntu 14.x and higher: :: chtab key=xcatsslversion site.value=TLSv1_2 @@ -40,13 +40,13 @@ If any mistakes have been made and communiation is lost to xCAT, use ``XCATBYPAS Validation ---------- -Use the ``openssl`` command to validate the SSL configuration is valid and expected. +Use the ``openssl`` command to validate the SSL configuration is valid and expected. -* To check whether TLSv1 is supported by xcatd: :: +* To check whether TLSv1 is supported by xcatd: :: openssl s_client -connect 127.0.0.1:3001 -tls1 -* To check if SSLv3 is disabled on ``xcatd``: :: +* To check if SSLv3 is disabled on ``xcatd``: :: openssl s_client -connect localhost:3001 -ssl3 From ec4c357b1439bc84222704c802c5667a29a35136 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0132/1681] Remove trailing spaces in file docs/source/advanced/sysclone/sysclone.rst --- docs/source/advanced/sysclone/sysclone.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/advanced/sysclone/sysclone.rst b/docs/source/advanced/sysclone/sysclone.rst index 2f3dbe583..7e1fbebbe 100644 --- a/docs/source/advanced/sysclone/sysclone.rst +++ b/docs/source/advanced/sysclone/sysclone.rst @@ -1,7 +1,7 @@ Using System Clone to Deploy Diskful Node ========================================= -When we want to deploy large numbers of nodes which have the same configuration, the simplest way is to clone. This means the user can customize and tweak one node's configuration according to his needs. They can verify it's proper operation, then make this node as template. They can capture an osimage from this template node, and deploy the rest of the nodes with this osimage quickly. xCat (2.8.2 and above) provides this feature which we call Sysclone to help you handle this scenario. +When we want to deploy large numbers of nodes which have the same configuration, the simplest way is to clone. This means the user can customize and tweak one node's configuration according to his needs. They can verify it's proper operation, then make this node as template. They can capture an osimage from this template node, and deploy the rest of the nodes with this osimage quickly. xCat (2.8.2 and above) provides this feature which we call Sysclone to help you handle this scenario. List of Supported Arch and OS ----------------------------- @@ -35,7 +35,7 @@ List of Supported Arch and OS Using Sysclone to Install Nodes ------------------------------- -This document describes how to install and configure a template node (called golden client), capture an image from this template node, then using this image to deploy other nodes (called target nodes) quickly. +This document describes how to install and configure a template node (called golden client), capture an image from this template node, then using this image to deploy other nodes (called target nodes) quickly. Prepare the xCAT Management Node for Support Sysclone ````````````````````````````````````````````````````` @@ -65,10 +65,10 @@ To support Sysclone, we need to install some extra rpms on management node and t Compilation failed in require at /usr/sbin/si_mkrsyncd_conf line 28. BEGIN failed--compilation aborted at /usr/sbin/si_mkrsyncd_conf line 28. -3. Copy the xcat-dep-XXX.tar.bz2 file to directory ``/install/post/otherpkgs///xcat/`` of the management node according your golden client's OS version and system architecture, then decompress it: +3. Copy the xcat-dep-XXX.tar.bz2 file to directory ``/install/post/otherpkgs///xcat/`` of the management node according your golden client's OS version and system architecture, then decompress it: * **[CentOS6.3 and x86_64]**:: - + mkdir -p /install/post/otherpkgs/CentOS6.3/x86_64/xcat cp xcat-dep-*.tar.bz2 /install/post/otherpkgs/CentOS6.3/x86_64/xcat cd /install/post/otherpkgs/CentOS6.3/x86_64/xcat @@ -82,7 +82,7 @@ To support Sysclone, we need to install some extra rpms on management node and t tar jxvf xcat-dep-*.tar.bz2 * **[RHEL6.4 and ppc64]**:: - + mkdir -p /install/post/otherpkgs/rhels6.4/ppc64/xcat cp xcat-dep-*.tar.bz2 /install/post/otherpkgs/rhels6.4/ppc64/xcat cd /install/post/otherpkgs/rhels6.4/ppc64/xcat @@ -95,7 +95,7 @@ The Golden Client acts as a regular node for xCAT, it just has some extra rpms t For information of how to install a regular node, refer to section :ref:`Diskful Installation ` -To support clone, add 'otherpkglist' and 'otherpkgdir' attributes to the image definition which will be used to deploy golden client, then deploy golden client as normal. Once deployed, the golden client will have extra rpms to support cloning. If you have deployed your golden client already, use **updatenode** command to push these extra rpms to golden client. CentOS shares the same pkglist file with RHEL. For example: +To support clone, add 'otherpkglist' and 'otherpkgdir' attributes to the image definition which will be used to deploy golden client, then deploy golden client as normal. Once deployed, the golden client will have extra rpms to support cloning. If you have deployed your golden client already, use **updatenode** command to push these extra rpms to golden client. CentOS shares the same pkglist file with RHEL. For example: * **[RH6.4 and x86_64]**:: @@ -110,7 +110,7 @@ To support clone, add 'otherpkglist' and 'otherpkgdir' attributes to the image d updatenode -S * **[SLES11.3 and x86_64]**:: - + chdef -t osimage -o otherpkglist=/opt/xcat/share/xcat/install/sles/sysclone.sles11.x86_64.otherpkgs.pkglist chdef -t osimage -o -p otherpkgdir=/install/post/otherpkgs/SLES11.3/x86_64 updatenode -S @@ -126,7 +126,7 @@ To support clone, add 'otherpkglist' and 'otherpkgdir' attributes to the image d Capture Image from Golden Client ```````````````````````````````` -On Management node, use xCAT command **imgcapture** to capture an image from the golden-client.:: +On Management node, use xCAT command **imgcapture** to capture an image from the golden-client.:: imgcapture -t sysclone -o @@ -212,7 +212,7 @@ If you install systemimager RPMs on CentOS 6.5 node using **yum**, you may exper * **On golden client**:: [root@CentOS6.5 node]# cd / - [root@CentOS6.5 node]# rpm -ivh perl-AppConfig-1.52-4.noarch.rpm + [root@CentOS6.5 node]# rpm -ivh perl-AppConfig-1.52-4.noarch.rpm [root@CentOS6.5 node]# rpm -ivh systemconfigurator-2.2.11-1.noarch.rpm [root@CentOS6.5 node]# rpm -ivh systemimager-common-4.3.0-0.1.noarch.rpm [root@CentOS6.5 node]# rpm -ivh systemimager-client-4.3.0-0.1.noarch.rpm @@ -220,4 +220,4 @@ If you install systemimager RPMs on CentOS 6.5 node using **yum**, you may exper Kernel panic at times when install target node with rhels7.0 in Power 7 server `````````````````````````````````````````````````````````````````````````````` -When you clone rhels7.0 image to target node which is Power 7 server lpar, you may hit Kernel panic problem at times after boot loader grub2 download kernel and initrd. This is an known issue but without a resolution. For now, we recommend you try again. +When you clone rhels7.0 image to target node which is Power 7 server lpar, you may hit Kernel panic problem at times after boot loader grub2 download kernel and initrd. This is an known issue but without a resolution. For now, we recommend you try again. From 4fa929b542e1e820831acbd7a27c50d2be51d818 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0133/1681] Remove trailing spaces in file docs/source/advanced/xcat-inventory/define_create_cluster.rst --- .../xcat-inventory/define_create_cluster.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/advanced/xcat-inventory/define_create_cluster.rst b/docs/source/advanced/xcat-inventory/define_create_cluster.rst index 9a2dce023..f7cfb43dc 100644 --- a/docs/source/advanced/xcat-inventory/define_create_cluster.rst +++ b/docs/source/advanced/xcat-inventory/define_create_cluster.rst @@ -5,8 +5,8 @@ The inventory templates for 2 kinds of typical xCAT cluster is shipped. You can Currently, the inventory templates includes: -1. flat_cluster_template.yaml: - +1. flat_cluster_template.yaml: + a flat baremetal cluster, including **openbmc controlled PowerLE servers**, **IPMI controlled Power servers(commented out)**, **X86_64 servers(commented out)** 2. flat_kvm_cluster_template.yaml: a flat KVM based Virtual Machine cluster, including **PowerKVM based VM nodes**, **KVM based X86_64 VM nodes(commented out)** @@ -14,15 +14,15 @@ Currently, the inventory templates includes: The steps to create your first xCAT cluster is: 1. create a customized cluster inventory file "mycluster.yaml" based on ``flat_cluster_template.yaml`` :: - + cp /opt/xcat/share/xcat/inventory_templates/flat_cluster_template.yaml /git/cluster/mycluster.yaml 2. custmize the cluster inventory file "mycluster.yaml" by modifying the attributs in the line under token ``#CHANGEME`` according to the setup of your phisical cluster. You can create new node definition by duplicating and modifying the node definition in the template. 3. import the cluster inventory file :: - + xcat-inventory import -f /git/cluster/mycluster.yaml - -Now you have your 1st xCAT cluster, you can start bring up the cluster by provision nodes. + +Now you have your 1st xCAT cluster, you can start bring up the cluster by provision nodes. From f1b9e63405eea6edaff002745ef3e779004b4d5d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0134/1681] Remove trailing spaces in file docs/source/advanced/xcat-inventory/index.rst --- docs/source/advanced/xcat-inventory/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/advanced/xcat-inventory/index.rst b/docs/source/advanced/xcat-inventory/index.rst index 5c7c4829b..46ed319e6 100644 --- a/docs/source/advanced/xcat-inventory/index.rst +++ b/docs/source/advanced/xcat-inventory/index.rst @@ -12,10 +12,10 @@ xcat-inventory * ability to intergrate with Ansible(Comming Soon) -This section presents 2 typical user case of ``xcat-inventory`` +This section presents 2 typical user case of ``xcat-inventory`` .. toctree:: :maxdepth: 2 version_control_inventory.rst - define_create_cluster.rst + define_create_cluster.rst From 819c13881296fa99f58dd62f4a80ef6af8899a6a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0135/1681] Remove trailing spaces in file docs/source/advanced/xcat-inventory/version_control_inventory.rst --- .../advanced/xcat-inventory/version_control_inventory.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/advanced/xcat-inventory/version_control_inventory.rst b/docs/source/advanced/xcat-inventory/version_control_inventory.rst index fbd4bdfcf..3669dc103 100644 --- a/docs/source/advanced/xcat-inventory/version_control_inventory.rst +++ b/docs/source/advanced/xcat-inventory/version_control_inventory.rst @@ -1,7 +1,7 @@ Manage the xCAT Cluster Definition under Source Control ======================================================= -The xCAT cluster inventory data, including global configuration and object definitions(node/osimage/passwd/policy/network/router), and the relationship of the objects, can be exported to a YAML/JSON file(**inventory file**) from xCAT Database, or be imported to xCAT Database from the inventory file. +The xCAT cluster inventory data, including global configuration and object definitions(node/osimage/passwd/policy/network/router), and the relationship of the objects, can be exported to a YAML/JSON file(**inventory file**) from xCAT Database, or be imported to xCAT Database from the inventory file. By managing the inventory file under source control system, you can manage the xCAT cluster definition under source control. This section presents a typical step-by-step scenario on how to manage cluster inventory data under ``git``. @@ -34,7 +34,7 @@ By managing the inventory file under source control system, you can manage the x git commit /git/cluster/mycluster.yaml -m "$(date "+%Y_%m_%d_%H_%M_%S"): replaced bad nodes; turn on xcatdebugmode; blah-blah" 6. ordinary cluster maintenance and operation, some issues are founded in current cluster, need to restore the current cluster configuration to commit no c95673 [1]_ :: - + cd /git/cluster git checkout c95673 xcat-inventory import -f /git/cluster/mycluster.yaml @@ -43,7 +43,7 @@ By managing the inventory file under source control system, you can manage the x 1. The cluster inventory data exported by ``xcat-inventory`` does not include intermidiate data, transiate data and historical data in xCAT DataBase, such as node status, auditlog table -2. We suggest you backup your xCAT database by ``dumpxCATdb`` before your trial on this feature, although we have run sufficient test on this +2. We suggest you backup your xCAT database by ``dumpxCATdb`` before your trial on this feature, although we have run sufficient test on this .. [1] When you import the inventory data to xCAT Database in step 6, there are 2 modes: ``clean mode`` and ``update mode``. If you choose the ``clean mode`` by ``xcat-inventory import -c|--clean``, all the objects definitions that are not included in the inventory file will be removed; Otherwise, only the objects included in the inventory file will be updated or inserted. Please choose the proper mode according to your need From bed998d7d43647778c42b29be68d095d76280e8b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0136/1681] Remove trailing spaces in file docs/source/advanced/zones/change_zones.rst --- docs/source/advanced/zones/change_zones.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/zones/change_zones.rst b/docs/source/advanced/zones/change_zones.rst index 3814c3b4b..bd9c6d437 100644 --- a/docs/source/advanced/zones/change_zones.rst +++ b/docs/source/advanced/zones/change_zones.rst @@ -28,7 +28,7 @@ The following command will change zone1 such that root cannot ssh between the no sshbetweennodes=no sshkeydir=/etc/xcat/sshkeys/zone1/.ssh -The following command will change zone1 to the default zone. +The following command will change zone1 to the default zone. **Note**: you must use the ``-f`` flag to force the change. There can only be one default zone in the ``zone`` table. :: From 1837082678ccb1ce08f47360a7f78463c99ee8b4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0137/1681] Remove trailing spaces in file docs/source/advanced/zones/index.rst --- docs/source/advanced/zones/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/zones/index.rst b/docs/source/advanced/zones/index.rst index 20a65445f..d0f552dc7 100644 --- a/docs/source/advanced/zones/index.rst +++ b/docs/source/advanced/zones/index.rst @@ -8,4 +8,4 @@ Zones configure_zones.rst create_zones.rst change_zones.rst - remove_zones.rst + remove_zones.rst From 8dfce22790423626f7f7c241819367a4e802ee21 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0138/1681] Remove trailing spaces in file docs/source/advanced/zones/overview.rst --- docs/source/advanced/zones/overview.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/zones/overview.rst b/docs/source/advanced/zones/overview.rst index 73fa5b1bc..bae5dba44 100644 --- a/docs/source/advanced/zones/overview.rst +++ b/docs/source/advanced/zones/overview.rst @@ -1,7 +1,7 @@ Overview ======== -XCAT supports the concept of zones within a single xCAT cluster managed by one Management Node. The nodes in the cluster can be divided up into multiple zones that have different ssh keys managed separately. +XCAT supports the concept of zones within a single xCAT cluster managed by one Management Node. The nodes in the cluster can be divided up into multiple zones that have different ssh keys managed separately. Each defined zone has it own root's ssh RSA keys, so that any node can ssh without a password to any other node in the same zone, cannot ssh without being prompted for a password to nodes in another zone. From ae9a33e9e8aa120062c700474ec6acd9b8d240af Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0139/1681] Remove trailing spaces in file docs/source/conf.py --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 834fc0065..9592b9db5 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -80,7 +80,7 @@ language = None # Adding a pattern or a file on this list will still make file available in the documentation, # but will eliminate the warning message "document isn't included in any toctree" # However, some files that generate such warning contain labels being referred to from other files, -# if put on the exclude_patters list, such labels are not visible. The commented out files in the +# if put on the exclude_patters list, such labels are not visible. The commented out files in the # exclude_patters list below, are such files. They generate a warning, but contain reference labels. exclude_patterns = ['guides/install-guides/common_sections.rst', '**manage_clusters/common/deployment/*.rst', From e5416b7a851179d3a90bfc4368577bc3867a128c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0140/1681] Remove trailing spaces in file docs/source/developers/github/change_code.rst --- docs/source/developers/github/change_code.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/developers/github/change_code.rst b/docs/source/developers/github/change_code.rst index e62064a32..dc7e5f807 100644 --- a/docs/source/developers/github/change_code.rst +++ b/docs/source/developers/github/change_code.rst @@ -14,12 +14,12 @@ Checkout and switch to the branch using ``git checkout -b`` :: Changing the code ----------------- -Now you are ready to make changes related to your function in this branch +Now you are ready to make changes related to your function in this branch Multiple Remote Branches ^^^^^^^^^^^^^^^^^^^^^^^^ -It may take days before your pull request is properly reviewed and you want to keep changes out of that branch so in the event that you are asked to fix something, you can push directly to the branch with the active pull request. +It may take days before your pull request is properly reviewed and you want to keep changes out of that branch so in the event that you are asked to fix something, you can push directly to the branch with the active pull request. Creating additional branches will allow you to work on different tasks/enhancements at the same time. You can easily manage your working changes between branches with ``git stash.``. @@ -31,7 +31,7 @@ Once your code is ready.... #. Commit the code to your local branch: :: - $ git add + $ git add $ git commit | git commit -m "" #. Push the changes to your remote branch: :: From c6de0b40d79f6d375cc8a0369ee7953f2efa3823 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0141/1681] Remove trailing spaces in file docs/source/developers/github/create_branches.rst --- .../developers/github/create_branches.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/developers/github/create_branches.rst b/docs/source/developers/github/create_branches.rst index 48227ea9a..a69093e8e 100644 --- a/docs/source/developers/github/create_branches.rst +++ b/docs/source/developers/github/create_branches.rst @@ -6,14 +6,14 @@ Creating Branches Local Branches -------------- -Git branches are very light weight and easy to create. Simply use the ``git branch `` command. +Git branches are very light weight and easy to create. Simply use the ``git branch `` command. Since we are using pull requests to merge changes back to the upstream project, you will need to have your changes committed to a branch on GitHub (calling this a "remote branch") so that GitHub can detect differences and pull requests can be created. Remote Branches --------------- -Reference articles: +Reference articles: * http://www.gitguys.com/topics/adding-and-removing-remote-branches/ @@ -31,7 +31,7 @@ From GitHub * Since we created the branch from the UI, a refresh needs to be done in order to see the new branch. Refresh by fetching from the origin repository: :: $ git fetch origin - Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': + Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': From github.com:whowutwut/xcat-doc * [new branch] DOC_MERGE -> origin/DOC_MERGE @@ -54,25 +54,25 @@ From Command Line (CLI) $ git branch * master - $ git branch skeleton + $ git branch skeleton - $ git branch + $ git branch * master skeleton * Push the newly created branch to origin (on GitHub): :: - $ git push origin skeleton - Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': + $ git push origin skeleton + Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': Total 0 (delta 0), reused 0 (delta 0) To git@github.com:whowutwut/xcat-doc.git * [new branch] skeleton -> skeleton - Verify that the branch is there by looking at the remote branches: :: + Verify that the branch is there by looking at the remote branches: :: $ git branch -r origin/HEAD -> origin/master origin/master - origin/skeleton <=== HERE IT IS + origin/skeleton <=== HERE IT IS upstream/master From 9b5a40008864d66568a2a64bf038a15070fdee2d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0142/1681] Remove trailing spaces in file docs/source/developers/github/delete_branches.rst --- docs/source/developers/github/delete_branches.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/developers/github/delete_branches.rst b/docs/source/developers/github/delete_branches.rst index c4eae7218..4c9872117 100644 --- a/docs/source/developers/github/delete_branches.rst +++ b/docs/source/developers/github/delete_branches.rst @@ -12,7 +12,7 @@ Switch off the branch that you want to delete. Most of the time, switching to ma Delete the remote branch off GitHub: :: $ git push origin --delete mybranch - Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': + Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': To git@github.com:whowutwut/xcat-doc.git - [deleted] mybranch @@ -32,4 +32,4 @@ Sync up GitHub and Local Machine There are times when you delete the branch off your local machine or from GitHub and it's become out of sync, you sync up the list, run the following: :: - git remote prune origin + git remote prune origin From 7f57db46d6d225c1cf4a6c1f28c9f116f85775c8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0143/1681] Remove trailing spaces in file docs/source/developers/github/forks.rst --- docs/source/developers/github/forks.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/developers/github/forks.rst b/docs/source/developers/github/forks.rst index 2807e4009..f8bc90987 100644 --- a/docs/source/developers/github/forks.rst +++ b/docs/source/developers/github/forks.rst @@ -3,9 +3,9 @@ Fork a repository Forking a repository is taking a copy of a GitHub repository and associating it to your own account space so you can make changes to the code base. Since you own this copy, you will have fetch/push access to the repository. -We will first create a fork on the xcat2/xcat-core project so that we can work on functions without affecting the mainline (or *upstream*) code. Additionally, by creating a fork, you are able to generate *pull request* so that the changes can be easily seen and reviewed by other community members. +We will first create a fork on the xcat2/xcat-core project so that we can work on functions without affecting the mainline (or *upstream*) code. Additionally, by creating a fork, you are able to generate *pull request* so that the changes can be easily seen and reviewed by other community members. -* In GitHub UI, find a project that you want to fork and click on the "Fork" icon. +* In GitHub UI, find a project that you want to fork and click on the "Fork" icon. .. image:: github-fork.png @@ -15,13 +15,13 @@ We will first create a fork on the xcat2/xcat-core project so that we can work o ``/xcat-core`` <-- forked copy - ``xcat2/xcat-core`` <-- upstream + ``xcat2/xcat-core`` <-- upstream Clone the forked repository =========================== -* On your development machine, clone the forked repository from **your** account: +* On your development machine, clone the forked repository from **your** account: **Note:** Ensure the clone is from */xcat-core* and **not** *xcat2/xcat-core* :: @@ -29,7 +29,7 @@ Clone the forked repository This now becomes the origin remote repository: :: - $ git remote -v + $ git remote -v origin git@github.com:/xcat-core.git (fetch) origin git@github.com:/xcat-core.git (push) @@ -43,7 +43,7 @@ Configure an ``upstream`` repository View the configured repositories: :: - $ git remote -v + $ git remote -v origin git@github.com:/xcat-core.git (fetch) origin git@github.com:/xcat-core.git (push) upstream git@github.com:xcat2/xcat-core.git (fetch) From 7ef31416a6fcc6a9114d12d64594cfffca5cc887 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0144/1681] Remove trailing spaces in file docs/source/developers/github/index.rst --- docs/source/developers/github/index.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/developers/github/index.rst b/docs/source/developers/github/index.rst index 6e059b700..d4d6885b7 100644 --- a/docs/source/developers/github/index.rst +++ b/docs/source/developers/github/index.rst @@ -2,9 +2,9 @@ GitHub ====== -Developers are encouraged to fork the `xcat2 `_ repositories, make changes, and submit pull requests. This mechanism allows for better collaboration and gives the community a chance to review and provide feedback before the code is pulled into the product. +Developers are encouraged to fork the `xcat2 `_ repositories, make changes, and submit pull requests. This mechanism allows for better collaboration and gives the community a chance to review and provide feedback before the code is pulled into the product. -GitHub provides excellent documentation on `Collaborating `_ and the following is only provided as a quick reference. +GitHub provides excellent documentation on `Collaborating `_ and the following is only provided as a quick reference. Getting Started --------------- @@ -12,7 +12,7 @@ Getting Started .. toctree:: :maxdepth: 2 - forks.rst + forks.rst Changing Code and Pull Requests @@ -21,9 +21,9 @@ Changing Code and Pull Requests .. toctree:: :maxdepth: 2 - syncing_forks.rst - create_branches.rst - change_code.rst + syncing_forks.rst + create_branches.rst + change_code.rst pull_request.rst delete_branches.rst From f9ae06aa8fd9f508d7c26e225a956c57d081eb4a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0145/1681] Remove trailing spaces in file docs/source/developers/github/pull_request.rst --- docs/source/developers/github/pull_request.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/developers/github/pull_request.rst b/docs/source/developers/github/pull_request.rst index 80593db5e..3ebf532ba 100644 --- a/docs/source/developers/github/pull_request.rst +++ b/docs/source/developers/github/pull_request.rst @@ -4,7 +4,7 @@ Pull Requests Creating Pull Requests ---------------------- -Once your changes are ready to be submitted to the xcat team, the easiest way to generate a pull request is from the GitHub UI. +Once your changes are ready to be submitted to the xcat team, the easiest way to generate a pull request is from the GitHub UI. #. Under your project, click on the "branches" link @@ -65,19 +65,19 @@ During the reviewing of your pull request, another pull request may be merged wh $ git push origin -f -If all the conflicts are resolved, the pull request should automatically turn green again and is able to be merged automatically. +If all the conflicts are resolved, the pull request should automatically turn green again and is able to be merged automatically. Reviewing Pull Requests as a Maintainer --------------------------------------- -When you are looking over a pull request, you can merge the changes into your own temporary branch to give the code or changes a try before merging into the parent project. +When you are looking over a pull request, you can merge the changes into your own temporary branch to give the code or changes a try before merging into the parent project. -#. From the merge request, click on the ``command line instructions`` link: +#. From the merge request, click on the ``command line instructions`` link: .. image:: github-merge_command_line.png -#. Then under **Step 1:**, there are instruction for creating a temp branch and pulling the changes from the pull request: +#. Then under **Step 1:**, there are instruction for creating a temp branch and pulling the changes from the pull request: - .. image:: github-merge_step1.png + .. image:: github-merge_step1.png From b59f6f696aa1f5bd8e69ac1db8e14553a473328b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0146/1681] Remove trailing spaces in file docs/source/developers/github/syncing_forks.rst --- docs/source/developers/github/syncing_forks.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/developers/github/syncing_forks.rst b/docs/source/developers/github/syncing_forks.rst index 20b01fa98..364956f1c 100644 --- a/docs/source/developers/github/syncing_forks.rst +++ b/docs/source/developers/github/syncing_forks.rst @@ -8,7 +8,7 @@ Before the Syncing References: https://help.github.com/articles/syncing-a-fork/ -From time to time, your master branch will start to **fall behind** the upstream/master because changes are being pulled into the ``xcat2/xcat-core`` project from other developers. +From time to time, your master branch will start to **fall behind** the upstream/master because changes are being pulled into the ``xcat2/xcat-core`` project from other developers. .. image:: github-behind_master.png @@ -58,7 +58,7 @@ After the Syncing Your fork master branch should now be **even** with ``xcat2/xcat-core`` -.. image:: github-even_with_master.png +.. image:: github-even_with_master.png Unstashing work (optional) From 2002a81708e90960ee32031a16cd9ce1c21b580e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0147/1681] Remove trailing spaces in file docs/source/developers/guides/code/builds.rst --- docs/source/developers/guides/code/builds.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/developers/guides/code/builds.rst b/docs/source/developers/guides/code/builds.rst index 28aba3d02..8ffb9eef9 100644 --- a/docs/source/developers/guides/code/builds.rst +++ b/docs/source/developers/guides/code/builds.rst @@ -7,12 +7,12 @@ xcat-core Clone the xCAT project from `GitHub `_:: cd xcat-core - ./buildcore.sh + ./buildcore.sh xcat-deps --------- -The ``xcat-deps`` package is currently owned and maintained by the core development on our internal servers. Use the packages created at: http://xcat.org/download.html#xcat-dep +The ``xcat-deps`` package is currently owned and maintained by the core development on our internal servers. Use the packages created at: http://xcat.org/download.html#xcat-dep man pages @@ -20,7 +20,7 @@ man pages The xCAT man pages are written in Perl POD files and automatically get built into the xCAT rpms. The content in the .pod files are always the master. -In the past, the man pages were converted into html files and uploaded to SourceForge. In moving to `ReadTheDocs `_ we want to also provide the man pages as references in the documentation. To convert the ``pods`` to ``rst``, we are using The Perl module: `pod2rst `_. +In the past, the man pages were converted into html files and uploaded to SourceForge. In moving to `ReadTheDocs `_ we want to also provide the man pages as references in the documentation. To convert the ``pods`` to ``rst``, we are using The Perl module: `pod2rst `_. The following steps will help configure ``pod2rst`` and be able to generate the changes .rst files to push to GitHub. @@ -32,25 +32,25 @@ The following steps will help configure ``pod2rst`` and be able to generate the #. For each of the above Perl modules: * **[as root]** Extract and build the Perl module :: - + perl Makefile.PL make make install - + * **[as non-root]** Extract and build the Perl module using PREFIX to specify a directory that you have write permission :: - + mkdir ~/perllib perl Makefile.PL PREFIX=~/perllib make make install - + #. Execute the script ``create_man_pages.py`` to generate the .rst files into ``xcat-core/docs`` : * **[as root]** :: - + cd xcat-core ./create_man_pages.py - + * **[as non root]** :: cd xcat-core From 97041f92d4f189712b2659271efa5ee762ee1a60 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0148/1681] Remove trailing spaces in file docs/source/developers/guides/code/code_standard.rst --- .../developers/guides/code/code_standard.rst | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/source/developers/guides/code/code_standard.rst b/docs/source/developers/guides/code/code_standard.rst index c4a896a0e..ccab7f79a 100644 --- a/docs/source/developers/guides/code/code_standard.rst +++ b/docs/source/developers/guides/code/code_standard.rst @@ -20,7 +20,7 @@ How to install ``perltidy`` tool: * **[RHEL]** :: yum install perltidy.noarch - + * **[UBUNTU]** :: apt-get install perltidy @@ -31,15 +31,15 @@ Code Standard Example: :: #! /usr/bin/perl - + # This is a perl program example to demo the recommended # style to write perl code - + use strict; use warnings; - + #-------------------------------------------------------------------------------- - + =head3 subroutine_example Descriptions: This a subroutine to demo how to write perl code @@ -51,46 +51,46 @@ Code Standard Example: 0 - success 0 - fail =cut - + #-------------------------------------------------------------------------------- sub subroutine_example { my ($param1, $param2, $param3) = @_; - + print "In the subroutine subroutine_example.\n"; - + return 0; } - - + + # Declare variables my $a_local_scale; my @a_local_array; my %a_local_hash; - + $a_local_scale = 1; - + @a_local_array = ("a", "b", "c"); - + %a_local_hash = ( "v1" => 1, "v2" => 2, "v3" => 3, ); - + # Demo how to check the key of hash if (%a_local_hash and defined($a_local_hash{v1}) and defined($a_local_hash{v2}) and defined($a_local_hash{v3})) { - + # Calculate the sum of values my $sum_of_values = $a_local_hash{v1} + $a_local_hash{v2} + $a_local_hash{v3}; - + print "The sum of values: $sum_of_values.\n"; } - + # Demo how to check whether the array is empty if (@a_local_array) { print "Has element in array: " . join(',', @a_local_array) . "\n"; @@ -102,8 +102,8 @@ Code Standard Example: # None of above print "Get into the default path.\n"; } - + # Call the subroutine subroutine_example() subroutine_example($a_local_scale, \@a_local_array, %a_local_hash); - + exit 0; From f632683d0dbc446dcb23c31415f0249cfccd1f9e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0149/1681] Remove trailing spaces in file docs/source/developers/guides/code/index.rst --- docs/source/developers/guides/code/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/developers/guides/code/index.rst b/docs/source/developers/guides/code/index.rst index cfd9d43ad..f98b47657 100644 --- a/docs/source/developers/guides/code/index.rst +++ b/docs/source/developers/guides/code/index.rst @@ -4,7 +4,7 @@ Code Development .. toctree:: :maxdepth: 2 - code_standard.rst - builds.rst + code_standard.rst + builds.rst debug.rst tips.rst From ad29f0403e1868fa99807ab7da0f680cd2b2f5e7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0150/1681] Remove trailing spaces in file docs/source/developers/guides/docs/doc_guidelines.rst --- .../developers/guides/docs/doc_guidelines.rst | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/source/developers/guides/docs/doc_guidelines.rst b/docs/source/developers/guides/docs/doc_guidelines.rst index 4e13e7b1c..ce121d4f5 100644 --- a/docs/source/developers/guides/docs/doc_guidelines.rst +++ b/docs/source/developers/guides/docs/doc_guidelines.rst @@ -12,13 +12,13 @@ xCAT doc page may have 4 levels of title at most: :: The First Title =============== - + The Second Title ---------------- - + The Third Title ``````````````` - + The Forth Title ''''''''''''''' @@ -131,9 +131,9 @@ Add links to refer other web page is a very common way in writing document, it' :doc:`support list <../overview/support_list>` -.. +.. - ``Usage:`` When you want to link to another whole page but don't want to make a ``Customized Link Target`` in that source page, you can use the file path to link it directly. + ``Usage:`` When you want to link to another whole page but don't want to make a ``Customized Link Target`` in that source page, you can use the file path to link it directly. * **Add an External Link** @@ -223,16 +223,16 @@ Add a Table Add a table in the doc: -+------------+------------+-----------+ -| Header 1 | Header 2 | Header 3 | -+============+============+===========+ -| body row 1 | column 2 | column 3 | -+------------+------------+-----------+ -| body row 2 | Cells may span columns.| -+------------+------------+-----------+ -| body row 3 | Cells may | - Cells | -+------------+ span rows. | - contain | -| body row 4 | | - blocks. | ++------------+------------+-----------+ +| Header 1 | Header 2 | Header 3 | ++============+============+===========+ +| body row 1 | column 2 | column 3 | ++------------+------------+-----------+ +| body row 2 | Cells may span columns.| ++------------+------------+-----------+ +| body row 3 | Cells may | - Cells | ++------------+ span rows. | - contain | +| body row 4 | | - blocks. | +------------+------------+-----------+ :: From 8f01b28507368a530c8fc5542f42b957f228007c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0151/1681] Remove trailing spaces in file docs/source/developers/guides/index.rst --- docs/source/developers/guides/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/developers/guides/index.rst b/docs/source/developers/guides/index.rst index a30897263..dc6b8dd95 100644 --- a/docs/source/developers/guides/index.rst +++ b/docs/source/developers/guides/index.rst @@ -3,6 +3,6 @@ Guides .. toctree:: :maxdepth: 2 - + docs/index.rst code/index.rst From 28bf15a10f7224c2935bfa3f7a55b8576ce8aef1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0152/1681] Remove trailing spaces in file docs/source/developers/license/contributors.rst --- docs/source/developers/license/contributors.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/developers/license/contributors.rst b/docs/source/developers/license/contributors.rst index de0d03c45..363e98fcc 100644 --- a/docs/source/developers/license/contributors.rst +++ b/docs/source/developers/license/contributors.rst @@ -2,7 +2,7 @@ Contributors ------------ * Sign our Contributor License Agreement (CLA). You can find the :download:`CLA here ` - + * If you are contributing on behalf of your employer, we'll need a signed copy of our Corporate Contributor License Agreement (CCLA). You can find the :download:`CCLA here `. * Fork the repo, make your changes, and open pull requests! From 2d0ed7981dee06b157715fbc73530e3018faef4c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0153/1681] Remove trailing spaces in file docs/source/developers/license/index.rst --- docs/source/developers/license/index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/developers/license/index.rst b/docs/source/developers/license/index.rst index 3725a1d9c..1d8189255 100644 --- a/docs/source/developers/license/index.rst +++ b/docs/source/developers/license/index.rst @@ -1,15 +1,15 @@ Contributor and Maintainer Agreements ===================================== -We welcome developers willing to contribute to the xCAT project to help make it better. +We welcome developers willing to contribute to the xCAT project to help make it better. -Follow the guidelines below. +Follow the guidelines below. .. toctree:: :maxdepth: 1 contributors.rst - maintainers.rst + maintainers.rst xCAT is licensed under the `Eclipse Public License `_. From bad0b7757495adafce67b57a3ff784b4f738c44f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0154/1681] Remove trailing spaces in file docs/source/developers/license/maintainers.rst --- docs/source/developers/license/maintainers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/developers/license/maintainers.rst b/docs/source/developers/license/maintainers.rst index 379ed919f..89c987624 100644 --- a/docs/source/developers/license/maintainers.rst +++ b/docs/source/developers/license/maintainers.rst @@ -7,7 +7,7 @@ If you are an experienced xCAT user and plan to contribute to the xCAT code regu * Additional information can be found in our :ref:`maintainers guide ` below: -.. _xcat-maintainer-guide-label: +.. _xcat-maintainer-guide-label: Maintainers Guide ----------------- From 78d9120b60395da606e33fb27369f5d4ff75e2a6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0155/1681] Remove trailing spaces in file docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst --- ...orporate_contributor_license_agreement.rst | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst b/docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst index 2e0ec40c6..b1790d4f6 100644 --- a/docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst +++ b/docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst @@ -3,9 +3,9 @@ The xCAT Community Software Grant and Corporate Contributor License Agreement ("Agreement") ------------------------------------------------------------------------------------------- -In order to clarify the intellectual property license granted with Contributions from any person or entity made for the benefit of the xCAT Community, a Contributor License Agreement (CLA) must be on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the xCAT Community and its users; it does not change your rights to use your own Contributions for any other purpose. +In order to clarify the intellectual property license granted with Contributions from any person or entity made for the benefit of the xCAT Community, a Contributor License Agreement (CLA) must be on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the xCAT Community and its users; it does not change your rights to use your own Contributions for any other purpose. -This version of the Agreement allows an entity (the "Corporation") to submit Contributions to the xCAT Community, to authorize Contributions submitted by its designated employees to the xCAT Community, and to grant copyright and patent licenses thereto. +This version of the Agreement allows an entity (the "Corporation") to submit Contributions to the xCAT Community, to authorize Contributions submitted by its designated employees to the xCAT Community, and to grant copyright and patent licenses thereto. If you have not already done so, complete and sign, then scan and email a PDF file of this Agreement to: **xcat-legal@lists.sourceforge.net**. Read this document carefully before signing and keep a copy for your records. @@ -19,82 +19,82 @@ If you have not already done so, complete and sign, then scan and email a PDF fi Point of Contact: ___________________________________________________ - + E-Mail: _____________________________________________________________ Telephone: __________________________ Fax: __________________________ - -You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the xCAT Community. Except for the license granted herein to the xCAT Community, You reserve all right, title, and interest in and to Your Contributions. - -1\. Definitions. +You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the xCAT Community. Except for the license granted herein to the xCAT Community, You reserve all right, title, and interest in and to Your Contributions. -"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. -"Contribution" shall mean the code, documentation or other original works of authorship expressly identified in Schedule B, as well as any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the xCAT Community for inclusion in, or documentation of, any of the products owned or managed by members of the xCAT Community (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to members of the xCAT Community, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the xCAT Community for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." +1\. Definitions. -“xCAT Community” shall mean International Business Machines Corporation and other users of xCAT. Accepted Contributions will be made available to the xCAT Community at large through sourceforge.net or other open source community. +"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -2\. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. +"Contribution" shall mean the code, documentation or other original works of authorship expressly identified in Schedule B, as well as any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the xCAT Community for inclusion in, or documentation of, any of the products owned or managed by members of the xCAT Community (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to members of the xCAT Community, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the xCAT Community for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." - -3\. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) were submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. +“xCAT Community” shall mean International Business Machines Corporation and other users of xCAT. Accepted Contributions will be made available to the xCAT Community at large through sourceforge.net or other open source community. - -4\. You represent that You are legally entitled to grant the above license. You represent further that each employee of the Corporation designated on Schedule A below (or in a subsequent written modification to that Schedule) is authorized to submit Contributions on behalf of the Corporation. - -5\. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). +2\. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. + + +3\. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) were submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. + + +4\. You represent that You are legally entitled to grant the above license. You represent further that each employee of the Corporation designated on Schedule A below (or in a subsequent written modification to that Schedule) is authorized to submit Contributions on behalf of the Corporation. + + +5\. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). + + +6\. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. + + +7\. Should You wish to submit work that is not Your original creation, You may submit it to the xCAT Community separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]". + + +8\. It is Your responsibility to notify the xCAT Community (xcat-legal@lists.sourceforge.net) when any change is required to the list of designated employees authorized to submit Contributions on behalf of the Corporation, or to the Corporation's Point of Contact with the xCAT Community. + + +9\. You agree that your signature, as received by e-mail, will constitute an “original” signature of this Agreement. - -6\. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. - -7\. Should You wish to submit work that is not Your original creation, You may submit it to the xCAT Community separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]". - -8\. It is Your responsibility to notify the xCAT Community (xcat-legal@lists.sourceforge.net) when any change is required to the list of designated employees authorized to submit Contributions on behalf of the Corporation, or to the Corporation's Point of Contact with the xCAT Community. - -9\. You agree that your signature, as received by e-mail, will constitute an “original” signature of this Agreement. - - - - Please sign: __________________________________ Date: _______________ - - + + Title: __________________________________ - - + + Corporation: __________________________________ - - - - -Schedule A - - -[Initial list of designated employees. NB: authorization is not tied to particular Contributions.] - - - -Schedule B +Schedule A - -[Identification of optional concurrent software grant. Would be left blank or omitted if there is no concurrent software grant.] + +[Initial list of designated employees. NB: authorization is not tied to particular Contributions.] + + + + + + + +Schedule B + + +[Identification of optional concurrent software grant. Would be left blank or omitted if there is no concurrent software grant.] From 1a9a2ddeb8ac2da4d09656df2f8cbc6ada8144c5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0156/1681] Remove trailing spaces in file docs/source/developers/license/xcat_individual_contributor_license_agreement.rst --- ...dividual_contributor_license_agreement.rst | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/docs/source/developers/license/xcat_individual_contributor_license_agreement.rst b/docs/source/developers/license/xcat_individual_contributor_license_agreement.rst index d85e87a2f..7592a4e17 100644 --- a/docs/source/developers/license/xcat_individual_contributor_license_agreement.rst +++ b/docs/source/developers/license/xcat_individual_contributor_license_agreement.rst @@ -2,8 +2,8 @@ The xCAT Community Individual Contributor License Agreement ("Agreement") ========================================================================= - -In order to clarify the intellectual property license granted with Contributions from any person or entity made for the benefit of the xCAT Community, a Contributor License Agreement ("CLA") must be on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the xCAT Community and its users; it does not change your rights to use your own Contributions for any other purpose. + +In order to clarify the intellectual property license granted with Contributions from any person or entity made for the benefit of the xCAT Community, a Contributor License Agreement ("CLA") must be on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the xCAT Community and its users; it does not change your rights to use your own Contributions for any other purpose. If you have not already done so, complete and sign, then scan and email a PDF file of this Agreement to: **xcat-legal@lists.sourceforge.net**. @@ -19,52 +19,52 @@ If you have not already done so, complete and sign, then scan and email a PDF fi __________________________________________ Country: ______________________ - - -You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the xCAT Community. Except for the license granted herein to the xCAT Community, You reserve all right, title, and interest in and to Your Contributions. - -1\. Definitions. -"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. +You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the xCAT Community. Except for the license granted herein to the xCAT Community, You reserve all right, title, and interest in and to Your Contributions. -"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the xCAT Community for inclusion in, or documentation of, any of the products owned or managed by members of the xCAT Community (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to members of the xCAT Community, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the xCAT Community for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." - -“xCAT Community” shall mean International Business Machines Corporation and other users of xCAT. Accepted Contributions will be made available to the xCAT Community at large through sourceforge.net or other open source community. +1\. Definitions. - -2\. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. +"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -3\. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. +"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the xCAT Community for inclusion in, or documentation of, any of the products owned or managed by members of the xCAT Community (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to members of the xCAT Community, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the xCAT Community for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." - -4\. You represent that You are legally entitled to grant the above license. If Your employer(s) has rights to intellectual property that You create that includes Your Contributions, You represent -that You have received permission to make Contributions on behalf of that employer, that Your employer has waived such rights for Your Contributions to the xCAT Community, or that Your employer has executed a separate Corporate CLA with the xCAT Community. +“xCAT Community” shall mean International Business Machines Corporation and other users of xCAT. Accepted Contributions will be made available to the xCAT Community at large through sourceforge.net or other open source community. - -5\. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which You are personally aware and which are associated with any part of Your Contributions. - -6\. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. +2\. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. + + +3\. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. + + +4\. You represent that You are legally entitled to grant the above license. If Your employer(s) has rights to intellectual property that You create that includes Your Contributions, You represent + +that You have received permission to make Contributions on behalf of that employer, that Your employer has waived such rights for Your Contributions to the xCAT Community, or that Your employer has executed a separate Corporate CLA with the xCAT Community. + + +5\. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which You are personally aware and which are associated with any part of Your Contributions. + + +6\. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. + + +7\. Should You wish to submit work that is not Your original creation, You may submit it to the xCAT Community separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as + +"Submitted on behalf of a third-party: [named here]". + + +8\. You agree to notify the xCAT Community (xcat-legal@lists.sourceforge.net) of any facts or circumstances of which You become aware that would make these representations inaccurate in any respect. + + +9\. You agree that your signature, as received by e-mail, will constitute an “original” signature of this Agreement. - -7\. Should You wish to submit work that is not Your original creation, You may submit it to the xCAT Community separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as -"Submitted on behalf of a third-party: [named here]". - -8\. You agree to notify the xCAT Community (xcat-legal@lists.sourceforge.net) of any facts or circumstances of which You become aware that would make these representations inaccurate in any respect. - -9\. You agree that your signature, as received by e-mail, will constitute an “original” signature of this Agreement. - - - - Please sign: __________________________________ Date: ________________ - + From a82f4ed6ae2aca853094937f484cf521126169ce Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0157/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst --- .../basic_concepts/global_cfg/index.rst | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst b/docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst index 1ad7a72ff..5101f8cf0 100644 --- a/docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst +++ b/docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst @@ -1,7 +1,7 @@ Global Configuration ==================== -All the xCAT global configurations are stored in site table, xCAT Admin can adjust the configuration by modifying the site attribute with ``tabedit``. +All the xCAT global configurations are stored in site table, xCAT Admin can adjust the configuration by modifying the site attribute with ``tabedit``. This section only presents some key global configurations, for the complete reference on the xCAT global configurations, refer to the ``tabdump -d site``. @@ -9,29 +9,29 @@ This section only presents some key global configurations, for the complete refe Database Attributes ------------------- -* excludenodes: +* excludenodes: A set of comma separated nodes and/or groups that would automatically be subtracted from any noderange, it can be used for excluding some failed nodes from any xCAT command. See :doc:`noderange ` for details on supported formats. -* nodestatus: +* nodestatus: If set to ``n``, the ``nodelist.status`` column will not be updated during the node deployment, node discovery and power operations. The default is to update. DHCP Attributes --------------- -* dhcpinterfaces: +* dhcpinterfaces: The network interfaces DHCP should listen on. If it is the same for all nodes, use a simple comma-separated list of NICs. To specify different NICs for different nodes :: xcatmn|eth1,eth2;service|bond0. In this example xcatmn is the name of the xCAT MN, and DHCP there should listen on eth1 and eth2. On all of the nodes in group ``service`` DHCP should listen on the bond0 nic. -* dhcplease: +* dhcplease: The lease time for the dhcp client. The default value is 43200. -* managedaddressmode: - The mode of networking configuration during node provision. +* managedaddressmode: + The mode of networking configuration during node provision. If set to ``static``, the network configuration will be configured in static mode based on the node and network definition on MN. If set to ``dhcp``, the network will be configured with dhcp protocol. The default is ``dhcp``. @@ -40,21 +40,21 @@ DHCP Attributes DNS Attributes -------------- -* domain: +* domain: The DNS domain name used for the cluster. -* forwarders: +* forwarders: The DNS servers at your site that can provide names outside of the cluster. The ``makedns`` command will configure the DNS on the management node to forward requests it does not know to these servers. **Note** that the DNS servers on the service nodes will ignore this value and always be configured to forward requests to the management node. -* master: +* master: The hostname of the xCAT management node, as known by the nodes. -* nameservers: +* nameservers: A comma delimited list of DNS servers that each node in the cluster should use. This value will end up in the nameserver settings of the ``/etc/resolv.conf`` on each node. It is common (but not required) to set this attribute value to the IP addr of the xCAT management node, if you have set up the DNS on the management node by running ``makedns``. In a hierarchical cluster, you can also set this attribute to ```` to mean the DNS server for each node should be the node that is managing it (either its service node or the management node). -* dnsinterfaces: +* dnsinterfaces: The network interfaces DNS server should listen on. If it is the same for all nodes, use a simple comma-separated list of NICs. To specify different NICs for different nodes :: xcatmn|eth1,eth2;service|bond0. @@ -67,18 +67,18 @@ DNS Attributes Install/Deployment Attributes ----------------------------- -* installdir: +* installdir: The local directory name used to hold the node deployment packages. -* runbootscripts: - If set to ``yes`` the scripts listed in the postbootscripts attribute in the osimage and postscripts tables will be run during each reboot of stateful (diskful) nodes. This attribute has no effect on stateless nodes. Run the following command after you change the value of this attribute :: +* runbootscripts: + If set to ``yes`` the scripts listed in the postbootscripts attribute in the osimage and postscripts tables will be run during each reboot of stateful (diskful) nodes. This attribute has no effect on stateless nodes. Run the following command after you change the value of this attribute :: updatenode -P setuppostbootscripts -* precreatemypostscripts: +* precreatemypostscripts: (``yes/1`` or ``no/0``). Default is ``no``. If yes, it will instruct xCAT at ``nodeset`` and ``updatenode`` time to query the db once for all of the nodes passed into the cmd and create the mypostscript file for each node, and put them in a directory of tftpdir(such as: /tftpboot). If no, it will not generate the mypostscript file in the ``tftpdir``. -* xcatdebugmode: +* xcatdebugmode: the xCAT debug level. xCAT provides a batch of techniques to help user debug problems while using xCAT, especially on OS provision, such as collecting logs of the whole installation process and accessing the installing system via ssh, etc. These techniques will be enabled according to different xCAT debug levels specified by 'xcatdebugmode', currently supported values: :: '0': disable debug mode @@ -91,49 +91,49 @@ Install/Deployment Attributes Remoteshell Attributes ---------------------- -* sshbetweennodes: +* sshbetweennodes: Comma separated list of groups of compute nodes to enable passwordless root ssh during install, or ``xdsh -K``. Default is ``ALLGROUPS``. Set to ``NOGROUPS`` if you do not wish to enable it for any group of compute nodes. If using the ``zone`` table, this attribute in not used. Services Attributes ------------------- -* consoleondemand: +* consoleondemand: When set to ``yes``, conserver connects and creates the console output only when the user opens the console. Default is ``no`` on Linux, ``yes`` on AIX. -* timezone: +* timezone: The timezone for all the nodes in the cluster(e.g. ``America/New_York``). -* tftpdir: +* tftpdir: tftp directory path. Default is /tftpboot. -* tftpflags: +* tftpflags: The flags used to start tftpd. Default is ``-v -l -s /tftpboot -m /etc/tftpmapfile4xcat.conf`` if ``tftplfags`` is not set. Virtualization Attributes -------------------------- -* persistkvmguests: +* persistkvmguests: Keep the kvm definition on the kvm hypervisor when you power off the kvm guest node. This is useful for you to manually change the kvm xml definition file in ``virsh`` for debugging. Set anything means ``enable``. xCAT Daemon attributes ---------------------- -* xcatdport: +* xcatdport: The port used by xcatd daemon for client/server communication. -* xcatiport: +* xcatiport: The port used by xcatd to receive installation status updates from nodes. -* xcatlport: +* xcatlport: The port used by xcatd command log writer process to collect command output. -* xcatsslversion: +* xcatsslversion: The ssl version by xcatd. Default is ``SSLv3``. -* xcatsslciphers: +* xcatsslciphers: The ssl cipher by xcatd. Default is ``3DES``. From 7684473d9e577a8eeccf7e4388d705c554d808a8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0158/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst --- .../admin-guides/basic_concepts/network_planning/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst b/docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst index f88967131..c88bfaa59 100644 --- a/docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst +++ b/docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst @@ -46,7 +46,7 @@ For a cluster, several networks are necessary to enable the cluster management a From the system management perspective, the **Management network** and **Service network** are necessary to perform the hardware control and OS deployment. -**xCAT Network Planning for a New Cluster:** +**xCAT Network Planning for a New Cluster:** .. toctree:: :maxdepth: 2 From ff8270eee006beefb718a5ecdfef6833f6c5ab8e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0159/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst --- .../basic_concepts/network_planning/xcat_net_planning.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst b/docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst index 598173d11..8f1bd4ee5 100644 --- a/docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst +++ b/docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst @@ -13,7 +13,7 @@ For very large clusters, xCAT has the ability to distribute the management opera * **[Linux]:** * Stateful or Stateless: 500 nodes * Statelite: 250 nodes -* **[AIX]:** +* **[AIX]:** 150 nodes These numbers can be higher (approximately double) if you are willing to "stage" the more intensive operations, like node deployment. @@ -60,4 +60,4 @@ If you still have reasons to pursue HA service nodes: * For **[AIX]** , see [TODO XCAT_HASN_with_GPFS] * For **[Linux]** , a couple prototype clusters have been set up in which the NFS service on the SNs is provided by GPFS CNFS (Clustered NFS). A howto is being written to describe the setup as an example. Stay tuned. - + From bd0135dc75c483a457b96a0b05a9112e17653388 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0160/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/node_type.rst --- .../guides/admin-guides/basic_concepts/node_type.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/node_type.rst b/docs/source/guides/admin-guides/basic_concepts/node_type.rst index 235286218..78ba05e2f 100644 --- a/docs/source/guides/admin-guides/basic_concepts/node_type.rst +++ b/docs/source/guides/admin-guides/basic_concepts/node_type.rst @@ -13,24 +13,24 @@ Traditional cluster with OS on each node's local disk. * Main advantage This approach is familiar to most admins, and they typically have many years of experience with it. - + * Main disadvantage Admin has to manage all of the individual OS copies, has to face the failure of hard disk. For certain application which requires all the compute nodes have exactly same state, this is also changeable for admin. - + Stateless (diskless) -------------------- Nodes boot from a RAMdisk OS image downloaded from the xCAT mgmt node or service node at boot time. -* Main advantage +* Main advantage Central management of OS image, but nodes are not tethered to the mgmt node or service node it booted from. Whenever you need a new OS for the node, just reboot the node. - + * Main disadvantage - You can't use a large image with many different applications in the image for varied users, because it uses too much of the node's memory to store the ramdisk. (To mitigate this disadvantage, you can put your large application binaries and libraries in shared storage to reduce the ramdisk size. This requires some manual configuration of the image). + You can't use a large image with many different applications in the image for varied users, because it uses too much of the node's memory to store the ramdisk. (To mitigate this disadvantage, you can put your large application binaries and libraries in shared storage to reduce the ramdisk size. This requires some manual configuration of the image). Each node can also have a local "scratch" disk for ``swap``, ``/tmp``, ``/var``, ``log`` files, dumps, etc. The purpose of the scratch disk is to provide a location for files that are written to by the node that can become quite large or for files that you don't want to disappear when the node reboots. There should be nothing put on the scratch disk that represents the node's "state", so that if the disk fails you can simply replace it and reboot the node. A scratch disk would typically be used for situations like: job scheduling preemption is required (which needs a lot of swap space), the applications write large temp files, or you want to keep gpfs log or trace files persistently. (As a partial alternative to using the scratch disk, customers can choose to put ``/tmp`` ``/var/tmp``, and log files (except GPFS logs files) in GPFS, but must be willing to accept the dependency on GPFS). This can be done by enabling the 'localdisk' support. For the details, refer to the section [TODO Enabling the localdisk Option]. From 9e8bd38e5d88c637ac75d4362e51165273fe6abf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0161/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst --- .../admin-guides/basic_concepts/xcat_db/index.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst index b6351d6ca..3610cbf92 100644 --- a/docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst +++ b/docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst @@ -9,7 +9,7 @@ You can run ``tabdump`` command to get all the xCAT database tables. Or run ``ta $ tabdump $ tabdump site - $ tabdump -d site + $ tabdump -d site $ man site For a complete reference, see the man page for xcatdb: ``man xcatdb``. @@ -22,7 +22,7 @@ For a complete reference, see the man page for xcatdb: ``man xcatdb``. * **policy table** - Controls who has authority to run specific xCAT operations. It is the Access Control List (ACL) in xCAT. + Controls who has authority to run specific xCAT operations. It is the Access Control List (ACL) in xCAT. * **passwd table** @@ -34,7 +34,7 @@ For a complete reference, see the man page for xcatdb: ``man xcatdb``. You can manipulate the networks through ``*def command`` against the **network object**. :: - $ lsdef -t network + $ lsdef -t network * **...** @@ -66,5 +66,5 @@ xCAT offers 5 commands to manipulate the database tables: .. toctree:: :maxdepth: 2 - - regexp_db.rst + + regexp_db.rst From 6ca9fa2c65aa63676276aa5b36b4c83cd9115b97 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0162/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst --- .../admin-guides/basic_concepts/xcat_db/regexp_db.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst index a39bf7c9d..d1ff05af1 100644 --- a/docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst +++ b/docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst @@ -31,7 +31,7 @@ In this example, the regular expression in the ``ip`` attribute uses ``|`` to se A more involved example is with the ``vm`` table. If your kvm nodes have node names c01f01x01v01, c01f02x03v04, etc., and the kvm host names are c01f01x01, c01f02x03, etc., then you might have an ``vm`` table like :: #node,mgr,host,migrationdest,storage,storagemodel,storagecache,storageformat,cfgstore,memory,cpus,nics,nicmodel,bootorder,clockoffset,virtflags,master,vncport,textconsole,powerstate,beacon,datacenter,cluster,guestostype,othersettings,physlots,vidmodel,vidproto,vidpassword,comments,disable - "kvms",,"|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|c($1)f($2)x($3)|",,"|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|dir:///install/vms/vm($4+0)|",,,,,"3072","2","virbr2","virtio",,,,,,,,,,,,,,,,,, + "kvms",,"|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|c($1)f($2)x($3)|",,"|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|dir:///install/vms/vm($4+0)|",,,,,"3072","2","virbr2","virtio",,,,,,,,,,,,,,,,,, Before you panic, let me explain each column: @@ -72,7 +72,7 @@ See `perlre `_ for more inf Easy Regular expressions ------------------------ -As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. +As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. For example: @@ -149,7 +149,7 @@ xCAT provides several functions that can simplify regular expressions. \ **ipadd** Add to an IP address\ Usage: ``ipadd(octet1, octet2, octet3, octet4, toadd, skipstart, skipend)`` - This function is useful when you need to cross octets. Optionally skip addresses at the start and end of octets (like .0 or .255 - technically those are valid IP addresses, but sometimes software makes poor assumptions about which broadcast and gateway addresses). + This function is useful when you need to cross octets. Optionally skip addresses at the start and end of octets (like .0 or .255 - technically those are valid IP addresses, but sometimes software makes poor assumptions about which broadcast and gateway addresses). Verify your regular expression From 0d38a4958e64422d0a19f48bb9d69bbc05b42d57 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0163/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst --- .../basic_concepts/xcat_object/index.rst | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst index 7c11a9e0a..fa007fbd2 100644 --- a/docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst +++ b/docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst @@ -14,25 +14,25 @@ You can get the detail description of each object by ``man `` e.g. * **node Object** - The **node** is the most important object in xCAT. Any physical server, virtual machine or SP (Service Processor for Hardware Control) can be defined as a node object. + The **node** is the most important object in xCAT. Any physical server, virtual machine or SP (Service Processor for Hardware Control) can be defined as a node object. For example, I have a physical server which has the following attributes: :: - groups: all,x86_64 + groups: all,x86_64 The groups that this node belongs to. - arch: x86_64 + arch: x86_64 The architecture of the server is x86_64. - bmc: 10.4.14.254 + bmc: 10.4.14.254 The IP of BMC which will be used for hardware control. - bmcusername: ADMIN + bmcusername: ADMIN The username of bmc. bmcpassword: admin The password of bmc. mac: 6C:AE:8B:1B:E8:52 - The mac address of the ethernet adapter that will be used to + The mac address of the ethernet adapter that will be used to deploy OS for the node. mgt: ipmi - The management method which will be used to manage the node. + The management method which will be used to manage the node. This node will use ipmi protocol. netboot: xnba The network bootloader that will be used to deploy OS for the node. @@ -41,8 +41,8 @@ You can get the detail description of each object by ``man `` e.g. I want to name the node to be **cn1** (Compute Node #1) in xCAT. Then I define this node in xCAT with following command: :: - $mkdef -t node cn1 groups=all,x86_64 arch=x86_64 bmc=10.4.14.254 - bmcusername=ADMIN bmcpassword=admin mac=6C:AE:8B:1B:E8:52 + $mkdef -t node cn1 groups=all,x86_64 arch=x86_64 bmc=10.4.14.254 + bmcusername=ADMIN bmcpassword=admin mac=6C:AE:8B:1B:E8:52 mgt=ipmi netboot=xnba provmethod=rhels7.1-x86_64-install-compute After the define, I can use ``lsdef`` command to display the defined node: :: @@ -131,19 +131,19 @@ You can get the detail description of each object by ``man `` e.g. Display the detail attributes of one **osimage** named **rhels7.1-x86_64-install-compute**: :: - $ lsdef -t osimage rhels7.1-x86_64-install-compute - Object name: rhels7.1-x86_64-install-compute - imagetype=linux - osarch=x86_64 - osdistroname=rhels7.1-x86_64 - osname=Linux - osvers=rhels7.1 + $ lsdef -t osimage rhels7.1-x86_64-install-compute + Object name: rhels7.1-x86_64-install-compute + imagetype=linux + osarch=x86_64 + osdistroname=rhels7.1-x86_64 + osname=Linux + osvers=rhels7.1 otherpkgdir=/install/post/otherpkgs/rhels7.1/x86_64 - pkgdir=/install/rhels7.1/x86_64 + pkgdir=/install/rhels7.1/x86_64 pkglist=/opt/xcat/share/xcat/install/rh/compute.rhels7.pkglist - profile=compute - provmethod=install - synclists=/root/syncfiles.list + profile=compute + provmethod=install + synclists=/root/syncfiles.list template=/opt/xcat/share/xcat/install/rh/compute.rhels7.tmpl This **osimage** represents a **Linux** **rhels7.1** Operating System. The package repository is in **/install/rhels7.1/x86_64** and the packages which will be installed is listed in the file **/opt/xcat/share/xcat/install/rh/compute.rhels7.pkglist** ... @@ -161,7 +161,7 @@ You can get the detail description of each object by ``man `` e.g. * ``mkdef`` : create object definitions * ``chdef`` : modify object definitions * ``lsdef`` : list object definitions - * ``rmdef`` : remove object definitions + * ``rmdef`` : remove object definitions To get the detail usage of the commands, refer to the man page. e.g. ``man mkdef`` From 00fa2fd08830d291649dba584580361e199388aa Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0164/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst --- .../basic_concepts/xcat_object/node.rst | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst index c94c576a2..ce02b697e 100644 --- a/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst +++ b/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst @@ -4,54 +4,54 @@ node Description ----------- -The definition of physical units in the cluster, such as lpar, virtual machine, frame, cec, hmc, switch. +The definition of physical units in the cluster, such as lpar, virtual machine, frame, cec, hmc, switch. Key Attributes -------------- -* os: +* os: The operating system deployed on this node. Valid values: AIX, rhels*, rhelc*, rhas*, centos*, SL*, fedora*, sles* (where * is the version #) -* arch: +* arch: The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64. * groups: Usually, there are a set of nodes with some attributes in common, xCAT admin can define a node group containing these nodes, so that the management task can be issued against the group instead of individual nodes. A node can be a member of different groups, so the value of this attributes is a comma-delimited list of groups. At least one group is required to create a node. The new created group names should not be prefixed with "__" as this token has been preserved as the internal group name. * mgt: - The method to do general hardware management of the node. This attribute can be determined by the machine type of the node. Valid values: ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm. + The method to do general hardware management of the node. This attribute can be determined by the machine type of the node. Valid values: ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm. -* mac: +* mac: The mac address of the network card on the node, which is connected with the installation server and can be used as the network installation device. - -* ip: + +* ip: The IP address of the node. -* netboot: +* netboot: The type of network boot method for this node, determined by the OS to provision, the architecture and machine type of the node. Valid values: - +--------------------------+----------------------+-----------------------------------+ + +--------------------------+----------------------+-----------------------------------+ | Arch and Machine Type | OS | valid netboot options | +==========================+======================+===================================+ | x86, x86_64 | ALL | pxe, xnba | +--------------------------+----------------------+-----------------------------------+ | ppc64 | <=rhel6, <=sles11.3 | yaboot | - +--------------------------+----------------------+-----------------------------------+ + +--------------------------+----------------------+-----------------------------------+ | ppc64 | >=rhels7, >=sles11.4 | grub2,grub2-http,grub2-tftp | - +--------------------------+----------------------+-----------------------------------+ + +--------------------------+----------------------+-----------------------------------+ | ppc64le NonVirtualize | ALL | petitboot | +--------------------------+----------------------+-----------------------------------+ | ppc64le PowerKVM Guest | ALL | grub2,grub2-http,grub2-tftp | +-------------------------------------------------+-----------------------------------+ - -* postscripts: - Comma separated list of scripts, that should be run on this node after diskful installation or diskless boot, finish some system configuration and maintenance work. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. -* postbootscripts: - Comma separated list of scripts, that should be run on this node as a SysV init job on the 1st reboot after installation or diskless boot, finish some system configuration and maintenance work. +* postscripts: + Comma separated list of scripts, that should be run on this node after diskful installation or diskless boot, finish some system configuration and maintenance work. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. + +* postbootscripts: + Comma separated list of scripts, that should be run on this node as a SysV init job on the 1st reboot after installation or diskless boot, finish some system configuration and maintenance work. * provmethod: - The provisioning method for node deployment. Usually, this attribute is an ``osimage`` object name. + The provisioning method for node deployment. Usually, this attribute is an ``osimage`` object name. * status: The current status of the node, which is updated by xCAT. This value can be used to monitor the provision process. Valid values: powering-off, installing, booting/netbooting, booted. @@ -59,7 +59,7 @@ Key Attributes Use Cases --------- -* Case 1: +* Case 1: There is a ppc64le node named "cn1", the mac of installation NIC is "ca:68:d3:ae:db:03", the ip assigned is "10.0.0.100", the network boot method is "grub2", place it into the group "all". Use the following command :: mkdef -t node -o cn1 arch=ppc64 mac="ca:68:d3:ae:db:03" ip="10.0.0.100" netboot="grub2" groups="all" @@ -79,13 +79,13 @@ Use Cases lsdef -t node -o cn1 -i mac -* Case 4: +* Case 4: There is a node definition "cn1", modify its network boot method to "yaboot" :: chdef -t node -o cn1 netboot=yaboot - + * Case 5: - There is a node definition "cn1", create a node definition "cn2" with the same attributes with "cn1", except the mac addr(ca:68:d3:ae:db:04) and ip address(10.0.0.101) + There is a node definition "cn1", create a node definition "cn2" with the same attributes with "cn1", except the mac addr(ca:68:d3:ae:db:04) and ip address(10.0.0.101) *step 1*: write the definition of "cn1" to a stanza file named "cn.stanza" :: @@ -100,9 +100,9 @@ Use Cases ip=10.0.0.100 mac=ca:68:d3:ae:db:03 netboot=grub2 - + *step 2*: modify the "/tmp/cn.stanza" according to the "cn2" attributes :: - + # cn2: objtype=node @@ -110,8 +110,8 @@ Use Cases ip=10.0.0.101 mac=ca:68:d3:ae:db:04 netboot=grub2 - + *step 3*: create "cn2" definition with "cn.stanza" :: - cat /tmp/cn.stanza |mkdef -z + cat /tmp/cn.stanza |mkdef -z From fda6f742bb7336e40bb858632358f8f0e69ec7c3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0165/1681] Remove trailing spaces in file docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst --- .../basic_concepts/xcat_object/osimage.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst index 63d3d2680..e9db2fbfd 100644 --- a/docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst +++ b/docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst @@ -13,8 +13,8 @@ Key Attributes The type of operating system this definition represents (linux, AIX). * osarch: - The hardware architecture of the nodes this image supports. Valid values: x86_64, ppc64, ppc64le. - + The hardware architecture of the nodes this image supports. Valid values: x86_64, ppc64, ppc64le. + * osvers: The Linux distribution name and release number of the image. Valid values: rhels*, rhelc*, rhas*, centos*, SL*, fedora*, sles* (where * is the version #). @@ -38,13 +38,13 @@ Key Attributes Use Cases --------- -* Case 1: +* Case 1: List all the osimage objects :: lsdef -t osimage -* Case 2: +* Case 2: Create a osimage definition "customized-rhels7-ppc64-install-compute" based on an existing osimage "rhels7-ppc64-install-compute", the osimage "customized-rhels7-ppc64-install-compute" will inherit all the attributes of "rhels7-ppc64-install-compute" except installing the additional packages specified in the file "/tmp/otherpkg.list": @@ -55,7 +55,7 @@ Create a osimage definition "customized-rhels7-ppc64-install-compute" based on a The content will look like :: # - + rhels7-ppc64-install-compute: objtype=osimage imagetype=linux @@ -69,11 +69,11 @@ The content will look like :: profile=compute provmethod=install template=/opt/xcat/share/xcat/install/rh/compute.rhels7.tmpl - + *step 2* : modify the stanza file according to the attributes of "customized-rhels7-ppc64-install-compute" :: - + # - + customized-rhels7-ppc64-install-compute: objtype=osimage imagetype=linux From 0628e270d2ba68b24b901f539f1e507e8919cb89 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0166/1681] Remove trailing spaces in file docs/source/guides/admin-guides/index.rst --- docs/source/guides/admin-guides/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/index.rst b/docs/source/guides/admin-guides/index.rst index 992ad6cef..ccd196909 100644 --- a/docs/source/guides/admin-guides/index.rst +++ b/docs/source/guides/admin-guides/index.rst @@ -1,7 +1,7 @@ Admin Guide =========== -The admin guide is intended to help with learning how to manage a cluster using xCAT with the following major sections: +The admin guide is intended to help with learning how to manage a cluster using xCAT with the following major sections: * **Basic Concepts** Introduces some of the basic concepts in xCAT. From a07b1c4bec4684acbb89f03dbdf0b7f8a9c99f52 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0167/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst --- .../deployment/acc_initrd_rootimg_gen.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst index 9cc18ec36..635905e82 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst @@ -8,50 +8,50 @@ Generating diskless initrd with ``genimage`` and compressed rootimg with ``packi Enabling the ``pigz`` for diskless initrd and rootimg generating ---------------------------------------------------------------- -The parallel compression tool ``pigz`` can be enabled by installing ``pigz`` package on the management server or diskless rootimg. Depending on the method of generating the initrd and compressed rootimg, the steps differ in different Linux distributions. +The parallel compression tool ``pigz`` can be enabled by installing ``pigz`` package on the management server or diskless rootimg. Depending on the method of generating the initrd and compressed rootimg, the steps differ in different Linux distributions. -* **[RHEL]** +* **[RHEL]** The package ``pigz`` is shipped in Extra Packages for Enterprise Linux (or EPEL) instead of RedHat iso, this involves some complexity. - + Extra Packages for Enterprise Linux (or EPEL) is a Fedora Special Interest Group that creates, maintains, and manages a high quality set of additional packages for Enterprise Linux, including, but not limited to, Red Hat Enterprise Linux (RHEL), CentOS and Scientific Linux (SL), Oracle Linux (OL). - - EPEL has an ``epel-release`` package that includes gpg keys for package signing and repository information. Installing this package for your Enterprise Linux version should allow you to use normal tools such as ``yum`` to install packages and their dependencies. - + + EPEL has an ``epel-release`` package that includes gpg keys for package signing and repository information. Installing this package for your Enterprise Linux version should allow you to use normal tools such as ``yum`` to install packages and their dependencies. + Refer to the http://fedoraproject.org/wiki/EPEL for more details on EPEL - + 1) Enabling the ``pigz`` in ``genimage`` (only supported in RHELS6 or above) - + ``pigz`` should be installed in the diskless rootimg. Download ``pigz`` package from https://dl.fedoraproject.org/pub/epel/ , then customize the diskless osimage to install ``pigz`` as the additional packages, see :doc:`Install Additional Other Packages` for more details. - + 2) Enabling the ``pigz`` in ``packimage`` - + ``pigz`` should be installed on the management server. Download ``pigz`` package from https://dl.fedoraproject.org/pub/epel/ , then install the ``pigz`` with ``yum`` or ``rpm``. * **[UBUNTU]** Make sure the ``pigz`` is installed on the management node with the following command:: - + dpkg -l|grep pigz - + If not, ``pigz`` can be installed with the following command:: - + apt-get install pigz -* **[SLES]** +* **[SLES]** + + 1) Enabling the ``pigz`` in ``genimage`` (only supported in SLES12 or above) - 1) Enabling the ``pigz`` in ``genimage`` (only supported in SLES12 or above) - ``pigz`` should be installed in the diskless rootimg, since``pigz`` is shipped in the SLES iso, this can be done by adding ``pigz`` into the ``pkglist`` of diskless osimage. - + 2) Enabling the ``pigz`` in ``packimage`` - + Make sure the ``pigz`` is installed on the management node with the following command:: - + rpm -qa|grep pigz - + If not, ``pigz`` can be installed with the following command:: - + zypper install pigz @@ -62,14 +62,14 @@ Appendix: An example on ``packimage`` performance optimization with "pigz" enabl This is an example on performance optimization with ``pigz`` enabled. -In this example, a xCAT command ``packimage rhels7-ppc64-netboot-compute`` is run on a Power 7 machine with 4 cores. +In this example, a xCAT command ``packimage rhels7-ppc64-netboot-compute`` is run on a Power 7 machine with 4 cores. The system info: :: # uname -a Linux c910f03c01p03 3.10.0-123.el7.ppc64 #1 SMP Mon May 5 11:18:37 EDT 2014 ppc64 ppc64 ppc64 GNU/Linux - # cat /etc/os-release + # cat /etc/os-release NAME="Red Hat Enterprise Linux Server" VERSION="7.0 (Maipo)" ID="rhel" @@ -80,7 +80,7 @@ The system info: :: CPE_NAME="cpe:/o:redhat:enterprise_linux:7.0:GA:server" HOME_URL="https://www.redhat.com/" BUG_REPORT_URL="https://bugzilla.redhat.com/" - + REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 7" REDHAT_BUGZILLA_PRODUCT_VERSION=7.0 REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux" @@ -88,27 +88,27 @@ The system info: :: The CPU info: :: - # cat /proc/cpuinfo + # cat /proc/cpuinfo processor : 0 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) - + processor : 1 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) - + processor : 2 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) - + processor : 3 cpu : POWER7 (architected), altivec supported clock : 3550.000000MHz revision : 2.0 (pvr 003f 0200) - + timebase : 512000000 platform : pSeries model : IBM,8233-E8B @@ -119,8 +119,8 @@ The time spent on ``packimage`` with ``gzip``: :: # time packimage rhels7-ppc64-netboot-compute Packing contents of /install/netboot/rhels7/ppc64/compute/rootimg compress method:gzip - - + + real 1m14.896s user 0m0.159s sys 0m0.019s @@ -130,7 +130,7 @@ The time spent on ``packimage`` with ``pigz``: :: # time packimage rhels7-ppc64-netboot-compute Packing contents of /install/netboot/rhels7/ppc64/compute/rootimg compress method:pigz - + real 0m23.177s user 0m0.176s sys 0m0.016s From 09062e5c138ac8c55ae0b76cab501b2e3351cc1e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0168/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst --- .../deployment/additionalpkg/additional_pkg_overview.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst index 79aaff3f8..f867e901a 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst @@ -8,7 +8,7 @@ The name of the packages that will be installed on the node are stored in the pa The path to the package lists will be read from the osimage definition. Which osimage a node is using is specified by the provmethod attribute. To display this value for a node: :: - lsdef node1 -i provmethod + lsdef node1 -i provmethod Object name: node provmethod= @@ -31,7 +31,7 @@ You can display this details of this osimage by running the following command, s rootimgdir=/install//// synclists=/install/custom//.synclist -You can set the pkglist and otherpkglist using the following command: :: +You can set the pkglist and otherpkglist using the following command: :: chdef -t osimage pkglist=/opt/xcat/share/xcat///.pkglist\ otherpkglist=/install/custom///my.otherpkgs.pkglist From 38a17e0e08cbe5926df18c255a8df91b4e290531 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0169/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst --- .../common/deployment/additionalpkg/nonubuntu_os_pkg.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst index dcf8c350b..09003fc57 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst @@ -82,7 +82,7 @@ Group/Pattern Names It is only supported for stateful deployment. -In Linux, a groups of rpms can be packaged together into one package. It is called a group on RedHat, CentOS, Fedora and Scientific Linux. To get the a list of available groups, run +In Linux, a groups of rpms can be packaged together into one package. It is called a group on RedHat, CentOS, Fedora and Scientific Linux. To get the a list of available groups, run * **[RHEL]** :: From a8a384a8925e953415cdfc0a646ed22d03b762f4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0170/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst --- .../common/deployment/additionalpkg/ubuntu_os_other_pkg.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst index 0df30a33a..941c5150a 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst @@ -19,7 +19,7 @@ Compute nodes can access the internet chdef -t osimage otherpkglist=/install/custom/install/ubuntu/compute.otherpkgs.pkglist -#. Run ``updatenode -S`` or ``updatenode -P otherpkgs`` +#. Run ``updatenode -S`` or ``updatenode -P otherpkgs`` Run ``updatenode -S`` to **install/update** the packages on the compute nodes :: From 21c11b07e5923602ef8e6c4de683ba154b46996c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0171/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst --- .../common/deployment/cfg_partition.rst | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst index 0efb5d793..20836e356 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst @@ -3,16 +3,16 @@ By default, xCAT will install the operating system on the first disk and with default partitions layout in the node. However, you may choose to customize the disk partitioning during the install process and define a specific disk layout. You can do this in one of two ways: '**partition definition file**' or '**partition definition script**'. **Notes** -.. note:: ``partition definition file`` can be used for RedHat, SLES, and Ubuntu. Because disk configuraiton for Ubuntu is different from RedHat, there may be some special sections required for Ubuntu. +.. note:: ``partition definition file`` can be used for RedHat, SLES, and Ubuntu. Because disk configuraiton for Ubuntu is different from RedHat, there may be some special sections required for Ubuntu. -.. warning:: ``partition definition script`` has only been tested on RedHat and Ubuntu, use at your own risk for SLES. +.. warning:: ``partition definition script`` has only been tested on RedHat and Ubuntu, use at your own risk for SLES. .. END_Overview .. BEGIN_partition_definition_file_Overview -You could create a customized osimage partition file, say /install/custom/my-partitions, that contains the disk partitioning definition, then associate the partition file with osimage, the nodeset command will insert the contents of this file directly into the generated autoinst configuration file that will be used by the OS installer. +You could create a customized osimage partition file, say /install/custom/my-partitions, that contains the disk partitioning definition, then associate the partition file with osimage, the nodeset command will insert the contents of this file directly into the generated autoinst configuration file that will be used by the OS installer. .. END_partition_definition_file_Overview @@ -108,7 +108,7 @@ Here is partition definition file example for SLES standard partition in X86_64 - + .. END_partition_definition_file_example_SLES_Standard_Partitions_for_X86_64 .. BEGIN_partition_definition_file_example_SLES_LVM_for_ppc64 @@ -223,7 +223,7 @@ The following is an example of a partition definition file for a SLES LVM Partit CT_LVM all - + .. END_partition_definition_file_example_SLES_LVM_for_ppc64 .. BEGIN_partition_definition_file_example_SLES_Standard_partition_for_ppc64 @@ -286,7 +286,7 @@ Here is partition definition file example for SLES standard partition in ppc64 m .. BEGIN_partition_definition_file_example_SLES_RAID1 -To partition definition file example for SLES RAID1 refer to `Configure RAID before Deploy OS `_ +To partition definition file example for SLES RAID1 refer to `Configure RAID before Deploy OS `_ .. END_partition_definition_file_example_SLES_RAID1 @@ -357,14 +357,14 @@ Run the following commands to associate the partition with the osimage: :: - For RedHat, when nodeset runs and generates the /install/autoinst file for a node, it will replace the #XCAT_PARTITION_START#...#XCAT_PARTITION_END# directives from your osimage template with the contents of your custom partitionfile. -- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the partition configuration to /tmp/partitionfile, this script will replace the #XCA_PARTMAN_RECIPE_SCRIPT# directive in /install/autoinst/.pre. +- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the partition configuration to /tmp/partitionfile, this script will replace the #XCA_PARTMAN_RECIPE_SCRIPT# directive in /install/autoinst/.pre. .. END_partition_definition_file_Associate_partition_file_with_osimage_common .. BEGIN_Partition_Definition_Script_overview -Create a shell script that will be run on the node during the install process to dynamically create the disk partitioning definition. This script will be run during the OS installer %pre script on RedHat or preseed/early_command on Unbuntu execution and must write the correct partitioning definition into the file /tmp/partitionfile on the node +Create a shell script that will be run on the node during the install process to dynamically create the disk partitioning definition. This script will be run during the OS installer %pre script on RedHat or preseed/early_command on Unbuntu execution and must write the correct partitioning definition into the file /tmp/partitionfile on the node .. END_Partition_Definition_Script_overview @@ -466,7 +466,7 @@ If not specified, the default value will be used. nodeset osimage= - the 'd:' preceding the filename tells nodeset that this is a partition disk file. -- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the content of the partition disk file to /tmp/install_disk, this context to run the script will replace the #XCA_PARTMAN_DISK_SCRIPT# directive in /install/autoinst/.pre. +- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the content of the partition disk file to /tmp/install_disk, this context to run the script will replace the #XCA_PARTMAN_DISK_SCRIPT# directive in /install/autoinst/.pre. .. END_Partition_Disk_File_ubuntu_only @@ -474,23 +474,23 @@ If not specified, the default value will be used. The disk script contains a script to generate a partitioning disk file named "/tmp/install_disk". for example: :: - rm /tmp/devs-with-boot 2>/dev/null || true; - for d in $(list-devices partition); do - mkdir -p /tmp/mymount; - rc=0; - mount $d /tmp/mymount || rc=$?; - if [[ $rc -eq 0 ]]; then - [[ -d /tmp/mymount/boot ]] && echo $d >>/tmp/devs-with-boot; - umount /tmp/mymount; - fi - done; - if [[ -e /tmp/devs-with-boot ]]; then - head -n1 /tmp/devs-with-boot | egrep -o '\S+[^0-9]' > /tmp/install_disk; - rm /tmp/devs-with-boot 2>/dev/null || true; - else - DEV=`ls /dev/disk/by-path/* -l | egrep -o '/dev.*[s|h|v]d[^0-9]$' | sort -t : -k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -g | head -n1 | egrep -o '[s|h|v]d.*$'`; - if [[ "$DEV" == "" ]]; then DEV="sda"; fi; - echo "/dev/$DEV" > /tmp/install_disk; + rm /tmp/devs-with-boot 2>/dev/null || true; + for d in $(list-devices partition); do + mkdir -p /tmp/mymount; + rc=0; + mount $d /tmp/mymount || rc=$?; + if [[ $rc -eq 0 ]]; then + [[ -d /tmp/mymount/boot ]] && echo $d >>/tmp/devs-with-boot; + umount /tmp/mymount; + fi + done; + if [[ -e /tmp/devs-with-boot ]]; then + head -n1 /tmp/devs-with-boot | egrep -o '\S+[^0-9]' > /tmp/install_disk; + rm /tmp/devs-with-boot 2>/dev/null || true; + else + DEV=`ls /dev/disk/by-path/* -l | egrep -o '/dev.*[s|h|v]d[^0-9]$' | sort -t : -k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -g | head -n1 | egrep -o '[s|h|v]d.*$'`; + if [[ "$DEV" == "" ]]; then DEV="sda"; fi; + echo "/dev/$DEV" > /tmp/install_disk; fi; If not specified, the default value will be used. @@ -501,7 +501,7 @@ If not specified, the default value will be used. nodeset osimage= - the 's:' prefix tells nodeset that is a script, the 's:d:' preceding the filename tells nodeset that this is a script to generate the partition disk file. -- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, this context to run the script will replace the #XCA_PARTMAN_DISK_SCRIPT# directive in /install/autoinst/.pre. +- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, this context to run the script will replace the #XCA_PARTMAN_DISK_SCRIPT# directive in /install/autoinst/.pre. .. END_Partition_Disk_Script_ubuntu_only From 92028987b63b18fed7c77e843c6b42b27686ca89 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0172/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst --- .../common/deployment/create_img.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst index 73a807f85..4fcb28264 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst @@ -11,11 +11,11 @@ If using an ISO, copy it to (or NFS mount it on) the management node, and then r If using a DVD, put it in the DVD drive of the management node and run: :: - copycds /dev/ + copycds /dev/ To see the list of osimages: :: - lsdef -t osimage + lsdef -t osimage To see the attributes of a particular osimage: :: @@ -31,7 +31,7 @@ Below is an example of osimage definitions created by ``copycds``: :: rhels7.2-ppc64le-netboot-compute (osimage) rhels7.2-ppc64le-stateful-mgmtnode (osimage) -In these osimage definitions shown above +In these osimage definitions shown above * **--install-compute** is the default osimage definition used for diskful installation * **--netboot-compute** is the default osimage definition used for diskless installation @@ -48,9 +48,9 @@ For pre-18.04 version of Ubuntu for ppc64el, the initrd.gz shipped with the ISO [ubuntu 14.04.2]: http://xcat.org/files/netboot/ubuntu14.04.2/ppc64el/mini.iso [ubuntu 14.04.3]: http://xcat.org/files/netboot/ubuntu14.04.3/ppc64el/mini.iso - + [ubuntu 14.04.4]: http://xcat.org/files/netboot/ubuntu14.04.4/ppc64el/mini.iso - + [ubuntu 16.04]: http://xcat.org/files/netboot/ubuntu16.04/ppc64el/mini.iso [ubuntu 16.04.1]: http://xcat.org/files/netboot/ubuntu16.04.1/ppc64el/mini.iso @@ -65,7 +65,7 @@ For pre-18.04 version of Ubuntu for ppc64el, the initrd.gz shipped with the ISO mkdir -p /install//ppc64el/install/netboot cp /tmp/iso/install/initrd.gz /install//ppc64el/install/netboot -**[Below tips maybe helpful for you]** +**[Below tips maybe helpful for you]** **[Tips 1]** @@ -82,7 +82,7 @@ In this way, if you need to install some additional RPMs into your MN later, you **[Tips 2]** You can create/modify an osimage definition easily with any existing osimage definition, the command is :: - + mkdef -t osimage -o --template [=, ...] Except the specified attributes **, the attributes of ** will inherit the values of template osimage **. From 2d84af703ee5feead32235c457b41dca38b1e691 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0173/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst --- .../manage_clusters/common/deployment/deploy_os.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst index 4a358b41e..a72a74c23 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst @@ -1,7 +1,7 @@ Initialize the Compute for Deployment ===================================== -XCAT use '**nodeset**' command to associate a specific image to a node which will be installed with this image. :: +XCAT use '**nodeset**' command to associate a specific image to a node which will be installed with this image. :: nodeset osimage= From 3217a6376dbcda881259a918c3fb7a56cec7d801 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0174/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst --- .../common/deployment/driver_update_disk.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst index 717469dc3..19d232d97 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst @@ -25,7 +25,7 @@ There are two approaches for xCAT to find the driver disk (pick one): chdef -t osimage driverupdatesrc=dud: -#. Put the driver update disk in the directory ``/driverdisk//`` (example: ``/install/driverdisk/sles11.1/x86_64``). +#. Put the driver update disk in the directory ``/driverdisk//`` (example: ``/install/driverdisk/sles11.1/x86_64``). During the running of the ``genimage``, ``geninitrd``, or ``nodeset`` commands, xCAT will look for driver update disks in the directory ``/driverdisk//``. @@ -68,22 +68,22 @@ If 'osupdatename' is specified, the kernel shipped with the 'osupdatename' will #. :: nodeset osimage= - + #. :: geninitrd nodeset osimage= --noupdateinitrd **Note:** 'geninitrd' + 'nodeset --noupdateinitrd' is useful when you need to run nodeset frequently for a diskful node. 'geninitrd' only needs be run once to rebuild the initrd and 'nodeset --noupdateinitrd' will not touch the initrd and kernel in /tftpboot/xcat/osimage//. -- If putting the driver disk in /driverdisk//: +- If putting the driver disk in /driverdisk//: Running 'nodeset ' in anyway will load the driver disk -.. END_inject_into_initrd__for_diskful_for_DUD +.. END_inject_into_initrd__for_diskful_for_DUD -.. BEGIN__inject_into_initrd__for_diskful_for_RPM +.. BEGIN__inject_into_initrd__for_diskful_for_RPM -There are two ways to inject drivers: +There are two ways to inject drivers: #. Using nodeset command only: :: @@ -97,7 +97,7 @@ There are two ways to inject drivers: **Note:** 'geninitrd' + 'nodeset --noupdateinitrd' is useful when you need to run nodeset frequently for diskful nodes. 'geninitrd' only needs to be run once to rebuild the initrd and 'nodeset --noupdateinitrd' will not touch the initrd and kernel in /tftpboot/xcat/osimage//. The option '--ignorekernelchk' is used to skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. To use this flag, you should make sure the drivers in the driver rpms are usable for the target kernel. -.. END_inject_into_initrd__for_diskful_for_RPM +.. END_inject_into_initrd__for_diskful_for_RPM .. BEGIN_inject_into_initrd__for_diskless_for_DUD @@ -106,20 +106,20 @@ The option '--ignorekernelchk' is used to skip the kernel version checking when Run the following command: :: genimage - -- If putting the driver disk in /driverdisk//: + +- If putting the driver disk in /driverdisk//: Running 'genimage' in anyway will load the driver disk .. END_inject_into_initrd__for_diskless_for_DUD - -.. BEGIN_inject_into_initrd__for_diskless_for_RPM + +.. BEGIN_inject_into_initrd__for_diskless_for_RPM Run the following command: :: genimage [--ignorekernelchk] The option '--ignorekernelchk' is used to skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. To use this flag, you should make sure the drivers in the driver rpms are usable for the target kernel. -.. END_inject_into_initrd__for_diskless_for_RPM +.. END_inject_into_initrd__for_diskless_for_RPM .. BEGIN_node From be223afbc1ca1cb6e39bd63ce59a560f851e0b8d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0175/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst --- .../common/deployment/enable_kdump.rst | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst index 10f5ec4eb..d3cc84a67 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst @@ -22,10 +22,10 @@ The following attributes of an osimage should be modified to enable ``kdump``: Configure the ``pkglist`` file ------------------------------ -The ``pkglist`` for the osimage needs to include the appropriate RPMs. The following list of RPMs are provided as a sample, always refer to the Operating System specific documentataion to ensure the required packages are there for ``kdump`` support. +The ``pkglist`` for the osimage needs to include the appropriate RPMs. The following list of RPMs are provided as a sample, always refer to the Operating System specific documentataion to ensure the required packages are there for ``kdump`` support. * **[RHELS]** :: - + kexec-tools crash @@ -42,7 +42,7 @@ The ``pkglist`` for the osimage needs to include the appropriate RPMs. The foll Modify the ``exlist`` file -------------------------- -The default diskless image created by ``copycds`` excludes the ``/boot`` directory in the exclude list file, but this is required for ``kdump``. +The default diskless image created by ``copycds`` excludes the ``/boot`` directory in the exclude list file, but this is required for ``kdump``. Update the ``exlist`` for the target osimage and remove the line ``/boot``: :: @@ -67,10 +67,10 @@ The kdump will create a new initrd which used in the dumping stage. The ``/tmp`` -The ``dump`` attribute +The ``dump`` attribute ---------------------- -To support kernel dumps, the ``dump`` attribute **must** be set on the osimage definition. If not set, kdump service will not be enabled. The ``dump`` attribute defines the NFS remote path where the crash information is to be stored. +To support kernel dumps, the ``dump`` attribute **must** be set on the osimage definition. If not set, kdump service will not be enabled. The ``dump`` attribute defines the NFS remote path where the crash information is to be stored. Use the ``chdef`` command to set a value of the ``dump`` attribute: :: @@ -86,9 +86,9 @@ If the NFS server is the Service Node or Management Node, the server can be left The ``crashkernelsize`` attribute --------------------------------- -To allow the Operating System to automatically reserve the appropriate amount of memory for the ``kdump`` kernel, set ``crashkernelsize=auto``. +To allow the Operating System to automatically reserve the appropriate amount of memory for the ``kdump`` kernel, set ``crashkernelsize=auto``. -For setting specific sizes, use the following example: +For setting specific sizes, use the following example: * For System X machines, set the ``crashkernelsize`` using this format: :: @@ -98,7 +98,7 @@ For setting specific sizes, use the following example: chdef -t osimage crashkernelsize=M -* For System P machines, set the ``crashkernelsize`` using this format: :: +* For System P machines, set the ``crashkernelsize`` using this format: :: chdef -t osimage crashkernelsize=@32M @@ -113,7 +113,7 @@ The ``crashkernelsize`` is not large enough, you should change the ``crashkernel The ``enablekdump`` postscript ------------------------------ -xCAT provides a postscript ``enablekdump`` that can be added to the Nodes to automatically start the ``kdump`` service when the node boots. Add to the nodes using the following command: :: +xCAT provides a postscript ``enablekdump`` that can be added to the Nodes to automatically start the ``kdump`` service when the node boots. Add to the nodes using the following command: :: chdef -t node -p postscripts=enablekdump @@ -123,7 +123,7 @@ Manually trigger a kernel panic on Linux Normally, kernel ``panic()`` will trigger booting into capture kernel. Once the kernel panic is triggered, the node will reboot into the capture kernel, and a kernel dump (vmcore) will be automatically saved to the directory on the specified NFS server (````). -Check your Operating System specific documentation for the path where the kernel dump is saved. For example: +Check your Operating System specific documentation for the path where the kernel dump is saved. For example: * **[RHELS6]** :: @@ -143,13 +143,13 @@ This will force the Linux kernel to crash, and the ``address-YYYY-MM-DD-HH:MM:SS Dump Analysis ------------- -Once the system has returned from recovering the crash, you can analyze the kernel dump using the ``crash`` tool. +Once the system has returned from recovering the crash, you can analyze the kernel dump using the ``crash`` tool. #. Locate the recent vmcore dump file. #. Locate the kernel file for the crash server. The kernel is under ``/tftpboot/xcat/netboot////kernel`` on the managenent node. -#. Once you have located a vmcore dump file and kernel file, call ``crash``: :: +#. Once you have located a vmcore dump file and kernel file, call ``crash``: :: crash @@ -158,7 +158,7 @@ Once the system has returned from recovering the crash, you can analyze the kern Appedix ------- -#. OS Documentations on kdump configuration: +#. OS Documentations on kdump configuration: * http://www.novell.com/support/kb/doc.php?id=3374462. From d51ab4c11dd2ec050eba031a0053e2e9beef48c7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0176/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst --- .../manage_clusters/common/deployment/generate_img.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst index e5886603d..ad459e7a5 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst @@ -3,8 +3,8 @@ Generate Diskless Image The ``copycds`` command copies the contents of the Linux media to ``/install//`` so that it will be available for installing nodes or creating diskless images. After executing ``copycds``, there are several ``osimage`` definitions created by default. Run ``tabdump osimage`` to view these images: :: - tabdump osimage - + tabdump osimage + The output should be similar to the following: :: "rhels7.1-ppc64le-install-compute",,"compute","linux",,"install",,"rhels7.1-ppc64le",,,"Linux","rhels7.1","ppc64le",,,,,,,, @@ -16,7 +16,7 @@ The ``netboot-compute`` is the default **diskless** osimage created rhels7.1 ppc genimage rhels7.1-ppc64le-netboot-compute -Before packing the diskless image, you have the opportunity to change any files in the image by changing to the ``rootimgdir`` and making modifications. (e.g. ``/install/netboot/rhels7.1/ppc64le/compute/rootimg``). +Before packing the diskless image, you have the opportunity to change any files in the image by changing to the ``rootimgdir`` and making modifications. (e.g. ``/install/netboot/rhels7.1/ppc64le/compute/rootimg``). However it's recommended that all changes to the image are made via post install scripts so that it's easily repeatable. Although, instead, we recommend that you make all changes to the image via your postinstall script, so that it is repeatable. Refer to :doc:`/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/pre_post_script` for more details. @@ -104,7 +104,7 @@ Skip this section if you want to use the image as is. * Modify .pkglist file to add or remove packages that are from the os distro -* Modify .otherpkgs.pkglist to add or remove packages from other sources. Refer to ``Using_Updatenode`` for details +* Modify .otherpkgs.pkglist to add or remove packages from other sources. Refer to ``Using_Updatenode`` for details * For diskful, modify the .tmpl file to change the kickstart/autoyast configuration @@ -125,7 +125,7 @@ Skip this section if you want to use the image as is. Deploying nodes --------------- -You can change the provmethod of the node to the new image_name if different: :: +You can change the provmethod of the node to the new image_name if different: :: chdef provmethod= nodeset osimage= From 494d743325aff4d0d6a6dc4f0b7269532945ef86 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0177/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst --- .../common/deployment/install_new_kernel.rst | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst index 30f6cd0fd..79ba18703 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst @@ -4,7 +4,7 @@ Installing a New Kernel in the Diskless Image Note: This procedure assumes you are using xCAT 2.6.1 or later. -The kerneldir attribute in linuximage table can be used to assign a directory containing kernel RPMs that can be installed into diskless images. The default for kernerdir is /install/kernels. To add a new kernel, create a directory named under the kerneldir, and genimage will pick them up from there. +The kerneldir attribute in linuximage table can be used to assign a directory containing kernel RPMs that can be installed into diskless images. The default for kernerdir is /install/kernels. To add a new kernel, create a directory named under the kerneldir, and genimage will pick them up from there. The following examples assume you have the kernel RPM in /tmp and is using the default value for kerneldir (/install/kernels). @@ -15,42 +15,42 @@ The RPM names below are only examples, substitute your specific level and archit * **[RHEL]** The RPM kernel package is usually named: kernel-.rpm. -For example, kernel-3.10.0-229.ael7b.ppc64le.rpm means kernelver=3.10.0-229.ael7b.ppc64le. :: +For example, kernel-3.10.0-229.ael7b.ppc64le.rpm means kernelver=3.10.0-229.ael7b.ppc64le. :: mkdir -p /install/kernels/3.10.0-229.ael7b.ppc64le cp /tmp/kernel-3.10.0-229.ael7b.ppc64le.rpm /install/kernels/3.10.0-229.ael7b.ppc64le createrepo /install/kernels/3.10.0-229.ael7b.ppc64le/ chdef -t osimage -p pkgdir=/install/kernels/3.10.0-229.ael7b.ppc64le/ -Run genimage/packimage to update the image with the new kernel. +Run genimage/packimage to update the image with the new kernel. Note: If downgrading the kernel, you may need to first remove the rootimg directory. :: - genimage -k 3.10.0-229.ael7b.ppc64le + genimage -k 3.10.0-229.ael7b.ppc64le packimage * **[SLES]** -The RPM kernel package is usually separated into two parts: kernel--base and kernel. +The RPM kernel package is usually separated into two parts: kernel--base and kernel. For example, /tmp contains the following two RPMs: :: kernel-default-3.12.28-4.6.ppc64le.rpm kernel-default-base-3.12.28-4.6.ppc64le.rpm kernel-default-devel-3.12.28-4.6.ppc64le.rpm - + 3.12.28-4.6.ppc64le is NOT the kernel version,3.12.28-4-ppc64le is the kernel version. The "4.6.ppc64le" is replaced with "4-ppc64le": :: mkdir -p /install/kernels/3.12.28-4-ppc64le/ cp /tmp/kernel-default-3.12.28-4.6.ppc64le.rpm /install/kernels/3.12.28-4-ppc64le/ - cp /tmp/kernel-default-base-3.12.28-4.6.ppc64le.rpm /install/kernels/3.12.28-4-ppc64le/ + cp /tmp/kernel-default-base-3.12.28-4.6.ppc64le.rpm /install/kernels/3.12.28-4-ppc64le/ cp /tmp/kernel-default-devel-3.12.28-4.6.ppc64le.rpm /install/kernels/3.12.28-4-ppc64le/ chdef -t osimage -p pkgdir=/install/kernels/3.12.28-4-ppc64le/ -Run genimage/packimage to update the image with the new kernel. +Run genimage/packimage to update the image with the new kernel. Note: If downgrading the kernel, you may need to first remove the rootimg directory. -Since the kernel version name is different from the kernel rpm package name, the -k flag MUST to be specified on the genimage command. :: +Since the kernel version name is different from the kernel rpm package name, the -k flag MUST to be specified on the genimage command. :: genimage -k 3.12.28-4-ppc64le 3.12.28-4.6 packimage @@ -60,16 +60,16 @@ Installing New Kernel Drivers to Diskless Initrd ================================================= -The kernel drivers in the diskless initrd are used for the devices during the netboot. If you are missing one or more kernel drivers for specific devices (especially for the network device), the netboot process will fail. xCAT offers two approaches to add additional drivers to the diskless initrd during the running of genimage. +The kernel drivers in the diskless initrd are used for the devices during the netboot. If you are missing one or more kernel drivers for specific devices (especially for the network device), the netboot process will fail. xCAT offers two approaches to add additional drivers to the diskless initrd during the running of genimage. -Use the '-n' flag to add new drivers to the diskless initrd: :: +Use the '-n' flag to add new drivers to the diskless initrd: :: genimage -n -Generally, the genimage command has a default driver list which will be added to the initrd. But if you specify the '-n' flag, the default driver list will be replaced with your . That means you need to include any drivers that you need from the default driver list into your . +Generally, the genimage command has a default driver list which will be added to the initrd. But if you specify the '-n' flag, the default driver list will be replaced with your . That means you need to include any drivers that you need from the default driver list into your . -The default driver list: :: +The default driver list: :: rh-x86: tg3 bnx2 bnx2x e1000 e1000e igb mlx_en virtio_net be2net rh-ppc: e1000 e1000e igb ibmveth ehea @@ -78,6 +78,6 @@ The default driver list: :: sels-ppc: tg3 e1000 e1000e igb ibmveth ehea be2net sles-ppcle: scsi_mod libata scsi_tgt jbd2 mbcache crc16 virtio virtio_ring libahci crc-t10dif scsi_transport_srp af_packet ext3 ext4 virtio_pci virtio_blk scsi_dh ahci megaraid_sas sd_mod ibmvscsi -Note: With this approach, xCAT will search for the drivers in the rootimage. You need to make sure the drivers have been included in the rootimage before generating the initrd. You can install the drivers manually in an existing rootimage (using chroot) and run genimage again, or you can use a postinstall script to install drivers to the rootimage during your initial genimage run. +Note: With this approach, xCAT will search for the drivers in the rootimage. You need to make sure the drivers have been included in the rootimage before generating the initrd. You can install the drivers manually in an existing rootimage (using chroot) and run genimage again, or you can use a postinstall script to install drivers to the rootimage during your initial genimage run. -Use the driver rpm package to add new drivers from rpm packages to the diskless initrd. Refer to the :doc:`/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter` for details. +Use the driver rpm package to add new drivers from rpm packages to the diskless initrd. Refer to the :doc:`/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter` for details. From 3a9122a6eafe606011eca54ac63d96a05ae7cf80 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0178/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst --- .../common/deployment/network/cfg_network_bond.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst index 0ed1084d4..59d950d03 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst @@ -3,9 +3,9 @@ Configure Bond using two Ethernet Adapters The following example sets the xCAT properties for compute node ``cn1`` to create: - * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` - * Bond eth2 and eth3 as ``bond0`` - * Assign ip ``40.0.0.1`` to the bonded interface ``bond0`` + * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` + * Bond eth2 and eth3 as ``bond0`` + * Assign ip ``40.0.0.1`` to the bonded interface ``bond0`` Add network object into the networks table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -18,9 +18,9 @@ Define attributes in the ``nics`` table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` :: - + chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet - + #. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` :: chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3" @@ -49,5 +49,5 @@ Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network- BONDING_OPTS="mode=802.3ad xmit_hash_policy=layer2+3" -* ``mode=802.3ad`` requires additional configuration on the switch. +* ``mode=802.3ad`` requires additional configuration on the switch. * ``mode=2`` can be used for bonding without additional switch configuration. From e39a73bc0f2a1fc9904602b8b600afd7e52a1e7d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0179/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst --- .../deployment/network/cfg_network_bond_bridge.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst index fec33c383..4ccffed17 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst @@ -3,10 +3,10 @@ Configure Bridge Based on Bond Adapters The following example sets the xCAT properties for compute node ``cn1`` to create: - * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` - * Bond eth2 and eth3 as ``bond0`` + * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` + * Bond eth2 and eth3 as ``bond0`` * Create bridge ``br0`` based on ``bond0`` - * Assign ip ``40.0.0.1`` to the bridge interface ``br0`` + * Assign ip ``40.0.0.1`` to the bridge interface ``br0`` Add network object into the networks table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -19,9 +19,9 @@ Define attributes in the ``nics`` table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` :: - + chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet - + #. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` :: chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3" @@ -62,7 +62,7 @@ Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network- BRIDGE=br0 Check ``ifcfg-br0`` under ``/etc/sysconfig/network-scripts/`` :: - + DEVICE="br0" BOOTPROTO="static" IPADDR="40.0.0.1" From 9ad0a7754ca809edc8e6007db977dd3c8ddc47df Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0180/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst --- .../deployment/network/cfg_network_bond_vlan.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst index ba249126f..caf970ba6 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst @@ -3,10 +3,10 @@ Configure VLAN Based on Bond Adapters The following example sets the xCAT properties for compute node ``cn1`` to create: - * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` - * Bond eth2 and eth3 as ``bond0`` + * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` + * Bond eth2 and eth3 as ``bond0`` * Create bridge ``bond0.1`` based on ``bond0`` - * Assign ip ``40.0.0.1`` to the bridge interface ``bond0.1`` + * Assign ip ``40.0.0.1`` to the bridge interface ``bond0.1`` Add network object into the networks table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -19,9 +19,9 @@ Define attributes in the ``nics`` table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` :: - + chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet - + #. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` :: chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3" @@ -36,7 +36,7 @@ Define attributes in the ``nics`` table #. Define ``nichostnamesuffixes`` for ``bond0.1`` in case ``makehosts`` to update ``/etc/hosts``, since the value for ``nichostnamesuffixes`` cannot contain ".", other characters are recommended instead of ".", like following: :: - chdef cn1 nichostnamesuffixes.bond0.1=-bond0-1 + chdef cn1 nichostnamesuffixes.bond0.1=-bond0-1 Enable ``confignetwork`` to configure bridge ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -53,7 +53,7 @@ Verify VLAN ~~~~~~~~~~~ Login to compute node cn1 and check ``ifcfg-bond0.1`` under ``/etc/sysconfig/network-scripts/`` :: - + DEVICE="bond0.1" BOOTPROTO="static" IPADDR="40.0.0.1" From 08e5a86d488b8f8e09fc17f548196747e3ada035 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0181/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst --- .../network/cfg_network_bond_vlan_bridge.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst index 317946682..70bf4e6ba 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst @@ -3,8 +3,8 @@ Configure BOND, VLAN and BRIDGES The following example set the xCAT properties for compute node ``cn1`` to achieve the following network configuration using the ``confignetwork`` postscript: - * Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` - * Bond ``eth2`` and ``eth3`` as ``bond0`` + * Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` + * Bond ``eth2`` and ``eth3`` as ``bond0`` * From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2`` * Make bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1) * Make bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1) @@ -27,16 +27,16 @@ Define attributes in the ``nics`` table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` :: - + chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet - + #. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` :: chdef cn1 nictypes.bond0=bond \ nicdevices.bond0="eth2|eth3" #. From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2`` :: - + chdef cn1 nictypes.bond0.1=vlan \ nictypes.bond0.2=vlan \ nicdevices.bond0.1=bond0 \ @@ -71,7 +71,7 @@ Check result ~~~~~~~~~~~~ Use ``ip`` command on ``cn1`` to check all NICs :: - + xdsh cn1 "ip addr" Check all network configuration files under ``/etc/sysconfig/network-scripts/``. From 4a0bb88faa360cceacde06f251bc9b018ebf1ebb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0182/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst --- .../common/deployment/network/cfg_network_bridge.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst index 02c0a1075..816e8fc08 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst @@ -23,7 +23,7 @@ Define attributes in the ``nics`` table #. Define bridge ``br1`` based on ``eth1`` :: - chdef cn1 nictypes.br1=bridge nicdevices.br1="eth1" + chdef cn1 nictypes.br1=bridge nicdevices.br1="eth1" chdef cn1 nicips.br1=30.5.106.9 #. Define ``nicnetworks`` for ``br1`` :: @@ -50,7 +50,7 @@ Login to compute node cn1 and check configure files in ``ifcfg-br1`` under ``/et STP=on Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/`` :: - + BRIDGE=br1 Use ``ip addr`` command to check if ``br1``, ``eth0.6`` and ``eth0.7`` are correct. From 31ee9b0c9506385f3666338ccc8baf3b94ea33c2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0183/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst --- .../common/deployment/network/cfg_network_custom_scripts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst index 8b352f3f3..37c5183ac 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst @@ -26,5 +26,5 @@ If using customized script to configure NIC, ``niccustomscripts`` for the specif #. Use ``xdsh cn1 "ip addr show eth1"`` to check the NIC - #. Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/`` + #. Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/`` From ca4ca047eb9b351a68415f959baa20df3faf430c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0184/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst --- .../common/deployment/network/cfg_network_ethernet_nic.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst index 5e5755deb..abf105bb4 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst @@ -12,9 +12,9 @@ The following example sets the xCAT properties for compute node ``cn1`` to creat Add/update networks into the xCAT DB ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Add/update additional networks ``net11`` and ``net13`` into ``networks`` table:: +Add/update additional networks ``net11`` and ``net13`` into ``networks`` table:: - chdef -t network net11 net=11.1.89.0 mask=255.255.255.0 + chdef -t network net11 net=11.1.89.0 mask=255.255.255.0 chdef -t network net13 net=13.1.89.0 mask=255.255.255.0 **Note:** MTU can be customized as ``mtu`` in ``networks`` table for specified network. From 0afe98e6765c006cbd86f65fc1fbf9dcfe3fc63c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0185/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst --- .../common/deployment/network/cfg_network_vlan_bridge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst index ebbf9fa12..35982cac5 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst @@ -30,7 +30,7 @@ Add network object into the networks table Use the ``chdef`` command to add/modify the networks in the ``networks`` table :: - chdef -t network net60 net=60.0.0.0 mask=255.0.0.0 + chdef -t network net60 net=60.0.0.0 mask=255.0.0.0 chdef -t network net70 net=70.0.0.0 mask=255.0.0.0 chdef cn1 nicnetworks.br1=net60 nicnetworks.br2=net70 From e28452f5c14492564e644f6f46458171be53a663 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0186/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst --- .../common/deployment/network/cfg_routes.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst index b1903bc93..507171bbc 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst @@ -3,7 +3,7 @@ Configure routes There are 2 ways to configure OS route in xCAT: - * ``makeroutes``: command to add or delete routes on the management node or any given nodes. + * ``makeroutes``: command to add or delete routes on the management node or any given nodes. * ``setroute``: script to replace/add the routes to the node, it can be used in postscripts/postbootscripts. ``makeroutes`` or ``setroute`` will modify OS temporary route, it also modifies persistent route in ``/etc/sysconfig/static-routes`` file. @@ -29,7 +29,7 @@ Configure ``routes`` table #routename,net,mask,gateway,ifname,comments,disable "30net","30.0.0.0","255.0.0.0","0.0.0.0","eth2",, "20net","20.0.0.0","255.0.0.0","0.0.0.0","eth1",, - "defaultroute","default","255.0.0.0","10.0.0.101",,, + "defaultroute","default","255.0.0.0","10.0.0.101",,, Use ``makeroutes`` to configure OS route on xCAT management node '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' @@ -58,7 +58,7 @@ Use ``makeroutes`` to configure OS route for compute node #. define the names of the routes to be setup on the compute node: :: - chdef -t cn1 routenames="defaultroute,20net" + chdef -t cn1 routenames="defaultroute,20net" #. add all routes from the ``routenames`` to the OS route table for the compute node: :: @@ -70,7 +70,7 @@ Use ``makeroutes`` to configure OS route for compute node #. delete route ``20net`` from the OS route table for the compute node: :: - makeroutes cn1,cn2 -d -r 20net + makeroutes cn1,cn2 -d -r 20net Use ``setroute`` to configure OS route for compute node ''''''''''''''''''''''''''''''''''''''''''''''''''''''' From c50a513090018f8cf15590def9839bff9b46bae9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0187/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst --- .../deployment/network/cfg_second_adapter.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst index 8e4fda2c1..ded30393c 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst @@ -17,7 +17,7 @@ There are 3 ways to complete this operation. # mkdef cn1 groups=all nicips.eth1="11.1.89.7|12.1.89.7" nicnetworks.eth1="net11|net12" nictypes.eth1="Ethernet" 1 object definitions have been created or modified. - + # chdef cn1 nicips.eth2="13.1.89.7|14.1.89.7" nicnetworks.eth2="net13|net14" nictypes.eth2="Ethernet" 1 object definitions have been created or modified. @@ -45,9 +45,9 @@ There are 3 ways to complete this operation. 3. Using ``tabedit`` to edit the ``nics`` database table directly - The ``tabedit`` command opens the specified xCAT database table in a vi like editor and allows the user to edit any text and write the changes back to the database table. + The ``tabedit`` command opens the specified xCAT database table in a vi like editor and allows the user to edit any text and write the changes back to the database table. - *WARNING:* Using the ``tabedit`` command is not the recommended method because it is tedious and error prone. + *WARNING:* Using the ``tabedit`` command is not the recommended method because it is tedious and error prone. After changing the content of the ``nics`` table, here is the result from ``tabdump nics`` :: @@ -84,8 +84,8 @@ Option "-s" writes the install nic's information into configuration file for per Add network object into the networks table ------------------------------------------ -The ``nicnetworks`` attribute only defines the nic that uses the IP address. -Other information about the network should be defined in the ``networks`` table. +The ``nicnetworks`` attribute only defines the nic that uses the IP address. +Other information about the network should be defined in the ``networks`` table. Use the ``tabedit`` command to add/modify the networks in the``networks`` table :: @@ -100,7 +100,7 @@ Use the ``tabedit`` command to add/modify the networks in the``networks`` table Option -r to remove the undefined NICS -------------------------------------- -If the compute node's nics were configured by ``confignics`` and the nics configuration changed in the nics table, user the ``confignics -r`` to remove the undefined nic. +If the compute node's nics were configured by ``confignics`` and the nics configuration changed in the nics table, user the ``confignics -r`` to remove the undefined nic. For example, if on a compute node the ``eth0``, ``eth1``, and ``eth2`` nics were configured: :: @@ -112,7 +112,7 @@ For example, if on a compute node the ``eth0``, ``eth1``, and ``eth2`` nics were eth2 Link encap:Ethernet HWaddr 00:14:5e:d9:6c:e8 ... -Delete the eth2 definition in nics table using the ``chdef`` command. +Delete the eth2 definition in nics table using the ``chdef`` command. Then run the following to remove the undefined ``eth2`` nic on the compute node: :: updatenode -P "confignics -r" From f5ed448ac708f2cc9cd3af450be961db2ad68022 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0188/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst --- .../deployment/prepostscripts/post_script.rst | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst index 47984faf8..f976329ec 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst @@ -8,7 +8,7 @@ xCAT automatically runs a few postscripts and postbootscripts that are delivered Types of scripts ~~~~~~~~~~~~~~~~ -There are two types of scripts in the postscripts table ( postscripts and postbootscripts). The types are based on when in the install process they will be executed. Run the following for more information: +There are two types of scripts in the postscripts table ( postscripts and postbootscripts). The types are based on when in the install process they will be executed. Run the following for more information: ``man postscripts`` @@ -17,14 +17,14 @@ There are two types of scripts in the postscripts table ( postscripts and postbo * **[RHEL]** Postscripts will be run before the reboot. - + * **[SLES]** Postscripts will be run after the reboot but before the init.d process. For Linux diskless deployment, the postscripts will be run at the init.d time, and xCAT will automatically add the list of postscripts from the postbootscripts attribute to run after postscripts list. * **postbootscripts attribute** - list of postbootscripts that should be run on this Linux node at the init.d time after diskful installation reboot or diskless boot -* **xCAT**, by default, for diskful installs only runs the postbootscripts on the install and not on reboot. In xCAT a site table attribute runbootscripts is available to change this default behavior. If set to yes, then the postbootscripts will be run on install and on reboot. - +* **xCAT**, by default, for diskful installs only runs the postbootscripts on the install and not on reboot. In xCAT a site table attribute runbootscripts is available to change this default behavior. If set to yes, then the postbootscripts will be run on install and on reboot. + **xCAT automatically adds the postscripts from the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot.** Adding your own postscripts @@ -35,7 +35,7 @@ To add your own script, place it in /install/postscripts on the management node. To check what scripts will be run on your node during installation: :: lsdef node1 | grep scripts - postbootscripts=otherpkgs + postbootscripts=otherpkgs postscripts=syslog,remoteshell,syncfiles You can pass parameters to the postscripts. For example: :: @@ -47,7 +47,7 @@ You can pass parameters to the postscripts. For example: :: p1 p2 are the parameters to script1. Postscripts could be placed in the subdirectories in /install/postscripts on management node, and specify "subdir/postscriptname" in the postscripts table to run the postscripts in the subdirectories. This feature could be used to categorize the postscripts for different purposes. Here is an example: :: - + mkdir -p /install/postscripts/subdir1 mkdir -p /install/postscripts/subdir2 cp postscript1 /install/postscripts/subdir1/ @@ -69,7 +69,7 @@ We could write a script, say, /install/postscripts/nicbondscript, the nicbondscr [root@xcatmn ~]# -Then :: +Then :: chdef -p postbootscripts=nicbondscript @@ -239,7 +239,7 @@ If the site table precreatemypostscripts attribute is set to 1 or yes, it will i If the precreatemyposcripts attribute is yes, and a database change is made or xCAT code is upgraded, then you should run a new nodeset or updatenode to regenerate the /tftpboot/mypostscript/mypostscript.. file to pick up the latest database setting. The default for precreatemypostscripts is no/0. -When you run nodeset or updatenode, it will search the **/install/postscripts/mypostscript.tmpl** first. If the **/install/postscripts/mypostscript.tmpl** exists, it will use that template to generate the mypostscript for each node. Otherwise, it will use **/opt/xcat/share/xcat/mypostscript/mypostscript.tmpl**. +When you run nodeset or updatenode, it will search the **/install/postscripts/mypostscript.tmpl** first. If the **/install/postscripts/mypostscript.tmpl** exists, it will use that template to generate the mypostscript for each node. Otherwise, it will use **/opt/xcat/share/xcat/mypostscript/mypostscript.tmpl**. Content of the template for mypostscript @@ -247,7 +247,7 @@ Content of the template for mypostscript **The attributes that are defined in the shipped mypostscript.tmpl file** should not be removed. The xCAT default postscripts rely on that information to run successfully. **The following will explain the entries in the mypostscript.tmpl file**. -The SITE_TABLE_ALL_ATTRIBS_EXPORT line in the file directs the code to export all attributes defined in the site table. +The SITE_TABLE_ALL_ATTRIBS_EXPORT line in the file directs the code to export all attributes defined in the site table. Note: the attributes are not always defined exactly as in the site table to avoid conflict with other table attributes of the same name. For example, the site table master attribute is named SITEMASTER in the generated mypostscript file. :: #SITE_TABLE_ALL_ATTRIBS_EXPORT# @@ -257,7 +257,7 @@ The following line exports ENABLESSHBETWEENNODES by running the internal xCAT ro ENABLESSHBETWEENNODES=#Subroutine:xCAT::Template::enablesshbetweennodes:$NODE# export ENABLESSHBETWEENNODES -**tabdump()** is used to get all the information in the **** table :: +**tabdump()** is used to get all the information in the **** table :: tabdump(networks) @@ -446,7 +446,7 @@ Note: Type4 is not an open interface to add extensions to the templatel. **Type 5:** Get all the data from the specified table. The **** should not be a node table, like nodelist. This should be handles with TYPE 2 syntax to get specific attributes for the **$NODE**. tabdump would result in too much data for a nodetype table. Also the auditlog, eventlog should not be in tabdump for the same reason. site table should not be specified, it is already provided with the **#SITE_TABLE_ALL_ATTRIBS_EXPORT#** flag. It can be used to get the data from the two key tables (like switch). :: - The syntax is: + The syntax is: tabdump() @@ -479,10 +479,10 @@ If you want to remove an attribute that you have added, you should remove all th Test the new template '''''''''''''''''''''' -There are two quick ways to test the template. +There are two quick ways to test the template. #. -If the node is up: :: +If the node is up: :: updatenode -P syslog From 9dd56edfe372c54af650083e8dba9beedc585e86 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0189/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst --- .../deployment/prepostscripts/pre_script.rst | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst index 3bbeb566f..4ca419812 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst @@ -3,18 +3,18 @@ Using Prescript --------------- -The prescript table will allow you to run scripts before the install process. This can be helpful for performing advanced actions such as manipulating system services or configurations before beginning to install a node, or to prepare application servers for the addition of new nodes. Check the man page for more information. +The prescript table will allow you to run scripts before the install process. This can be helpful for performing advanced actions such as manipulating system services or configurations before beginning to install a node, or to prepare application servers for the addition of new nodes. Check the man page for more information. ``man prescripts`` The scripts will be run as root on the MASTER for the node. If there is a service node for the node, then the scripts will be run on the service node. -Identify the scripts to be run for each node by adding entries to the prescripts table: :: +Identify the scripts to be run for each node by adding entries to the prescripts table: :: tabedit prescripts - Or: + Or: chdef -t node -o prescripts-begin= prescripts-end= - Or: + Or: chdef -t group -o prescripts-begin= prescripts-end= tabdump prescripts @@ -22,19 +22,19 @@ Identify the scripts to be run for each node by adding entries to the prescripts begin or prescripts-begin - This attribute lists the scripts to be run at the beginning of the nodeset. end or prescripts-end - This attribute lists the scripts to be run at the end of the nodeset. - + Format for naming prescripts ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The general format for the prescripts-begin or prescripts-end attribute is: :: - [action1:]s1,s2...[|action2:s3,s4,s5...] + [action1:]s1,s2...[|action2:s3,s4,s5...] - where: + where: - - action1 and action2 are the nodeset actions ( 'install', 'netboot',etc) specified in the command . + - action1 and action2 are the nodeset actions ( 'install', 'netboot',etc) specified in the command . - - s1 and s2 are the scripts to run for _action1_ in order. + - s1 and s2 are the scripts to run for _action1_ in order. - s3, s4, and s5 are the scripts to run for action2. @@ -42,7 +42,7 @@ If actions are omitted, the scripts apply to all actions. Examples: - * myscript1,myscript2 - run scripts for all supported commands + * myscript1,myscript2 - run scripts for all supported commands * install:myscript1,myscript2|netboot:myscript3 Run scripts 1,2 for nodeset(install), runs script3 for nodeset(netboot). @@ -54,7 +54,7 @@ The following two environment variables will be passed to each script: * NODES - a comma separated list of node names on which to run the script * ACTION - current nodeset action. -By default, the script will be invoked once for all nodes. However, if **'#xCAT setting:MAX_INSTANCE=number'** is specified in the script, the script will be invoked for each node in parallel, but no more than number of instances specified in **number** will be invoked at at a time. +By default, the script will be invoked once for all nodes. However, if **'#xCAT setting:MAX_INSTANCE=number'** is specified in the script, the script will be invoked for each node in parallel, but no more than number of instances specified in **number** will be invoked at at a time. Exit values for prescripts ~~~~~~~~~~~~~~~~~~~~~~~~~~ From 2920620e5495ec7cc3caa967d0e016d8889a9dbc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0190/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst --- .../common/deployment/raid_cfg.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst index 752f38412..0efa6b9ff 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst @@ -14,7 +14,7 @@ xCAT provides a partition script `raid1_rh.sh ..................] resync = 12.8% (125356224/973998080) finish=138.1min speed=102389K/sec bitmap: 1/1 pages [64KB], 65536KB chunk - + unused devices: On the system with multipath configuration, the ``/proc/mdstat`` looks like: :: @@ -90,7 +90,7 @@ Deploy Diskful Nodes with RAID1 Setup on SLES xCAT provides one sample autoyast template files with the RAID1 settings ``/opt/xcat/share/xcat/install/sles/service.raid1.sles11.tmpl``. You can customize the template file and put it under ``/install/custom/install//`` if the default one does not match your requirements. -Here is the RAID1 partitioning section in service.raid1.sles11.tmpl: :: +Here is the RAID1 partitioning section in service.raid1.sles11.tmpl: :: From 1dd98e34ab996b01cf6e9fa4e4d103c5fa7f1ef1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0191/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst --- .../common/deployment/syncfile/syncfile_diskless.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst index 6aabb8994..bb19c11af 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst @@ -5,7 +5,7 @@ Different approaches are used to create the diskless image. The **Sync'ing** Fil The ``packimage`` command is used to prepare the root image files and package the root image. The Syncing File action is performed here. -Steps to make the Sync'ing File working in the packimage command: +Steps to make the Sync'ing File working in the packimage command: 1. Prepare the synclist file and put it into the appropriate location as describe above in (refer :ref:`the_localtion_of_synclist_file_for_updatenode_label`) 2. Run packimage as is normally done. From 84f83c26efecb71e1a1f8663d5bc3f934e4e3337 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0192/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst --- .../common/deployment/syncfile/syncfile_install.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst index f8b7d23da..5139616fa 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst @@ -15,7 +15,7 @@ The policy table must have the entry to allow syncfiles postscript to access the Hierarchy and Service Nodes ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If using Service nodes to manage you nodes, you should make sure that the service nodes have been synchronized with the latest files from the Management Node before installing. If you have a group of compute nodes (compute) that are going to be installed that are serviced by SN1, then run the following before the install to sync the current files to SN1. Note: the noderange is the compute node names, updatenode will figure out which service nodes need updating. +If using Service nodes to manage you nodes, you should make sure that the service nodes have been synchronized with the latest files from the Management Node before installing. If you have a group of compute nodes (compute) that are going to be installed that are serviced by SN1, then run the following before the install to sync the current files to SN1. Note: the noderange is the compute node names, updatenode will figure out which service nodes need updating. ``updatenode compute -f`` @@ -28,8 +28,8 @@ The 'syncfiles' postscript is in the defaults section of the postscripts table. * Create the synclist file with the entries indicating which files should be synced. (refer to :ref:`The_Format_of_synclist_file_label` ) * Put the synclist into the proper location for the node type (refer to :ref:`the_localtion_of_synclist_file_for_updatenode_label`) - -Make sure your postscripts table has the syncfiles postscript listed + +Make sure your postscripts table has the syncfiles postscript listed ``tabdump postscripts`` :: @@ -43,5 +43,5 @@ The diskless boot is similar with the diskful installation for the synchronizing Creating the synclist file as the steps in Diskful installation section, then the synced files will be synced to the os image during the packimage and mkdsklsnode commands running. -Also the files will always be re-synced during the booting up of the diskless node. +Also the files will always be re-synced during the booting up of the diskless node. From d0dbcfd8277c47cea7e65ff7686009871b128ca0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0193/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst --- .../common/deployment/syncfile/syncfile_periodically.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst index 512463eb8..adaa6b332 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst @@ -6,7 +6,7 @@ If the admins want to run the Syncing File action automatically or periodically, For example: Use the cron daemon to sync files in the **/install/custom///..synclist** to the nodegroup 'compute' every 10 minutes by the xdcp command by adding this to crontab. : :: - + */10 * * * * root /opt/xcat/bin/xdcp compute -F /install/custom///..synclist Use the cron daemon to sync files for the nodegroup 'compute' every 10 minutes by updatenode command. :: From 7bfc64cc84ce722154ff9a7f7f199d3999af7c6c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0194/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst --- .../syncfile/syncfile_synclist_file.rst | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst index 4cd8e81e4..13e599054 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst @@ -12,14 +12,14 @@ The synclist file contains the configuration entries that specify where the file The basic entry format looks like following: :: path_of_src_file1 -> path_of_dst_file1 - path_of_src_file1 -> path_of_dst_directory + path_of_src_file1 -> path_of_dst_directory path_of_src_file1 path_of_src_file2 ... -> path_of_dst_directory The path_of_src_file* should be the full path of the source file on the Management Node. The path_of_dst_file* should be the full path of the destination file on target node. Please make sure path_of_dst_file* is not a existing directory on target node, otherwise, the file sync with ``updatenode -r /usr/bin/scp`` or ``xdcp -r /usr/bin/scp`` will fail. -The path_of_dst_directory should be the full path of the destination directory. Please make sure *eth_of_dst_directory is not a existing file on target node, otherwise, the file sync with ``updatenode -r /usr/bin/scp`` or ``xdcp -r /usr/bin/scp`` will fail. +The path_of_dst_directory should be the full path of the destination directory. Please make sure *eth_of_dst_directory is not a existing file on target node, otherwise, the file sync with ``updatenode -r /usr/bin/scp`` or ``xdcp -r /usr/bin/scp`` will fail. Since the synclist file is for common purpose, the target node need not be configured in it. @@ -30,19 +30,19 @@ sync file **/etc/file2** to the file **/etc/file2** on the node (with same file /etc/file2 -> /etc/file2 sync file **/etc/file2** to the file **/etc/file3** on the node (with different file name) :: - - /etc/file2 -> /etc/file3 + + /etc/file2 -> /etc/file3 sync file **/etc/file4** to the file **/etc/tmp/file5** on the node( different file name and directory). The directory will be automatically created for you. :: /etc/file4 -> /etc/tmp/file5 sync the multiple files **/etc/file1**, **/etc/file2**, **/etc/file3**, ... to the directory **/tmp/etc** (**/tmp/etc** must be a directory when multiple files are synced at one time). If the directory does not exist,**xdcp** will create it. :: - + /etc/file1 /etc/file2 /etc/file3 -> /tmp/etc sync file **/etc/file2** to the file /etc/file2 on the node :: - + /etc/file2 -> /etc/ sync all files in **/home/mikev** to directory **/home/mikev** on the node :: @@ -54,34 +54,34 @@ Note: Don't try to sync files to the read only directory on the target node. An example of synclist file ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Assume a user wants to sync files to a node as following, the corresponding entries should be added in a synclist file. +Assume a user wants to sync files to a node as following, the corresponding entries should be added in a synclist file. Sync the file **/etc/common_hosts** to the two places on the target node: put one to the **/etc/hosts**, the other to the **/tmp/etc/hosts**. Following configuration entries should be added :: /etc/common_hosts -> /etc/hosts - /etc/common_hosts -> /tmp/etc/hosts - + /etc/common_hosts -> /tmp/etc/hosts + Sync files in the directory **/tmp/prog1** to the directory **/prog1** on the target node, and the postfix **'.tmpl'** needs to be removed on the target node. (directory **/tmp/prog1/** contains two files: **conf1.tmpl** and **conf2.tmpl**) Following configuration entries should be added :: /tmp/prog1/conf1.tmpl -> /prog1/conf1 /tmp/prog1/conf2.tmpl -> /prog1/conf2 Sync the files in the directory **/tmp/prog2** to the directory **/prog2** with same name on the target node. (directory **/tmp/prog2** contains two files: **conf1** and **conf2**) Following configuration entries should be added: :: - + /tmp/prog2/conf1 /tmp/prog2/conf2 -> /prog2 Sample synclist file :: - + /etc/common_hosts -> /etc/hosts /etc/common_hosts -> /tmp/etc/hosts /tmp/prog1/conf1.tmpl -> /prog1/conf1 /tmp/prog1/conf2.tmpl -> /prog1/conf2 /tmp/prog2/conf1 /tmp/prog2/conf2 -> /prog2 - /tmp/* -> /tmp/ - /etc/testfile -> /etc/ + /tmp/* -> /tmp/ + /etc/testfile -> /etc/ If the above syncfile is performed by the **updatenode/xdcp** commands, or performed in a node installation process, the following files will exist on the target node with the following contents. :: - + /etc/hosts(It has the same content with /etc/common_hosts on the MN) /tmp/etc/hosts(It has the same content with /etc/common_hosts on the MN) /prog1/conf1(It has the same content with /tmp/prog1/conf1.tmpl on the MN) @@ -109,12 +109,12 @@ The noderange would have several format. Following examples show that /etc/hosts postscript support ~~~~~~~~~~~~~~~~~~ -Putting the filename.post in the **rsyncfile** to ``rsync`` to the node is required for hierarchical clusters. It is optional for non-hierarchical cluster. +Putting the filename.post in the **rsyncfile** to ``rsync`` to the node is required for hierarchical clusters. It is optional for non-hierarchical cluster. -Advanced synclist file features +Advanced synclist file features '''''''''''''''''''''''''''''''''' -After you define the files to rsync in the syncfile, you can add an **EXECUTEALWAYS** clause in the syncfile. The **EXECUTEALWAYS** clause will list all the postscripts you would always like to run after the files are sync'd, whether or not any file is actually updated. The files in this list must be added to the list of files to rsync, if hierarchical. +After you define the files to rsync in the syncfile, you can add an **EXECUTEALWAYS** clause in the syncfile. The **EXECUTEALWAYS** clause will list all the postscripts you would always like to run after the files are sync'd, whether or not any file is actually updated. The files in this list must be added to the list of files to rsync, if hierarchical. For example, your rsyncfile may look like this. **Note: the path to the file to EXECUTE, is the location of the *.post file on the MN**. :: @@ -129,15 +129,15 @@ For example, your rsyncfile may look like this. **Note: the path to the file to EXECUTE: /tmp/share/file2.post /tmp/share/file3.post - EXECUTEALWAYS: + EXECUTEALWAYS: /tmp/myscript1 - /tmp/myscript2 + /tmp/myscript2 If **/tmp/file2** is updated on the node in **/tmp/file2**, then **/tmp/file2**.post is automatically run on that node. If **/tmp/file3** is updated on the node in **/tmp/filex**, then **/tmp/file3**.post is automatically run on that node. You can add an **APPEND** clause to your syncfile. -The **APPEND** clause is used to append the contents of the input file to an existing file on the node. The file to be appended must already exist on the node and not be part of the synclist that contains the **APPEND** clause. +The **APPEND** clause is used to append the contents of the input file to an existing file on the node. The file to be appended must already exist on the node and not be part of the synclist that contains the **APPEND** clause. For example, your synclist file may look like this: :: @@ -164,7 +164,7 @@ Note:no order of execution may be assumed by the order that the **EXECUTE,EXECUT You can add an **MERGE** clause to your syncfile. This is only supported on Linux. -The **MERGE** clause is used to append the contents of the input file to either the **/etc/passwd**, **/etc/shadow** or **/etc/group** files. They are the only supported files. You must not put the **/etc/passwd**, **/etc/shadow**, **/etc/group** files in an **APPEND** clause if using a **MERGE** clause. For these three file you should use a **MERGE** clause. The **APPEND** will add the information to the end of the file. The **MERGE** will add or replace the information and insure that there are no duplicate entries in these files. +The **MERGE** clause is used to append the contents of the input file to either the **/etc/passwd**, **/etc/shadow** or **/etc/group** files. They are the only supported files. You must not put the **/etc/passwd**, **/etc/shadow**, **/etc/group** files in an **APPEND** clause if using a **MERGE** clause. For these three file you should use a **MERGE** clause. The **APPEND** will add the information to the end of the file. The **MERGE** will add or replace the information and insure that there are no duplicate entries in these files. For example, your synclist file may look like this :: @@ -184,16 +184,16 @@ For example, your synclist file may look like this :: /etc/mydir/mergeshadow -> /etc/shadow /etc/mydir/mergegroup -> /etc/group -When you use the **MERGE** clause, the file (left) of the arrow is merged into the file right of the arrow. It will replace any common userid's found in those files and add new userids. The /opt/xcat/share/xcat/scripts/xdcpmerge.sh is used to accomplish this. +When you use the **MERGE** clause, the file (left) of the arrow is merged into the file right of the arrow. It will replace any common userid's found in those files and add new userids. The /opt/xcat/share/xcat/scripts/xdcpmerge.sh is used to accomplish this. -Note: no order of execution may be assumed by the order that the **EXECUTE,EXECUTEALWAYS,APPEND and MERGE** clause fall in the synclist file. +Note: no order of execution may be assumed by the order that the **EXECUTE,EXECUTEALWAYS,APPEND and MERGE** clause fall in the synclist file. .. _the_localtion_of_synclist_file_for_updatenode_label: The location of synclist file for updatenode and install process ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In the installation process or updatenode process, xCAT needs to figure out the location of the synclist file automatically, so the synclist should be put into the specified place with the proper name. +In the installation process or updatenode process, xCAT needs to figure out the location of the synclist file automatically, so the synclist should be put into the specified place with the proper name. If the provisioning method for the node is an osimage name, then the path to the synclist will be read from the osimage definition synclists attribute. You can display this information by running the following command, supplying your osimage name. :: @@ -212,7 +212,7 @@ If the provisioning method for the node is an osimage name, then the path to the rootimgdir=/install/netboot///compute **synclists=/install/custom/netboot/compute.synclist** -You can set the synclist path using the following command :: +You can set the synclist path using the following command :: chdef -t osimage -o --netboot-compute synclists="/install/custom/netboot/compute.synclist From 6db7621b75bd92016374eb4c754b1b6712f51bba Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0195/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst --- .../common/deployment/syncfile/syncfile_xdcp.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst index 184cd3261..20d1bb84c 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst @@ -17,14 +17,14 @@ Specifies the full path to the install image on the local node. By default, if t For example: :: - Using xdcp '-F' option to sync files which are listed in the /install/custom/commonsyncfiles/.synclist directory to the node group named 'compute'. If the node group compute is serviced by servicenodes, then the files will be automatically staged to the correct service nodes, and then synced to the compute nodes from those service nodes. The files will be stored in /var/xcat/syncfiles directory on the service nodes by default, or in the directory indicated in the site.SNsyncfiledir attribute. See -s option below. + Using xdcp '-F' option to sync files which are listed in the /install/custom/commonsyncfiles/.synclist directory to the node group named 'compute'. If the node group compute is serviced by servicenodes, then the files will be automatically staged to the correct service nodes, and then synced to the compute nodes from those service nodes. The files will be stored in /var/xcat/syncfiles directory on the service nodes by default, or in the directory indicated in the site.SNsyncfiledir attribute. See -s option below. xdcp compute -F /install/custom/commonsynfiles/.synclist For Linux nodes, using **xdcp '-i'** option with **'-F'** to sync files created in the **/install/custom//.synclist** to the osimage in the directory **/install/////rootimg**: :: - + xdcp -i /install/////rootimg -F /install/custom///.synclist Using the **xdcp '-s'** option to sync the files only to the service nodes for the node group named 'compute'. The files will be placed in the default **/var/xcat/syncfiles** directory or in the directory as indicated in the **site.SNsyncfiledir** attribute. If you want the files synched to the same directory on the service node that they come from on the Management Node, set **site.SNsyncfiledir=/**. This can be setup before a node install, to have the files available to be synced during the install: :: - + xdcp compute -s -F /install/custom///.synclist From 1c2b75163cc964acccfc2f171435e08fe482f8f9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0196/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst --- .../common/deployment/trim_diskless_rootimg.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst index e417ca402..3bc1e2d32 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst @@ -6,7 +6,7 @@ To reduce the memory and boot-up time for the diskless node, the initrd and root Exclude list ------------ -xCAT provides an attribute ``exlist`` in the **osimage** object definition, that allows the user to select files to exclude when building the ``rootimg.gz`` file for the diskless node. +xCAT provides an attribute ``exlist`` in the **osimage** object definition, that allows the user to select files to exclude when building the ``rootimg.gz`` file for the diskless node. Take the osimage **sles12.1-ppc64le-netboot-compute** for example:: @@ -29,7 +29,7 @@ The following is a sample of ``exlist`` file :: +./usr/share/X11/locale/C* ... -The content above presents some syntax supported in exlist file: +The content above presents some syntax supported in exlist file: * Exclude files:: @@ -54,10 +54,10 @@ The content above presents some syntax supported in exlist file: It is useful to include files following an exclude entry to quickly remove a larger set of files using a wildcard and then adding back the few necessary files using the + sign. In the above example, all the files and sub-directories matching the pattern ``/usr/share/locale/C*`` will be included in the ``rootimg.gz`` file. -Customize the ``exlist`` file and the osimage definition +Customize the ``exlist`` file and the osimage definition -------------------------------------------------------- -Check the default exlist file and make sure: +Check the default exlist file and make sure: * all files and directories you do not want in the image will be excluded from the rootimg. @@ -68,10 +68,10 @@ If you want to customize the osimage ``sles12.1-ppc64le-netboot-compute`` with y #create a customized exlist file based on the default one cp /opt/xcat/share/xcat/netboot/sles/compute.sles12.ppc64le.exlist /install/custom/netboot/sles/compute.sles12.ppc64le.exlist - + #edit the newly created exlist file according to your need - vi /install/custom/netboot/sles/compute.sles12.ppc64le.exlist - + vi /install/custom/netboot/sles/compute.sles12.ppc64le.exlist + #specify the newly created exlist file in the osimage definition chdef -t osimage -o sles12.1-ppc64le-netboot-compute exlist=/install/custom/netboot/sles/compute.sles12.ppc64le.exlist From d7a6256455dc84ba6210812f216667eb74d901ad Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0197/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst --- .../manage_clusters/common/deployment/use_kernel_patch.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst index 6ad4b7782..f2c4f4b65 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst @@ -15,10 +15,10 @@ The RPM names below are only examples, substitute your specific level and archit #. Inject the drivers from the new kernel RPMs into the initrd :: - mkdef -t osdistroupdate kernelupdate dirpath=/install/kernels// + mkdef -t osdistroupdate kernelupdate dirpath=/install/kernels// chdef -t osimage rhels7.3-ppc64le-install-compute osupdatename=kernelupdate chdef -t osimage rhels7.3-ppc64le-install-compute netdrivers=updateonly genitrd rhels7.3-ppc64le-install-compute --ignorekernelchk - nodeset osimage=rhels7.3-ppc64le-install-compute --noupdateinitrd + nodeset osimage=rhels7.3-ppc64le-install-compute --noupdateinitrd #. Boot CN from net normallly. From 90f5fc1503858b50ef164366ad357b3797b94a76 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0198/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst --- .../manage_clusters/common/kvm/manage_vm.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst b/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst index 16d6012d9..a40b77e1f 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst @@ -20,10 +20,10 @@ Update DNS configuration and database: :: makedns -n makedns -a -Specify VM attributes +Specify VM attributes ````````````````````` -After the VM object is created, several key attributes need to be specified with ``chdef`` : +After the VM object is created, several key attributes need to be specified with ``chdef`` : 1. the hardware management module, "kvm" for PowerKVM: :: @@ -34,21 +34,21 @@ After the VM object is created, several key attributes need to be specified with chdef vm1 vmcpus=2 3. the kvm hypervisor of the VM: :: - + chdef vm1 vmhost=kvmhost1 4. the virtual memory size, with the unit "Megabit". Specify 1GB memory to "vm1" here: :: chdef vm1 vmmemory=1024 -**Note**: For diskless node, the **vmmemory** should be at least 2048 MB, otherwise the node cannot boot up. +**Note**: For diskless node, the **vmmemory** should be at least 2048 MB, otherwise the node cannot boot up. 5. Define the virtual network card, it should be set to the bridge "br0" which has been created in the hypervisor. If no bridge is specified, no network device will be created for the VM node "vm1": :: chdef vm1 vmnics=br0 6. The **vmnicnicmodel** attribute is used to set the type and corresponding driver for the nic. If not set, the default value is 'virtio'. - :: + :: chdef vm1 vmnicnicmodel=virtio @@ -72,7 +72,7 @@ After the VM object is created, several key attributes need to be specified with chdef vm1 vmstorage=dir:///var/lib/libvirt/images - **Note**: The attribute **vmstorage** is only valid for diskful VM node. + **Note**: The attribute **vmstorage** is only valid for diskful VM node. 8. Define the **console** attributes for VM: :: @@ -84,13 +84,13 @@ After the VM object is created, several key attributes need to be specified with 10. (optional)For assigning PCI devices to the VM, set **othersettings** value: :: - chtab node=vm1 vm.othersettings="devpassthrough:0000:01:00.2" + chtab node=vm1 vm.othersettings="devpassthrough:0000:01:00.2" Or: :: chtab node=vm1 vm.othersettings="devpassthrough:pci_0000_01_00_2" - Take assigning SR-IOV VFs to the VM as an example: + Take assigning SR-IOV VFs to the VM as an example: * Use ``lspci`` to get VFs PCI from hypervisor: :: @@ -99,17 +99,17 @@ After the VM object is created, several key attributes need to be specified with 0000:01:00.2 Infiniband controller: Mellanox Technologies MT27700 Family [ConnectX-4 Virtual Function] * Set the VFs PCI into ``vm`` table on MN: :: - + chtab node=vm1 vm.othersettings="devpassthrough:0000:01:00.1,0000:01:00.2" 11. Set **netboot** attribute * **[x86_64]** :: - + chdef vm1 netboot=xnba * **[PPC64LE]** :: - + chdef vm1 netboot=grub2 Make sure "grub2" had been installed on the management node: :: @@ -118,7 +118,7 @@ After the VM object is created, several key attributes need to be specified with grub2-xcat-1.0-1.noarch -Make virtual machine +Make virtual machine ```````````````````` If **vmstorage** is a NFS mounted directory or a device on hypervisor, run :: @@ -128,7 +128,7 @@ If **vmstorage** is a NFS mounted directory or a device on hypervisor, run :: To create the virtual machine "vm1" with 20G hard disk on a hypervisor directory, run :: mkvm vm1 -s 20G - + When "vm1" is created successfully, a VM hard disk file with a name like "vm1.sda.qcow2" will be found in the location specified by **vmstorage**. What's more, the **mac** attribute of "vm1" is set automatically, check it with: :: lsdef vm1 -i mac @@ -145,14 +145,14 @@ or running the following command on the kvm hypervisor "kvmhost1" :: #virsh list Id Name State - -------------------------------- + -------------------------------- 6 vm1 running Monitoring the Virtual Machine `````````````````````````````` -When the VM has been created and powered on, choose one of the following methods to monitor and access it. +When the VM has been created and powered on, choose one of the following methods to monitor and access it. * Open the console on kvm hypervisor: :: @@ -176,11 +176,11 @@ When the VM has been created and powered on, choose one of the following methods vm1: server: kvmhost1 vm1: vidport: 5900 - **Note**: Now just pick a favorite vnc client to connect the hypervisor, with the password generated by ``getrvidparms``. If the vnc client complains "the password is not valid", the reason might be that the hypervisor and headnode clocks are out of sync! Please try to sync them by running ``ntpdate `` on both the hypervisor and the headnode. + **Note**: Now just pick a favorite vnc client to connect the hypervisor, with the password generated by ``getrvidparms``. If the vnc client complains "the password is not valid", the reason might be that the hypervisor and headnode clocks are out of sync! Please try to sync them by running ``ntpdate `` on both the hypervisor and the headnode. * Use wvid on management node - + Make sure **firewalld** service is stopped, disable it if not: :: chkconfig firewalld off @@ -212,14 +212,14 @@ Remove the definition of "vm1" and related storage: :: Clone the virtual machine ------------------------- -**Clone** is an operation that creating a VM from an existed one by inheriting most of its attributes and data. +**Clone** is an operation that creating a VM from an existed one by inheriting most of its attributes and data. The general step of **clone** a VM is like this: first creating a **VM master** , then creating a VM with the newly created **VM master** in **attaching** or **detaching** mode. **In attaching mode** -In this mode, all the newly created VMs are attached to the VM master. Since the image of the newly created VM only includes the differences from the VM master, which requires less disk space. The newly created VMs can NOT run without the VM master. +In this mode, all the newly created VMs are attached to the VM master. Since the image of the newly created VM only includes the differences from the VM master, which requires less disk space. The newly created VMs can NOT run without the VM master. An example is shown below: @@ -233,7 +233,7 @@ Create the VM master "vm5" from a VM node "vm1": :: The newly created VM master "vm5" can be found in the **vmmaster** table. :: - #tabdump vmmaster + #tabdump vmmaster name,os,arch,profile,storage,storagemodel,nics,vintage,originator,comments,disable "vm5","","","compute","nfs:///vms/kvm",,"br0","","root",, From 44abebf12831c8e73945b0f31eb4a38ffeade96f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0199/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst --- .../admin-guides/manage_clusters/common/management/rbeacon.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst index a55f4e30b..f656ba5aa 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst @@ -1,2 +1,2 @@ ``rbeacon`` -=========== \ No newline at end of file +=========== From 82f42d644d5e0d2a73bac14ac6d21cc894e770a8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0200/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst --- .../admin-guides/manage_clusters/common/management/rcons.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst index 0857a2db7..b844b0d96 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst @@ -1,2 +1,2 @@ ``rcons`` -========= \ No newline at end of file +========= From 7b74a0d22a2f853743361ca9f2b83a00da5c9688 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0201/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst --- .../admin-guides/manage_clusters/common/management/renergy.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst index 3ca21667a..bfb747e51 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst @@ -1,2 +1,2 @@ ``renergy`` -=========== \ No newline at end of file +=========== From 7a02f415d2ee9509713de0695cfb9535f9543b68 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0202/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst --- .../manage_clusters/common/management/reventlog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst index b701de10a..7c905b2d0 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst @@ -1,2 +1,2 @@ ``reventlog`` -============= \ No newline at end of file +============= From 8335245ed3620383c65b0b715dddbacdb105493d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0203/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst --- .../admin-guides/manage_clusters/common/management/rflash.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst index 438bb80cf..904c5e12c 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst @@ -1,2 +1,2 @@ ``rflash`` -========== \ No newline at end of file +========== From 0e51c8f8827a1a3bb0e19707cf6e3f06f61fc417 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0204/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst --- .../admin-guides/manage_clusters/common/management/rinv.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst index dad597a14..b217aa9fc 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst @@ -1,2 +1,2 @@ ``rinv`` -======== \ No newline at end of file +======== From 78d9f77f4be9036f2c2506a070760bc3e6b47348 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0205/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst --- .../admin-guides/manage_clusters/common/management/rpower.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst index 06329fba8..e60dd550d 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst @@ -4,7 +4,7 @@ rpower1 ------- -Here is some common rpower information! +Here is some common rpower information! rpower2 ------- From 9aa3c7e783b637efcf692ba08860e139a709caa4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0206/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst --- .../manage_clusters/common/management/rspconfig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst index 7506db83c..e4fcb85f9 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst @@ -1,2 +1,2 @@ ``rspconfig`` -============= \ No newline at end of file +============= From e5bcc9fdcd5edb896416f02d87dd8de3057a4dce Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0207/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst --- .../admin-guides/manage_clusters/common/management/rvitals.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst index f60600b93..997c5c70a 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst @@ -1,2 +1,2 @@ ``rvitals`` -=========== \ No newline at end of file +=========== From eff49a6a2b98fdd62198a8e102df487fb17309cd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0208/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst --- .../guides/admin-guides/manage_clusters/common/parallel_cmd.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst b/docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst index f1ad71ba3..07b52060a 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst @@ -3,7 +3,7 @@ Parallel Commands xCAT provides a set of commands that can run common remote commands (``ssh, scp, rsh, rcp, rsync, ping, cons``) in parallel on xCAT managed nodes. The xCAT commands will format the output making the results easier to parse and help administrators manage large clusters. -The following commands are provided: +The following commands are provided: * ``pcons`` - runs a command on the noderange using the out-of-band console * ``pping`` - parallel ping From 0373587c77a2f5f0af14aedf66336cc47f6f652b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0209/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst --- .../admin-guides/manage_clusters/common/updatenode.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst b/docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst index 5a505a57b..e31ba49b8 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst @@ -16,7 +16,7 @@ Each of these will be explained in the document. The basic way to use ``updateno Most of what is described in this document applies to **stateful** and **stateless** nodes. In addition to the information in this document, check out the ``updatenode`` man page. -Add Additional Software +Add Additional Software ------------------------- The packages that will be installed on the node are stored in the packages list files. There are **two kinds of package list files**: @@ -64,13 +64,13 @@ Updatenode can also be used in Sysclone environment to push delta changes to tar updatenode -S -Rerun Postscripts or Run Additional Postcripts +Rerun Postscripts or Run Additional Postcripts -------------------------------------------------------------------------- You can use the ``updatenode`` command to perform the following functions after the nodes are up and running: * Rerun postscripts defined in the postscripts table. - * Run any additional postscript one time. + * Run any additional postscript one time. Go to :ref:`Using-Postscript-label` to see how to configure postscript. @@ -99,7 +99,7 @@ You can customize what attributes you want made available to the postscript, usi Synchronize new/updated configuration files ------------------------------------------- -Setting up syncfile +Setting up syncfile ``````````````````` Use instructions in doc: :ref:`The_synclist_file`. From b485d765f57cc3dd8bf52c45e92c7c1a7ece5e24 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0210/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst --- .../admin-guides/manage_clusters/ppc64le/configure/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst index 766981112..705eff054 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst @@ -2,7 +2,7 @@ Configure xCAT ============== After installing xCAT onto the management node, configure some basic attributes for your cluster into xCAT. - + .. toctree:: :maxdepth: 2 From 511066e01acfc9b2cc0d01667cbc3671824a42d1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0211/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst --- .../ppc64le/configure/networks.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst index 7d10ecd29..806f751bd 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst @@ -1,8 +1,8 @@ -Set attributes in the ``networks`` table +Set attributes in the ``networks`` table ======================================== #. Display the network settings defined in the xCAT ``networks`` table using: ``tabdump networks`` :: - + #netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers, dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,mtu, comments,disable @@ -26,7 +26,7 @@ Set attributes in the ``networks`` table makenetworks -#. Verify the network statements +#. Verify the network statements **Domain** and **nameserver** attributes must be configured in the ``networks`` table or in the ``site`` table for xCAT to function properly. @@ -37,7 +37,7 @@ Initialize DHCP services Configure DHCP to listen on different network interfaces [**Optional**] - The default behavior of xCAT is to configure DHCP to listen on all interfaces defined in the ``networks`` table. + The default behavior of xCAT is to configure DHCP to listen on all interfaces defined in the ``networks`` table. The ``dhcpinterfaces`` keyword in the ``site`` table allows administrators to limit the interfaces that DHCP will listen over. If the management node has 4 interfaces, (eth0, eth1, eth2, and eth3), and you want DHCP to listen only on "eth1" and "eth3", set ``dhcpinterfaces`` using: :: @@ -54,14 +54,14 @@ Configure DHCP to listen on different network interfaces [**Optional**] **noboot** `````````` For the *IBM OpenPOWER S822LC for HPC ("Minsky")* nodes, the BMC and compute "eth0" share the left-side integrated ethernet port and compute "eth1" is the right-side integrated ethernet port. For these servers, it is recommended to use two physical cables allowing the BMC port to be dedicated and "eth1" used by the OS. When an open range is configured on the two networks, the xCAT Genesis kernel will be sent to the BMC interface and causes problems during hardware discovery. To support this scenario, on the xCAT management node, if "eth1" is connected to the BMC network and "eth3" is connected to the compute network, disable genesis boot for the BMC network by setting ``:noboot`` in ``dhcpinterfaces`` using: :: - - chdef -t site dhcpinterfaces="eth1:noboot,eth3" - # run the mknb command to remove the genesis + chdef -t site dhcpinterfaces="eth1:noboot,eth3" + + # run the mknb command to remove the genesis # configuration file for the specified network mknb ppc64 - + For more information, see ``dhcpinterfaces`` keyword in the :doc:`site ` table. From 046e2973307f86da669ed984691db155da96f177 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0212/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst --- .../manage_clusters/ppc64le/configure/password.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst index 362a1abcd..91f2b0f8b 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst @@ -14,7 +14,7 @@ Configure passwords #. Configure the passwords for Management modules of the compute nodes. - * For OpenBMC managed systems: :: + * For OpenBMC managed systems: :: chtab key=openbmc passwd.username=root passwd.password=0penBmc @@ -24,13 +24,13 @@ Configure passwords * For HMC managed systems: :: - chtab key=hmc passwd.username=hscroot passwd.password=abc123 + chtab key=hmc passwd.username=hscroot passwd.password=abc123 If the username/password is different for multiple HMCs, set the ``username`` and ``password`` attribute for each HMC node object in xCAT * For Blade managed systems: :: - chtab key=blade passwd.username=USERID passwd.password=PASSW0RD + chtab key=blade passwd.username=USERID passwd.password=PASSW0RD * For FSP/BPA (Flexible Service Processor/Bulk Power Assembly) the factory default passwords must be changed before running commands against them. :: @@ -52,7 +52,7 @@ Configure passwords #. Set a policy in the xCAT ``policy`` table to allow the user to make calls against xCAT. :: - mkdef -t policy 6 name=xcatws rule=allow + mkdef -t policy 6 name=xcatws rule=allow When making calls to the xCAT REST API, pass in the credentials using the following attributes: ``userName`` and ``userPW`` From 2d03cfb19b4f1ca52f8dfba57eb3e078bc41fff3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0213/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst --- .../admin-guides/manage_clusters/ppc64le/configure/site.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst index 49911d4d2..d8193e778 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst @@ -1,7 +1,7 @@ Set attributes in the ``site`` table ==================================== -#. Verify the following attributes have been correctly set in the xCAT ``site`` table. +#. Verify the following attributes have been correctly set in the xCAT ``site`` table. * domain * forwarders @@ -24,13 +24,13 @@ Initialize DNS services #. Initialize the DNS [#]_ services on the xCAT Management Node: :: - makedns -n + makedns -n Verify DNS is working by running ``nslookup`` against your Management Node: :: nslookup For more information on DNS, refer to :ref:`dns_label` - + .. [#] Setting up name resolution and the ability to have hostname resolved to IP addresses is **required** for xCAT. From e2411af854fd243362fba3947a3060d883a51359 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0214/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst --- .../ppc64le/discovery/config_environment.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst index 18098e0c4..a8ea81228 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst @@ -48,10 +48,10 @@ For hardware management with ipmi, add the following line:: Verify the genesis packages ``````````````````````````` -The **xcat-genesis** packages should have been installed when xCAT was installed, but would cause problems if missing. **xcat-genesis** packages are required to create the genesis root image to do hardware discovery and the genesis kernel sits in ``/tftpboot/xcat/``. Verify that the ``genesis-scripts`` and ``genesis-base`` packages are installed: +The **xcat-genesis** packages should have been installed when xCAT was installed, but would cause problems if missing. **xcat-genesis** packages are required to create the genesis root image to do hardware discovery and the genesis kernel sits in ``/tftpboot/xcat/``. Verify that the ``genesis-scripts`` and ``genesis-base`` packages are installed: * **[RHEL/SLES]**: ``rpm -qa | grep -i genesis`` -* **[Ubuntu]**: ``dpkg -l | grep -i genesis`` +* **[Ubuntu]**: ``dpkg -l | grep -i genesis`` -If missing, install them from the ``xcat-deps`` package and run ``mknb ppc64`` to create the genesis network boot root image. +If missing, install them from the ``xcat-deps`` package and run ``mknb ppc64`` to create the genesis network boot root image. From 0662ec8aede4a4a1e6a7007496498632cee41609 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0215/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst --- .../ppc64le/discovery/manually_define.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst index 01150949d..c0e7a156c 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst @@ -34,7 +34,7 @@ The manually defined node will be like this:: ``mkdef --template`` can be used to create node definitions easily from the typical node definition templates or existing node definitions, some examples: * creating node definition "cn2" with an existing node definition "cn1" :: - + # mkdef -t node -o cn2 --template cn1 mac=66:55:44:33:22:11 ip=172.12.139.2 bmc=172.11.139.2 1 object definitions have been created or modified. @@ -45,16 +45,16 @@ The manually defined node will be like this:: # mkdef -t node -o cn2 --template ppc64le-openbmc-template mac=66:55:44:33:22:11 ip=172.12.139.2 bmc=172.11.139.2 bmcpassword=USERID bmcusername=PASSW0RD 1 object definitions have been created or modified. - the unspecified attributes of newly created node "cn2" will be assigned with the default values in the template + the unspecified attributes of newly created node "cn2" will be assigned with the default values in the template to list all the node definition templates available in xCAT, run :: - # lsdef -t node --template + # lsdef -t node --template to display the full definition of template "ppc64le-openbmc-template", run :: - - # lsdef -t node --template ppc64le-openbmc-template - the mandatory attributes, which must be specified while creating definitions with templates, are denoted with the value ``MANDATORY:`` in template definition. + # lsdef -t node --template ppc64le-openbmc-template + + the mandatory attributes, which must be specified while creating definitions with templates, are denoted with the value ``MANDATORY:`` in template definition. the optional attributes, which can be specified optionally, are denoted with the value ``OPTIONAL:`` in template definition From d853bc621b20ce8b77239229465317ce82324356 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0216/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst --- .../ppc64le/discovery/manually_discovery.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst index 6568422e9..13c1856a0 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst @@ -5,10 +5,10 @@ If you have a few nodes which were not discovered by automated hardware discover Display the undefined nodes with the ``nodediscoverls`` command:: #nodediscoverls -t undef - UUID NODE METHOD MTM SERIAL + UUID NODE METHOD MTM SERIAL fa2cec8a-b724-4840-82c7-3313811788cd undef undef 8247-22L 10112CA -If you want to manually define an 'undefined' node to a specific free node name, use the nodediscoverdef(TODO) command. +If you want to manually define an 'undefined' node to a specific free node name, use the nodediscoverdef(TODO) command. Before doing that, a node with desired IP address for host and FSP/BMC must be defined first:: @@ -22,6 +22,6 @@ For example, if you want to assign the undefined node whose uuid is ``fa2cec8a-b After manually defining it, the 'node name' and 'discovery method' attributes of the node will be changed. You can display the changed attributes using the ``nodediscoverls`` command:: #nodediscoverls - UUID NODE METHOD MTM SERIAL + UUID NODE METHOD MTM SERIAL fa2cec8a-b724-4840-82c7-3313811788cd cn1 manual 8247-22L 10112CA From 9c6dd004f67594ecbc58afc2d464cc54ae48aa40 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0217/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst --- .../manage_clusters/ppc64le/discovery/mtms/discovery.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst index 45e69d072..f4857bedb 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst @@ -3,7 +3,7 @@ Discovery When the IPMI-based servers are connected to power, the BMCs will boot up and attempt to obtain an IP address from an open range dhcp server on your network. In the case for xCAT managed networks, xCAT should be configured serve an open range dhcp IP addresses with the ``dynamicrange`` attribute in the networks table. -When the BMCs have an IP address and is pingable from the xCAT management node, administrators can discover the BMCs using the xCAT's :doc:`bmcdiscover ` command and obtain basic information to start the hardware discovery process. +When the BMCs have an IP address and is pingable from the xCAT management node, administrators can discover the BMCs using the xCAT's :doc:`bmcdiscover ` command and obtain basic information to start the hardware discovery process. xCAT Hardware discover uses the xCAT genesis kernel (diskless) to discover additional attributes of the compute node and automatically populate the node definitions in xCAT. From c5879ad9a9ff18676e6f8b4baf2dcb78dc9748a6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0218/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst --- .../mtms/discovery_using_defined.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst index 26042970c..03a207d8e 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst @@ -1,7 +1,7 @@ -Set static BMC IP using different IP address (recommended) +Set static BMC IP using different IP address (recommended) ========================================================== -The following example outlines the MTMS based hardware discovery for a single IPMI-based compute node. +The following example outlines the MTMS based hardware discovery for a single IPMI-based compute node. +------------------------------+------------+ | Compute Node Information | Value | @@ -27,7 +27,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi #. Detect the BMCs and add the node definitions into xCAT. - Use the :doc:`bmcdiscover ` command to discover the BMCs responding over an IP range and write the output into the xCAT database. This discovered BMC node is used to control the physical server during hardware discovery and will be deleted after the correct server node object is matched to a pre-defined node. You **must** use the ``-w`` option to write the output into the xCAT database. + Use the :doc:`bmcdiscover ` command to discover the BMCs responding over an IP range and write the output into the xCAT database. This discovered BMC node is used to control the physical server during hardware discovery and will be deleted after the correct server node object is matched to a pre-defined node. You **must** use the ``-w`` option to write the output into the xCAT database. To discover the BMC with an IP address range of 50.0.100.1-100: :: @@ -61,7 +61,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi serial=10112CA -#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``. +#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``. #. Edit the ``predefined.stanzas`` file: :: @@ -91,11 +91,11 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi mgt=ipmi mtm=8247-22L serial=10112CA - ip=10.0.101.1 + ip=10.0.101.1 #. Define the compute nodes into xCAT: :: - cat predefined.stanzas | mkdef -z + cat predefined.stanzas | mkdef -z #. Set the chain table to run the ``bmcsetup`` script, this will set the BMC IP to static. :: @@ -113,9 +113,9 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi chdef cn01 -p chain="osimage=" -#. Change the BMC IP address +#. Change the BMC IP address - Set the BMC IP address to a different value for the **predefined** compute node definitions. + Set the BMC IP address to a different value for the **predefined** compute node definitions. To change the dhcp obtained IP address of 50.0.100.1 to a static IP address of 50.0.101.1, run the following command: :: @@ -133,7 +133,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi #. Refresh the DNS configuration for the new hosts: :: - makedns -n + makedns -n #. **[Optional]** Monitor the node discovery process using rcons @@ -150,4 +150,4 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi rsetboot node-8247-22l-10112ca net rpower node-8247-22l-10112ca on -#. The discovery process will network boot the machine into the diskless xCAT genesis kernel and perform the discovery process. When the discovery process is complete, doing ``lsdef`` on the compute nodes should show discovered attributes for the machine. The important ``mac`` information should be discovered, which is necessary for xCAT to perform OS provisioning. +#. The discovery process will network boot the machine into the diskless xCAT genesis kernel and perform the discovery process. When the discovery process is complete, doing ``lsdef`` on the compute nodes should show discovered attributes for the machine. The important ``mac`` information should be discovered, which is necessary for xCAT to perform OS provisioning. From 0c07c253aab200adc725225da5aec6a49a429ae5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0219/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst --- .../ppc64le/discovery/mtms/discovery_using_dhcp.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst index 17a7843c9..3bc786f7a 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst @@ -1,7 +1,7 @@ Set static BMC IP using dhcp provided IP address ================================================ -The following example outlines the MTMS based hardware discovery for a single IPMI-based compute node. +The following example outlines the MTMS based hardware discovery for a single IPMI-based compute node. +------------------------------+------------+ | Compute Node Information | Value | @@ -15,7 +15,7 @@ The following example outlines the MTMS based hardware discovery for a single IP | IP address | 10.0.101.1 | +------------------------------+------------+ -The BMC IP address is obtained by the open range dhcp server and the plan is to leave the IP address the same, except we want to change the IP address to be static in the BMC. +The BMC IP address is obtained by the open range dhcp server and the plan is to leave the IP address the same, except we want to change the IP address to be static in the BMC. +------------------------------+------------+ | BMC Information | Value | @@ -47,7 +47,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to serial=10112CA -#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``. +#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``. #. Edit the ``predefined.stanzas`` file: :: @@ -79,7 +79,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to #. Define the compute nodes into xCAT: :: - cat predefined.stanzas | mkdef -z + cat predefined.stanzas | mkdef -z #. Set the chain table to run the ``bmcsetup`` script, this will set the BMC IP to static. :: @@ -103,7 +103,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to #. Refresh the DNS configuration for the new hosts: :: - makedns -n + makedns -n #. **[Optional]** Monitor the node discovery process using rcons @@ -120,5 +120,5 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to rsetboot cn01 net rpower cn01 on -#. The discovery process will network boot the machine into the diskless xCAT genesis kernel and perform the discovery process. When the discovery process is complete, doing ``lsdef`` on the compute nodes should show discovered attributes for the machine. The important ``mac`` information should be discovered, which is necessary for xCAT to perform OS provisioning. +#. The discovery process will network boot the machine into the diskless xCAT genesis kernel and perform the discovery process. When the discovery process is complete, doing ``lsdef`` on the compute nodes should show discovered attributes for the machine. The important ``mac`` information should be discovered, which is necessary for xCAT to perform OS provisioning. From 3ffc177940021c835ec34ed4d08d2398a3e775cf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0220/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst --- .../manage_clusters/ppc64le/discovery/mtms/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst index c4c998c9e..d9c41254e 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst @@ -1,7 +1,7 @@ MTMS-based Discovery ==================== -MTMS stands for **M**\ achine **T**\ ype/\ **M**\ odel and **S**\ erial. This is one way to uniquely identify each physical server. +MTMS stands for **M**\ achine **T**\ ype/\ **M**\ odel and **S**\ erial. This is one way to uniquely identify each physical server. MTMS-based hardware discovery assumes the administrator has the model type and serial number information for the physical servers and a plan for mapping the servers to intended hostname/IP addresses. @@ -24,4 +24,4 @@ MTMS-based hardware discovery assumes the administrator has the model type and s :maxdepth: 2 verification.rst - discovery.rst + discovery.rst From cd37dbe00ada09a936f5e9e3101fb643c8b99632 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0221/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst --- .../ppc64le/discovery/mtms/verification.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst index a77acd58c..973c0a68f 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst @@ -1,7 +1,7 @@ Verification ============ -Before starting hardware discovery, ensure the following is configured to make the discovery process as smooth as possible. +Before starting hardware discovery, ensure the following is configured to make the discovery process as smooth as possible. Password Table -------------- @@ -15,10 +15,10 @@ If not configured, use the following command to set ``usernam=ADMIN`` and ``pass chtab key=ipmi passwd.username=ADMIN passwd.password=admin -Genesis Package +Genesis Package --------------- -The **xCAT-genesis** packages provides the utility to create the genesis network boot rootimage used by xCAT when doing hardware discovery. It should be installed during the xCAT install and would cause problems if missing. +The **xCAT-genesis** packages provides the utility to create the genesis network boot rootimage used by xCAT when doing hardware discovery. It should be installed during the xCAT install and would cause problems if missing. Verify that the ``genesis-scripts`` and ``genesis-base`` packages are installed: @@ -47,7 +47,7 @@ If missing: apt-get install xCAT-genesis - #. Create the network boot rootimage with the following command: ``mknb ppc64``. + #. Create the network boot rootimage with the following command: ``mknb ppc64``. The genesis kernel should be copied to ``/tftpboot/xcat``. From 61adb57b4c4f1a3a1781c4905d746151686716d1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0222/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst --- .../ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst index bea12d592..92a8c2401 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst @@ -3,7 +3,7 @@ Discover server and define After environment is ready, and the server is powered, we can start server discovery process. The first thing to do is discovering the FSP/BMC of the server. It is automatically powered on when the physical server is powered. -Use the :doc:`bmcdiscover ` command to discover the BMCs responding over an IP range and write the output into the xCAT database. This discovered BMC node is used to control the physical server during hardware discovery and will be deleted after the correct server node object is matched to a pre-defined node. You **must** use the ``-w`` option to write the output into the xCAT database. +Use the :doc:`bmcdiscover ` command to discover the BMCs responding over an IP range and write the output into the xCAT database. This discovered BMC node is used to control the physical server during hardware discovery and will be deleted after the correct server node object is matched to a pre-defined node. You **must** use the ``-w`` option to write the output into the xCAT database. To discover the BMC with an IP address range of 50.0.100.1-100: :: From 278bbb79e0143bdbbcc09ce750d7d5fab4d98b64 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0223/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst --- .../ppc64le/discovery/pbmc_discovery_with_lsslp.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst index 9f9b682d9..f398fc57a 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst @@ -8,7 +8,7 @@ The following command can be used to discovery FSP/BMC within an IP range and wr lsslp -s PBMC -u --range 50.0.100.1-100 -z > ./pbmc.stanza You need to modify the node definition in stanza file before using them, the stanza file will be like this:: - + # cat pbmc.stanza cn1: objtype=node @@ -21,7 +21,7 @@ You need to modify the node definition in stanza file before using them, the sta hidden=0 Then, define it into xCATdb:: - + # cat pbmc.stanza | mkdef -z 1 object definitions have been created or modified. From a3f28e6018cfbbde717c4a363549865b7ba9e080 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0224/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst --- .../ppc64le/discovery/seq_discovery.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst index aea009420..81df59ae5 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst @@ -8,7 +8,7 @@ When the physical location of the server is not so important, sequential-based h Prepare node pool ----------------- -To prepare the node pool, shall predefine nodes first, then initialize the discovery process with the predefined nodes. +To prepare the node pool, shall predefine nodes first, then initialize the discovery process with the predefined nodes. Predefine nodes ``````````````` @@ -58,15 +58,15 @@ There are additional `nodediscover*` commands you can run during the discovery p Verify the status of discovery using :doc:`nodediscoverstatus `:: - + nodediscoverstatus Show the nodes that have been discovered using :doc:`nodediscoverls `:: - + nodediscoverls -t seq -l Stop the current sequential discovery process using: :doc:`nodediscoverstop `:: - + nodediscoverstop @@ -80,6 +80,6 @@ To start the discovery process, the system administrator needs to power on the s Verify Node Definition ---------------------- -After discovery of the node, properties of the server will be added to the xCAT node definition. +After discovery of the node, properties of the server will be added to the xCAT node definition. -Display the node definition and verify that the MAC address has been populated. +Display the node definition and verify that the MAC address has been populated. From 1a2858988b213353d7072e95438be2657c6698dd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0225/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst --- .../manage_clusters/ppc64le/discovery/switch_discovery.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst index ffa679488..e30ce9555 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst @@ -1,6 +1,6 @@ .. include:: ../../common/discover/switch_discovery.rst -For switch based hardware discovery, the servers are identified through the switches and switchposts they are directly connected to. +For switch based hardware discovery, the servers are identified through the switches and switchposts they are directly connected to. .. include:: schedule_environment.rst @@ -34,7 +34,7 @@ The predefined switches will represent devices that the physical servers are con So the admin need to make sure those switches are configured correctly with SNMP v3 enabled. Then, define switch info into xCAT:: - + nodeadd switch1 groups=switch,all chdef switch1 ip=10.0.201.1 tabch switch=switch1 switches.snmpversion=3 switches.username=xcat switches.password=passw0rd switches.auth=sha @@ -77,7 +77,7 @@ Set the target `osimage` into the chain table to automatically provision the ope chdef cn1 -p chain="osimage=" -For more information about chain, refer to :doc:`Chain <../../../../../advanced/chain/index>` +For more information about chain, refer to :doc:`Chain <../../../../../advanced/chain/index>` Add cn1 into DNS:: From aebafc80cee92553d57a11703be70daed95f7952 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0226/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst --- .../diskful/customize_image/cfg_partition.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst index 5855a231e..b4aeccd6b 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst @@ -1,4 +1,4 @@ -Configure Disk Partition +Configure Disk Partition ======================== .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_Overview @@ -9,9 +9,9 @@ Partition Definition File .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_partition_definition_file_Overview :end-before: END_partition_definition_file_Overview - + Create Partition File -````````````````````` +````````````````````` .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_partition_definition_file_content :end-before: END_partition_definition_file_content @@ -19,7 +19,7 @@ Create Partition File .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_partition_definition_file_example_Ubuntu_Standard_partition_for_PPC64le :end-before: END_partition_definition_file_example_Ubuntu_Standard_partition_for_PPC64le - + Associate Partition File with Osimage ````````````````````````````````````` .. include:: ../../../common/deployment/cfg_partition.rst @@ -31,33 +31,33 @@ Partitioning disk file(For Ubuntu only) .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_Partition_Disk_File_ubuntu_only :end-before: END_Partition_Disk_File_ubuntu_only - + Additional preseed configuration file(For Ubuntu only) `````````````````````````````````````````````````````` .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_Additional_preseed_configuration_file_ubuntu_only :end-before: END_Additional_preseed_configuration_file_ubuntu_only - + Partition Definition Script --------------------------- .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_Partition_Definition_Script_overview :end-before: END_Partition_Definition_Script_overview -Create Partition Script -``````````````````````` +Create Partition Script +``````````````````````` .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_Partition_Definition_Script_Create_partition_script_content :end-before: END_Partition_Definition_Script_Create_partition_script_content - + .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_Partition_Definition_Script_Create_partition_script_example_redhat_sles - :end-before: END_Partition_Definition_Script_Create_partition_script_example_redhat_sles + :end-before: END_Partition_Definition_Script_Create_partition_script_example_redhat_sles .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_Partition_Definition_Script_Create_partition_script_example_ubuntu :end-before: END_Partition_Definition_Script_Create_partition_script_example_ubuntu - + Associate partition script with osimage ``````````````````````````````````````` .. include:: ../../../common/deployment/cfg_partition.rst @@ -74,4 +74,4 @@ Additional preseed configuration script(For Ubuntu only) ```````````````````````````````````````````````````````` .. include:: ../../../common/deployment/cfg_partition.rst :start-after: BEGIN_Additional_preseed_configuration_script_ubuntu_only - :end-before: END_Additional_preseed_configuration_script_ubuntu_only \ No newline at end of file + :end-before: END_Additional_preseed_configuration_script_ubuntu_only From 3a4530938ab40a652995bbc0404b7e3e6ee84163 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0227/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst --- .../diskful/customize_image/driver_update_disk.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst index bd717ba74..030d682b3 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst @@ -16,7 +16,7 @@ For Driver Update Disk .. include:: ../../../common/deployment/driver_update_disk.rst :start-after: BEGIN_locate_driver_for_DUD :end-before: END_locate_driver_for_DUD - + For Driver RPM Packages ``````````````````````` @@ -33,14 +33,14 @@ For Driver Update Disk .. include:: ../../../common/deployment/driver_update_disk.rst :start-after: BEGIN_inject_into_initrd__for_diskful_for_DUD :end-before: END_inject_into_initrd__for_diskful_for_DUD - + For Driver RPM Packages ``````````````````````` .. include:: ../../../common/deployment/driver_update_disk.rst :start-after: BEGIN__inject_into_initrd__for_diskful_for_RPM :end-before: END_inject_into_initrd__for_diskful_for_RPM - + Notes ----- @@ -48,4 +48,4 @@ Notes :start-after: BEGIN_node :end-before: END_node - + From 12f994fb81bb720c6812efaf951551e38ed9be08 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0228/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst --- .../manage_clusters/ppc64le/diskful/customize_image/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst index 059b0ef6c..d471da918 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst @@ -13,5 +13,5 @@ Optional means all the subitems in this page are not necessary to finish an OS d additional_pkg.rst use_kernel_patch.rst network/index.rst - - + + From 128c41955cfc7a16bdacdc80c6659a55129dcfc4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0229/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst --- .../customize_image/network/cfg_network_adapter.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst index 72631fe6b..57d206514 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst @@ -13,8 +13,8 @@ If configuring VLAN, BOND, or BRIDGES, ``nicdevices`` in ``nics`` table must be The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Bridge. - #. Configure Ethernet adapters: - + #. Configure Ethernet adapters: + * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../../common/deployment/network/cfg_network_ethernet_nic>` To configure Ethernet install NIC or other Ethernet network adapters as static @@ -28,7 +28,7 @@ The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Br * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_vlan>` #. Configure Bridge **[RHEL]**: - + * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../../common/deployment/network/cfg_network_bridge>` * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_bridge>` * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../../common/deployment/network/cfg_network_vlan_bridge>` @@ -36,7 +36,7 @@ The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Br * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../../common/deployment/network/cfg_network_bond_vlan_bridge>` #. Advanced topics: - + * :doc:`Use Customized Scripts To Configure NIC <../../../../common/deployment/network/cfg_network_custom_scripts>` * :doc:`Use Extra Parameters In NIC Configuration File <../../../../common/deployment/network/cfg_network_extra_param>` * :doc:`Configure Aliases <../../../../common/deployment/network/cfg_network_aliases>` From 345b9dba85c600aab8c6176c6d0c13967767a2d3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0230/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst --- .../ppc64le/diskful/customize_image/network/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst index 1300effb7..08945ef1c 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst @@ -1,7 +1,7 @@ Customize network adapter ========================= -This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. +This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. .. toctree:: :maxdepth: 1 From 77b4b5d8abf2fe09be5837a8670128402168023c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0231/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst --- .../diskless/customize_image/driver_update_disk.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst index 10b8a667b..7054ef8d1 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst @@ -16,7 +16,7 @@ For Driver Update Disk .. include:: ../../../common/deployment/driver_update_disk.rst :start-after: BEGIN_locate_driver_for_DUD :end-before: END_locate_driver_for_DUD - + For Driver RPM Packages ``````````````````````` @@ -33,14 +33,14 @@ For Driver Update Disk .. include:: ../../../common/deployment/driver_update_disk.rst :start-after: BEGIN_inject_into_initrd__for_diskless_for_DUD :end-before: END_inject_into_initrd__for_diskless_for_DUD - + For Driver RPM Packages ``````````````````````` .. include:: ../../../common/deployment/driver_update_disk.rst :start-after: BEGIN_inject_into_initrd__for_diskless_for_RPM :end-before: END_inject_into_initrd__for_diskless_for_RPM - + Notes ----- @@ -48,4 +48,4 @@ Notes :start-after: BEGIN_node :end-before: END_node - + From 72aeeeea285ae33e5886fa0e6458bf4fdef27b4b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0232/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst --- .../ppc64le/diskless/customize_image/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst index 7a9554d87..96a148866 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst @@ -12,7 +12,7 @@ Optional means all the subitems in this page are not necessary to finish an OS d additional_pkg.rst network/index.rst enable_kdump.rst - install_new_kernel.rst - acc_initrd_rootimg_gen_ppc64le.rst + install_new_kernel.rst + acc_initrd_rootimg_gen_ppc64le.rst trim_diskless_rootimg.rst localdisk.rst From f8b48871ed72995970740c2823287150226111b2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0233/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst --- .../customize_image/network/cfg_network_adapter.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst index 72631fe6b..57d206514 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst @@ -13,8 +13,8 @@ If configuring VLAN, BOND, or BRIDGES, ``nicdevices`` in ``nics`` table must be The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Bridge. - #. Configure Ethernet adapters: - + #. Configure Ethernet adapters: + * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../../common/deployment/network/cfg_network_ethernet_nic>` To configure Ethernet install NIC or other Ethernet network adapters as static @@ -28,7 +28,7 @@ The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Br * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_vlan>` #. Configure Bridge **[RHEL]**: - + * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../../common/deployment/network/cfg_network_bridge>` * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_bridge>` * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../../common/deployment/network/cfg_network_vlan_bridge>` @@ -36,7 +36,7 @@ The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Br * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../../common/deployment/network/cfg_network_bond_vlan_bridge>` #. Advanced topics: - + * :doc:`Use Customized Scripts To Configure NIC <../../../../common/deployment/network/cfg_network_custom_scripts>` * :doc:`Use Extra Parameters In NIC Configuration File <../../../../common/deployment/network/cfg_network_extra_param>` * :doc:`Configure Aliases <../../../../common/deployment/network/cfg_network_aliases>` From fa04dadc29ac6cb2783b5171e288b2aa5a73b87e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0234/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst --- .../ppc64le/diskless/customize_image/network/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst index 1300effb7..08945ef1c 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst @@ -1,7 +1,7 @@ Customize network adapter ========================= -This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. +This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. .. toctree:: :maxdepth: 1 From a90df7b8b9d1b027f55c17acca3ce93b459e8a77 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0235/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst --- .../guides/admin-guides/manage_clusters/ppc64le/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst index 9399c0405..5e786b932 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst @@ -4,14 +4,14 @@ IBM POWER LE / OpenPOWER Most of the content is general information for xCAT, the focus and examples are for management of IBM OpenPOWER servers. IBM OpenPOWER Servers - * based on POWER8 Processor Technology is IPMI managed + * based on POWER8 Processor Technology is IPMI managed * based on POWER9 Processor Technology is OpenBMC managed [**Alpha**] .. toctree:: :maxdepth: 2 - configure/index.rst + configure/index.rst discovery/index.rst management/index.rst diskful/index.rst From 1e24edbf6ab10aec543603ba23ecb73794b2b627 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0236/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst --- .../ppc64le/management/advanced/rflash/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst index dce79f855..f0b7d3f77 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst @@ -3,7 +3,7 @@ See :doc:`rflash manpage ` for more information. -.. toctree:: +.. toctree:: :maxdepth: 2 ipmi.rst From 8a81a2b49948a813050060bc923af9ef4ae466b2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0237/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst --- .../manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst index 0e0234ac6..8256a7c39 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst @@ -1,7 +1,7 @@ IPMI Firmware Update ==================== -The ``rflash`` command is provided to assist the system administrator in updating firmware. +The ``rflash`` command is provided to assist the system administrator in updating firmware. To check the current firmware version on the node's BMC and the HPM file: :: From 215212052154aaa9941686aca221cb7c91102db3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0238/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst --- .../ppc64le/management/advanced/rflash/openbmc/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst index 804913d6d..592622a7e 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst @@ -1,7 +1,7 @@ OpenBMC Firmware Update ======================= -.. toctree:: +.. toctree:: :maxdepth: 2 manually.rst From c85b4eae0fc87fa3e75e3647e33488f5aec58bbe Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0239/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst --- .../rflash/openbmc/openbmc_common.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst index 24cebbdc0..5f6d11318 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst @@ -25,19 +25,19 @@ If there are errors encountered during the flash process, take a look at the man The sequence of events that must happen to flash OpenBMC firmware is the following: -#. Power off the Host -#. Upload and Activate BMC +#. Power off the Host +#. Upload and Activate BMC #. Reboot the BMC (applies BMC) #. Upload and Activate Host -#. Power on the Host (applies Host) +#. Power on the Host (applies Host) -Power off Host +Power off Host -------------- Use the rpower command to power off the host: :: - rpower off + rpower off Upload and Activate BMC Firmware -------------------------------- @@ -48,18 +48,18 @@ Use the rflash command to upload and activate the Host firmware: :: If running ``rflash`` in Hierarchy, the firmware files must be accessible on the Service Nodes. -**Note:** If a .tar file is provided, the ``-a`` option does an upload and activate in one step. If an ID is provided, the ``-a`` option just does activate the specified firmware. After firmware is activated, use the ``rflash -l`` to view. The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. +**Note:** If a .tar file is provided, the ``-a`` option does an upload and activate in one step. If an ID is provided, the ``-a`` option just does activate the specified firmware. After firmware is activated, use the ``rflash -l`` to view. The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. Reboot the BMC -------------- Use the ``rpower`` command to reboot the BMC: :: - + rpower bmcreboot -The BMC will take 2-5 minutes to reboot, check the status using: ``rpower bmcstate`` and wait for ``BMCReady`` to be returned. +The BMC will take 2-5 minutes to reboot, check the status using: ``rpower bmcstate`` and wait for ``BMCReady`` to be returned. -**Known Issue:** On reboot, the first call to the BMC after reboot, xCAT will return ``Error: BMC did not respond within 10 seconds, retry the command.``. Please retry. +**Known Issue:** On reboot, the first call to the BMC after reboot, xCAT will return ``Error: BMC did not respond within 10 seconds, retry the command.``. Please retry. Upload and Activate Host Firmware --------------------------------- @@ -70,14 +70,14 @@ Use the rflash command to upload and activate the Host firmware: :: If running ``rflash`` in Hierarchy, the firmware files must be accessible on the Service Nodes. -**Note:** The ``-a`` option does an upload and activate in one step, after firmware is activated, use the ``rflash -l`` to view. The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. +**Note:** The ``-a`` option does an upload and activate in one step, after firmware is activated, use the ``rflash -l`` to view. The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. Power on Host ------------- User the ``rpower`` command to power on the Host: :: - rpower on + rpower on .. END_flashing_OpenBMC_Servers @@ -86,15 +86,15 @@ User the ``rpower`` command to power on the Host: :: Validation ---------- -Use one of the following commands to validate firmware levels are in sync: +Use one of the following commands to validate firmware levels are in sync: * Use the ``rinv`` command to validate firmware level: :: - rinv firm -V | grep -i ibm | grep "\*" | xcoll + rinv firm -V | grep -i ibm | grep "\*" | xcoll * Use the ``rflash`` command to validate the firmware level: :: - rflash -l | grep "\*" | xcoll + rflash -l | grep "\*" | xcoll .. END_Validation_OpenBMC_firmware From 6e00d92df02e1293a5f587f9f78062c4bd83629e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0240/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst --- .../manage_clusters/ppc64le/management/advanced/rinv.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst index c88daa952..c9735db85 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst @@ -9,7 +9,7 @@ To get all the hardware information for node ``cn1``: :: rinv cn1 all -To get just the firmware information for ``cn1``: :: +To get just the firmware information for ``cn1``: :: rinv cn1 firm From 4c353cba20e7cfe01b878fcf386b1d1c1d665be9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0241/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst --- .../manage_clusters/ppc64le/management/advanced/rspconfig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst index 6eaca4a3f..e35839997 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst @@ -3,7 +3,7 @@ See :doc:`rspconfig manpage ` for more information. -The ``rspconfig`` command can be used to configure the service processor, or Baseboard Management Controller (BMC), of a physical machine. +The ``rspconfig`` command can be used to configure the service processor, or Baseboard Management Controller (BMC), of a physical machine. For example, to turn on SNMP alerts for node ``cn5``: :: From d1be75aa54d4e2b97084ea258e555f0222acffb6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0242/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst --- .../manage_clusters/ppc64le/management/advanced/rvitals.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst index 7ec80f859..056b5e6d2 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst @@ -1,9 +1,9 @@ -``rvitals`` - Remote Hardware Vitals -==================================== +``rvitals`` - Remote Hardware Vitals +==================================== See :doc:`rvitals manpage ` for more information. -Collecting runtime information from a running physical machine is an important part of system administration. Data can be obtained from the service processor including temperature, voltage, cooling fans, etc. +Collecting runtime information from a running physical machine is an important part of system administration. Data can be obtained from the service processor including temperature, voltage, cooling fans, etc. Use the ``rvitals`` command to obtain this information. :: From 32e966ecf5c79f7e1663f99bb308e131373b57eb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0243/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst --- .../manage_clusters/ppc64le/management/basic/rbeacon.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst index f58094dd7..a94eb3f13 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst @@ -1,4 +1,4 @@ -``rbeacon`` - Beacon Light +``rbeacon`` - Beacon Light ========================== See :doc:`rbeacon manpage ` for more information. @@ -6,4 +6,4 @@ See :doc:`rbeacon manpage ` for Most enterprise level servers have LEDs on their front and/or rear panels, one of which is a beacon light. If turned on, this light can assist the system administrator in locating one physical machine in the cluster. -Using xCAT, administrators can turn on and off the beacon light using: ``rbeacon on|off`` +Using xCAT, administrators can turn on and off the beacon light using: ``rbeacon on|off`` From c98a4bf526e354d71378ba3112f8b40ad675a8ac Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0244/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst --- .../manage_clusters/ppc64le/management/basic/rcons.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst index 1addf7997..10b395b81 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst @@ -12,7 +12,7 @@ Configure the correct console management by modifying the node definition: chdef -t node -o cons=ipmi * For OpenPOWER, **OpenBMC** managed servers: :: - + chdef -t node -o cons=openbmc Open a console to ``compute1``: :: @@ -67,9 +67,9 @@ More details for goconserver, see `goconserver documentation `` From 13d97dfc99bc21f00c84069fc8769a7a94559903 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0245/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst --- .../manage_clusters/ppc64le/management/basic/rpower.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst index 3e9ad4a97..e6435ec43 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst @@ -8,8 +8,8 @@ Use the ``rpower`` command to remotely power on and off a single server or a ran rpower on rpower off -Other actions include: +Other actions include: * To get the current power state of a server: ``rpower state`` - * To boot/reboot a server: ``rpower boot`` - * To hardware reset a server: ``rpower reset`` + * To boot/reboot a server: ``rpower boot`` + * To hardware reset a server: ``rpower reset`` From ab643af21a8fa7a684a75e59b2531aba939af291 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0246/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst --- .../admin-guides/manage_clusters/ppc64le/management/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst index 006b0763a..04202e5ae 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst @@ -4,5 +4,5 @@ Hardware Management .. toctree:: :maxdepth: 2 - basic/index.rst + basic/index.rst advanced/index.rst From deb221aa22e42031ed6bf0cac67e08edd0dac869 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0247/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst --- .../ppc64le/statelite/advanced_features.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst index 089b1f066..70b643be6 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst @@ -39,8 +39,8 @@ In order to describe the hierarchy scenarios we can use , ``P`` to denote parent +--------------+-----------------------------------------------------+-------------------------------------------------+ | P:tmpfs | "ALL","/root/testblank/",,, | Both parent and child are mounted to tmpfs | | C:persistent | "ALL","/root/testblank/testpersfile","persistent",, | on the booted node following their respective | -| | | options. Only the parent is mounted to the local| -| | | file | +| | | options. Only the parent is mounted to the local| +| | | file | +--------------+-----------------------------------------------------+-------------------------------------------------+ | P:persistent | "ALL","/root/testblank/","persistent",, | Not permitted now. But plan to support it. | | C:tmpfs | "ALL","/root/testblank/tempfschild",,, | | @@ -84,7 +84,7 @@ In order to describe the hierarchy scenarios we can use , ``P`` to denote parent | P:link | "ALL","/root/testlink/","link",, | Both parent and child are created in tmpfs | | C:link,ro | "ALL","/root/testlink/testlinkro","link,ro",, | on the booted node, there's only one symbolic | | | | link of the parent is created in the local | -| | | file system. | +| | | file system. | +--------------+-----------------------------------------------------+-------------------------------------------------+ | P:link | "ALL","/root/testlink/","link",, | Both parent and child are created in tmpfs | | C:link,con | "ALL","/root/testlink/testlinkconchild","link,con",,| on the booted node, there's only one symbolic | @@ -103,7 +103,7 @@ In order to describe the hierarchy scenarios we can use , ``P`` to denote parent +--------------+-----------------------------------------------------+-------------------------------------------------+ | P:link | | NOT Permitted | | C:persistent | | | -+--------------+-----------------------------------------------------+-------------------------------------------------+ ++--------------+-----------------------------------------------------+-------------------------------------------------+ litetree table -------------- @@ -136,7 +136,7 @@ Our example is as follows: :: The two directories ``/statelite/$node`` on the node's $noderes.nfsserver and the ``/gpfs/dallas`` on the node cnfs contain root tree structures that are sparsely populated with files that we want to place in those nodes. If files are not found in the first directory, it goes to the next directory. If none of the files can be found in the litetree hierarchy, then they are searched for in ``/.default`` on the local image. -Installing a new Kernel in the statelite image +Installing a new Kernel in the statelite image ---------------------------------------------- Obtain you new kernel and kernel modules on the MN, for example here we have a new SLES kernel. From a1eb8358a55e41fc3bf11cc69c1dc647042ae3b3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0248/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst --- .../ppc64le/statelite/config_statelite.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst index 1d70c52fd..3b0ec8e4b 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst @@ -2,22 +2,22 @@ Configuration ============= Statelite configuration is done using the following tables in xCAT: - * litefile - * litetree - * statelite - * policy - * noderes + * litefile + * litetree + * statelite + * policy + * noderes litefile table -------------- -The litefile table specifies the directories and files on the statelite nodes that should be read/write, persistent, or read-only overlay. All other files in the statelite nodes come from the read-only statelite image. +The litefile table specifies the directories and files on the statelite nodes that should be read/write, persistent, or read-only overlay. All other files in the statelite nodes come from the read-only statelite image. #. The first column in the litefile table is the image name this row applies to. It can be an exact osimage definition name, an osimage group (set in the groups attribute of osimages), or the keyword ``ALL``. #. The second column in the litefile table is the full path of the directory or file on the node that you are setting options for. -#. The third column in the litefile table specifies options for the directory or file: +#. The third column in the litefile table specifies options for the directory or file: #. tmpfs - It provides a file or directory for the node to use when booting, its permission will be the same as the original version on the server. In most cases, it is read-write; however, on the next statelite boot, the original version of the file or directory on the server will be used, it means it is non-persistent. This option can be performed on files and directories. #. rw - Same as above. Its name "rw" does NOT mean it always be read-write, even in most cases it is read-write. Do not confuse it with the "rw" permission in the file system. @@ -31,7 +31,7 @@ The litefile table specifies the directories and files on the statelite nodes th #. link,persistent - It provides a mounted file or directory that is copied to the xCAT persistent location and then over-mounted to the tmpfs on the booted node, and finally the symbolic link in the local file system will be linked to the over-mounted tmpfs file/directory on the booted node. The file/directory will be persistent across reboots. The permission of the file/directory where the symbolic link points to will be the same as the original one in the statelite location. It requires the statelite table to be filled out with a spot for persistent statelite. The option can be performed on files and directories. #. localdisk - The file or directory will be stored in the local disk of the statelite node. Refer to the section To enable the localdisk option to enable the 'localdisk' support. -Currently, xCAT does not handle the relative links very well. The relative links are commonly used by the system libraries, for example, under ``/lib/`` directory, there will be one relative link matching one ``.so`` file. So, when you add one relative link to the litefile table (Not recommend), make sure the real file also be included, or put its directory name into the litefile table. +Currently, xCAT does not handle the relative links very well. The relative links are commonly used by the system libraries, for example, under ``/lib/`` directory, there will be one relative link matching one ``.so`` file. So, when you add one relative link to the litefile table (Not recommend), make sure the real file also be included, or put its directory name into the litefile table. .. Note:: It is recommended that you specify at least the entries listed below in the litefile table, because most of these files need to be writeable for the node to boot up successfully. When any changes are made to their options, make sure they won't affect the whole system. If you want to run a command like ``/bin/ping`` using non-root users, add this command into ``litefile``, then root user have privilege to authorize the command for non-root users. @@ -109,7 +109,7 @@ In the statelite table, the node or nodegroups in the table must be unique; that "compute",,":/gpfs/state",, -Any nodes in the compute node group will have their state stored in the ``/gpfs/state`` directory on the machine with ```` as its IP address. +Any nodes in the compute node group will have their state stored in the ``/gpfs/state`` directory on the machine with ```` as its IP address. When the node boots up, then the value of the ``statemnt`` attribute will be mounted to ``/.statelite/persistent``. The code will then create the following subdirectory ``/.statelite/persistent/``, if there are persistent files that have been added in the litefile table. This directory will be the root of the image for this node's persistent files. By default, xCAT will do a hard NFS mount of the directory. You can change the mount options by setting the mntopts attribute in the statelite table. @@ -128,7 +128,7 @@ Ensure policies are set up correctly in the Policy Table. When a node boots up, chdef -t policy -o 4.7 commands=litefile rule=allow chdef -t policy -o 4.8 commands=litetree rule=allow -noderes +noderes ------- ``noderes.nfsserver`` attribute can be set for the NFSroot server. If this is not set, then the default is the Management Node. From aa75e7b222735a5d95ffb1407e029b7f1ee9abba Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0249/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst --- .../manage_clusters/ppc64le/statelite/hierarchy_support.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst index 449533bfe..63988aff8 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst @@ -13,7 +13,7 @@ Setup the diskfull service node Generate the statelite image ```````````````````````````` -To generate the statelite image for your own profile follow instructions in :doc:`Customize your statelite osimage <./provision_statelite>`. +To generate the statelite image for your own profile follow instructions in :doc:`Customize your statelite osimage <./provision_statelite>`. ``NOTE``: if the NFS directories defined in the litetree table are on the service node, it is better to setup the NFS directories in the service node following the chapter. From 8fddc1d44ecec7e7aaff65eeb8218afa3c69d24b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0250/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst --- .../ppc64le/statelite/provision_statelite.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst index 240aed782..da1ae4cdf 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst @@ -1,14 +1,14 @@ Provision statelite =================== -Show current provisioning method +Show current provisioning method -------------------------------- To determine the current provisioning method of your node, execute: :: lsdef -i provmethod -``Note``: syncfiles is not currently supported for statelite nodes. +``Note``: syncfiles is not currently supported for statelite nodes. Generate default statelite image from distoro media --------------------------------------------------- @@ -21,7 +21,7 @@ Use the copycds command to copy the appropriate iso image into the ``/install`` The contents are copied into ``/install/rhels7.3/ppc64le/`` -The configuration files pointed to by the attributes are the defaults shipped with xCAT. We will want to copy them to the ``/install`` directory, in our example the ``/install/test`` directory and modify them as needed. +The configuration files pointed to by the attributes are the defaults shipped with xCAT. We will want to copy them to the ``/install`` directory, in our example the ``/install/test`` directory and modify them as needed. Statelite Directory Structure ----------------------------- @@ -49,7 +49,7 @@ Setup your osimage/linuximage tables with new test image name, osvers,osarch, an mkdef rhels7.3-custom-statelite -u profile=compute provmethod=statelite Check your setup: :: - + lsdef -t osimage rhels7.3-custom-statelite Customize the paths to your ``pkglist``, ``syncfile``, etc to the osimage definition, that you require. ``Note``, if you modify the files on the ``/opt/xcat/share/...`` path then copy to the appropriate ``/install/custom/...`` path. Remember all files must be under ``/install`` if using hierarchy (service nodes). @@ -209,7 +209,7 @@ Make sure you have set up all the attributes in your node definitions correctly You can now deploy the node by running the following commmands: :: - rinstall + rinstall You can then use ``rcons`` or ``wcons`` to watch the node boot up. From 3eade799ed88d437f26b6d3984cf5de2effba742 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0251/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst --- .../ppc64le/virtual_machines/FAQ.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst index 214c79607..a6260fbb2 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst @@ -5,13 +5,13 @@ Trouble Shooting VNC client complains the credentials are not valid -------------------------------------------------- - **Issue**: + **Issue**: While connecting to the hypervisor with VNC, the vnc client complains "Authentication failed". - **Solution**: + **Solution**: Check whether the clocks on the hypervisor and headnode are synced -rpower fails with "Error: internal error Process exited while reading console log qemu: Permission denied" +rpower fails with "Error: internal error Process exited while reading console log qemu: Permission denied" ---------------------------------------------------------------------------------------------------------- **Issue**: :: @@ -21,13 +21,13 @@ rpower fails with "Error: internal error Process exited while reading console lo qemu: could not open disk image /var/lib/xcat/pools/2e66895a-e09a-53d5-74d3-eccdd9746eb5/vm1.sda.qcow2: Permission denied: internal error Process exited while reading console log output: char device redirected to /dev/pts/1 qemu: could not open disk image /var/lib/xcat/pools/2e66895a-e09a-53d5-74d3-eccdd9746eb5/vm1.sda.qcow2: Permission denied - **Solution**: + **Solution**: Usually caused by incorrect permission in NFS server/client configuration. NFSv4 is enabled in some Linux distributions such as CentOS6 by default. The solution is simply to disable NFSv4 support on the NFS server by uncommenting the following line in "/etc/sysconfig/nfs": :: RPCNFSDARGS="-N 4" Then restart the NFS services and try to power on the VM again... - + **Note**: For stateless hypervisor, purge the VM by ``rmvm -p vm1``, reboot the hypervisor and then create the VM. rpower fails with "Error: internal error: process exited while connecting to monitor qemu: Permission denied" @@ -73,23 +73,23 @@ rmigrate fails with "Error: 38, message: failed to create directory '' Error: Cannot communicate via libvirt to kvmhost1 ------------------------------------------------- - **Issue**: + **Issue**: The kvm related commands complain "Error: Cannot communicate via libvirt to kvmhost1" - **Solution**: + **Solution**: Usually caused by incorrect ssh configuration between xCAT management node and hypervisor. Make sure it is possible to access the hypervisor from management node via ssh without password. Fail to ping the installed VM ----------------------------- - **Issue**: + **Issue**: The newly installed stateful VM node is not pingable, the following message can be observed in the console during VM booting: :: ADDRCONF(NETDEV_UP): eth0 link is not ready. - **Solution**: - Usually caused by the incorrect VM NIC model. Try the following steps to specify "virtio": :: + **Solution**: + Usually caused by the incorrect VM NIC model. Try the following steps to specify "virtio": :: rmvm vm1 chdef vm1 vmnicnicmodel=virtio From 1693be96cbce6fea3ddc9d9c1fae4ab15cc23c94 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0252/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst --- .../virtual_machines/RHEVHypervisor.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst index 59481768a..f9ef4dfaf 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst @@ -1,12 +1,12 @@ - Red Hat Virtualization (formally known as RHEV or Red Hat Enterprise Virtualization) is a virtualization solution provided by Red Hat. + Red Hat Virtualization (formally known as RHEV or Red Hat Enterprise Virtualization) is a virtualization solution provided by Red Hat. - At the time of this writing there is no RHEV-H prebuilt hypervisor image on Power LE. The method for creating a Red Hat Hypervisor on Power LE is to first install RHEL and apply the KVM support on top with the provided RPMs. + At the time of this writing there is no RHEV-H prebuilt hypervisor image on Power LE. The method for creating a Red Hat Hypervisor on Power LE is to first install RHEL and apply the KVM support on top with the provided RPMs. - Obtain and download the RHEV RPM packages from the Red Hat download site. + Obtain and download the RHEV RPM packages from the Red Hat download site. * Management-Agent-Power-7 - * Power_Tools-7 + * Power_Tools-7 In the following example, the RPMs are downloaded to ``/install/post/otherpkgs/rhels7.3/ppc64le/RHEV4/4.0-GA`` @@ -24,11 +24,11 @@ chdef -t osimage rhels7.3-ppc64le-RHEV4-install-compute \ otherpkgdir=/install/post/otherpkgs/rhels7.3/ppc64le/RHEV4/4.0-GA - * Create a new package list file ``/install/custom/rhels7.3/ppc64le/rhelv4.pkglist`` to include necessary packages provided from the OS. :: + * Create a new package list file ``/install/custom/rhels7.3/ppc64le/rhelv4.pkglist`` to include necessary packages provided from the OS. :: #INCLUDE:/opt/xcat/share/xcat/install/rh/compute.rhels7.pkglist# libvirt - screen + screen bridge-utils * Modify ``pkglist`` attribute to point to the package list file from the step above :: @@ -38,9 +38,9 @@ * Create a new package list file ``/install/custom/rhels7.3/ppc64le/rhev4.otherpkgs.pkglist`` to list required packages :: - qemu-kvm-rhev - qemu-kvm-tools-rhev - virt-manager-common + qemu-kvm-rhev + qemu-kvm-tools-rhev + virt-manager-common virt-install * Modify ``otherpkglist`` attribute to point to the package list file from the step above :: From 6a63daf8dc66f64d66499ff1fad3416f259d6613 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0253/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst --- .../ppc64le/virtual_machines/hypervisorKVM.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst index 63a2df528..f2e3bac25 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst @@ -30,12 +30,12 @@ Provision Hypervisor chdef kvmhost1 -p postscripts="xHRM bridgeprereq eth0:br0" - **Note**: The network bridge name you use should not be the virtual bridges (vbrX) created by libvirt installation [1]_. + **Note**: The network bridge name you use should not be the virtual bridges (vbrX) created by libvirt installation [1]_. #. Customize the hypervisor node definition to mount the shared kvm storage directory on management node **(optional)** - If the shared kvm storage directory on the management node has been exported, it can be mounted on PowerKVM hypervisor for virtual machines hosting. + If the shared kvm storage directory on the management node has been exported, it can be mounted on PowerKVM hypervisor for virtual machines hosting. An easy way to do this is to create another postscript named "mountvms" which creates a directory **/install/vms** on hypervisor and then mounts **/install/vms** from the management node, the content of "mountvms" can be: :: @@ -56,10 +56,10 @@ Provision Hypervisor rpower kvmhost1 boot -Create network bridge on hypervisor +Create network bridge on hypervisor ------------------------------------ -To launch VMs, a network bridge must be created on the KVM hypervisor. +To launch VMs, a network bridge must be created on the KVM hypervisor. If the hypervisor is provisioned successfully according to the steps described above, a network bridge will be created and attached to a physical interface. This can be checked by running ``brctl show`` on the hypervisor to show the network bridge information, please make sure a network bridge has been created and configured according to the parameters passed to postscript "xHRM" :: From d6dc3dc3fab015ed7da1fd4424d480949a19f6d3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0254/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst --- .../manage_clusters/ppc64le/virtual_machines/index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst index a13f1e1c6..e304ddcc1 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst @@ -3,11 +3,11 @@ Virtual Machines xCAT supports the following virtualization infrastructures: - -**Kernel-based Virtual Machine (KVM)**: + +**Kernel-based Virtual Machine (KVM)**: A full virtualization solution for Enterprise Linux distributions, known as the *de facto* open source virtualization mechanism and currently used by many software companies. -**IBM PowerKVM**: +**IBM PowerKVM**: A product that leverages the Power resilience and performance with the openness of KVM, which provides several advantages: * Higher workload consolidation with processors overcommitment and memory sharing From 1183e75d0613487c582b8cc36bab9878510993b4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0255/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst --- .../manage_clusters/ppc64le/virtual_machines/kvmMN.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst index eb33072f8..d550e857b 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst @@ -7,7 +7,7 @@ Install the kvm related packages Additional packages need to be installed on the management node for kvm support. -Please make sure the following packages have been installed on the management node, if not, install them manually. +Please make sure the following packages have been installed on the management node, if not, install them manually. ``perl-Sys-Virt`` @@ -28,4 +28,4 @@ The easiest shared file system is ``/install`` directory on the management node, echo "/install/vms *(rw,no_root_squash,sync,fsid=0)" >> /etc/exports exportfs -r -**Note**: make sure the root permission is turned on for nfs clients (i.e. use the ``no_root_squash`` option). Otherwise, the virtual disk file can not work. +**Note**: make sure the root permission is turned on for nfs clients (i.e. use the ``no_root_squash`` option). Otherwise, the virtual disk file can not work. From 8799f8589e81cf473888c92ac14d8e88804476a5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0256/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst --- .../ppc64le/virtual_machines/pKVMHypervisor.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst index e75d9f5e3..ffa756943 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst @@ -1,10 +1,10 @@ - Obtain a PowerKVM ISO and create PowerKVM osimages with it: :: + Obtain a PowerKVM ISO and create PowerKVM osimages with it: :: copycds ibm-powerkvm-3.1.0.0-39.0-ppc64le-gold-201511041419.iso - + The following PowerKVM osimage will be created :: - + # lsdef -t osimage -o pkvm3.1-ppc64le-install-compute Object name: pkvm3.1-ppc64le-install-compute imagetype=linux From 5fd88a84f165418f54106362169f9cad204df299 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0257/1681] Remove trailing spaces in file docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst --- .../guides/admin-guides/manage_clusters/x86_64/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst b/docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst index 88577cbae..2effc8d80 100644 --- a/docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst @@ -1,6 +1,6 @@ x86_64 ====== -This section is not available at this time. +This section is not available at this time. -Refer to `xCAT Documentation `_ on SourceForge for information on System X servers. +Refer to `xCAT Documentation `_ on SourceForge for information on System X servers. From b4cad32e0225fee4b91ae7caad39e5c808580656 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0258/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/index.rst --- docs/source/guides/admin-guides/references/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/index.rst b/docs/source/guides/admin-guides/references/index.rst index 2218a340a..c195a2858 100644 --- a/docs/source/guides/admin-guides/references/index.rst +++ b/docs/source/guides/admin-guides/references/index.rst @@ -15,12 +15,12 @@ These man pages are auto generated from .pod files to .rst files using the ``cre man5/index.rst man7/index.rst man8/index.rst - + xCAT Tools ---------- -*Disclaimer:* **Use at your own risk** +*Disclaimer:* **Use at your own risk** The following tools are shipped with xCAT and have been contributed by various xCAT community users. The tools are located under ``/opt/xcat/share/xcat/tools/``. From 8958e6f8a1780aa7bf280750d1655b1e58a96e06 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0259/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/addkit.1.rst --- .../admin-guides/references/man1/addkit.1.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/addkit.1.rst b/docs/source/guides/admin-guides/references/man1/addkit.1.rst index 7c64c139e..ee49d089f 100644 --- a/docs/source/guides/admin-guides/references/man1/addkit.1.rst +++ b/docs/source/guides/admin-guides/references/man1/addkit.1.rst @@ -21,9 +21,9 @@ SYNOPSIS \ **addkit**\ [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ] -\ **addkit**\ [\ **-i | -**\ **-inspection**\ ] \ *kitlist*\ +\ **addkit**\ [\ **-i | -**\ **-inspection**\ ] \ *kitlist*\ -\ **addkit**\ [\ **-V | -**\ **-verbose**\ ] [\ **-p | -**\ **-path**\ \ *path*\ ] \ *kitlist*\ +\ **addkit**\ [\ **-V | -**\ **-verbose**\ ] [\ **-p | -**\ **-path**\ \ *path*\ ] \ *kitlist*\ *********** @@ -43,40 +43,40 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command version. - -\ **-i|-**\ **-inspection**\ - + +\ **-i|-**\ **-inspection**\ + Show the summary of the given kits - -\ **-p|-**\ **-path**\ \ *path*\ - + +\ **-p|-**\ **-path**\ \ *path*\ + The destination directory to which the contents of the kit tarfiles and/or kit deploy directories will be copied. When this option is not specified, the default destination directory will be formed from the installdir site attribute with ./kits subdirectory. - -\ *kitlist*\ - + +\ *kitlist*\ + A comma delimited list of kit_tarball_files or kit_deploy_directories to be added to the xCAT environment. Each entry can be an absolute or relative path. See xCAT documentation for more information on building kits. - + From 819e6fe82307dc3c272850a6cf9dfddfe7a60b9b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0260/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst --- .../references/man1/addkitcomp.1.rst | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst b/docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst index 16a43358a..698c643c5 100644 --- a/docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **addkitcomp**\ [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ] -\ **addkitcomp**\ [\ **-V | -**\ **-verbose**\ ] [\ **-a | -**\ **-adddeps**\ ] [\ **-f | -**\ **-force**\ ] [\ **-n | -**\ **-noupgrade**\ ] [\ **-**\ **-noscripts**\ ] \ **-i**\ \ *osimage*\ \ *kitcompname_list*\ +\ **addkitcomp**\ [\ **-V | -**\ **-verbose**\ ] [\ **-a | -**\ **-adddeps**\ ] [\ **-f | -**\ **-force**\ ] [\ **-n | -**\ **-noupgrade**\ ] [\ **-**\ **-noscripts**\ ] \ **-i**\ \ *osimage*\ \ *kitcompname_list*\ *********** @@ -40,60 +40,60 @@ OPTIONS -\ **-a|-**\ **-adddeps**\ - +\ **-a|-**\ **-adddeps**\ + Assign kitcomponent dependencies to the osimage. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command version. - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + Add kit component to osimage even if there is a mismatch in OS, version, arch, serverrole, or kitcompdeps - -\ **-i**\ \ *osimage*\ - + +\ **-i**\ \ *osimage*\ + The osimage name that the kit component is assigning to. - -\ **-n|-**\ **-noupgrade**\ - + +\ **-n|-**\ **-noupgrade**\ + 1. Allow multiple versions of kitcomponent to be installed into the osimage, instead of kitcomponent upgrade. - + 2. Kit components added by addkitcomp -n will be installed separately behind all other ones which have been added. - -\ **-**\ **-noscripts**\ - + +\ **-**\ **-noscripts**\ + Do not add kitcomponent's postbootscripts to osimage - -\ *kitcompname_list*\ - + +\ *kitcompname_list*\ + A comma-delimited list of valid full kit component names or kit component basenames that are to be added to the osimage. - + From 905f6a807063eb372f96f6f9c7a94bebf7291e5e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0261/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst --- .../references/man1/bmcdiscover.1.rst | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst b/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst index 238924d21..92be62696 100644 --- a/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst +++ b/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst @@ -23,7 +23,7 @@ SYNOPSIS \ **bmcdiscover**\ [\ **-v | -**\ **-version**\ ] -\ **bmcdiscover**\ [\ **-**\ **-sn**\ \ *SN_nodename*\ ] [\ **-s**\ \ *scan_method*\ ] [\ **-u**\ \ *bmc_user*\ ] [\ **-p**\ \ *bmc_passwd*\ ] [\ **-z**\ ] [\ **-w**\ ] \ **-**\ **-range**\ \ *ip_ranges*\ +\ **bmcdiscover**\ [\ **-**\ **-sn**\ \ *SN_nodename*\ ] [\ **-s**\ \ *scan_method*\ ] [\ **-u**\ \ *bmc_user*\ ] [\ **-p**\ \ *bmc_passwd*\ ] [\ **-z**\ ] [\ **-w**\ ] \ **-**\ **-range**\ \ *ip_ranges*\ *********** @@ -46,64 +46,64 @@ OPTIONS -\ **-**\ **-range**\ - +\ **-**\ **-range**\ + Specify one or more IP ranges acceptable to nmap. IP range can be hostnames, IP addresses, networks, etc. A single IP address (10.1.2.3), several IPs with commas (10.1.2.3,10.1.2.10), Ip range with "-" (10.1.2.0-100) or an IP range (10.1.2.0/24) can be specified. If the range is very large, the \ **bmcdiscover**\ command may take a long time to return. - -\ **-**\ **-sn**\ - + +\ **-**\ **-sn**\ + Specify one or more service nodes on which bmcdiscover will run. In hierarchical cluster, the MN may not be able to access the BMC of CN directly, but SN can. With this option, bmcdiscover will be dispatched to the specified SNs. Then, the nodename of the service node that 'bmcdiscover' is running on will be set to the 'servicenode' attribute of the discovered BMC node. - -\ **-s**\ - + +\ **-s**\ + Scan method (The only supported scan method at this time is \ **nmap**\ ) - -\ **-z**\ - + +\ **-z**\ + List the data returned in xCAT stanza format - -\ **-w**\ - + +\ **-w**\ + Write to the xCAT database. - -\ **-i|-**\ **-bmcip**\ - + +\ **-i|-**\ **-bmcip**\ + BMC IP address. - -\ **-u|-**\ **-bmcuser**\ - + +\ **-u|-**\ **-bmcuser**\ + BMC user name. - -\ **-p|-**\ **-bmcpasswd**\ - + +\ **-p|-**\ **-bmcpasswd**\ + BMC user password. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Display version information - + From fda5200e1ef5fb08848e5a4ee56ea2e211fb42ef Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0262/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/buildkit.1.rst --- .../references/man1/buildkit.1.rst | 272 +++++++++--------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/buildkit.1.rst b/docs/source/guides/admin-guides/references/man1/buildkit.1.rst index 20dd710e6..fcf4ec6ab 100644 --- a/docs/source/guides/admin-guides/references/man1/buildkit.1.rst +++ b/docs/source/guides/admin-guides/references/man1/buildkit.1.rst @@ -49,23 +49,23 @@ For example, to create a new kit named "prodkit" in the directory /home/mykits/ 1. - + If no location is provided then the command will create a subdirectory called "prodkit" in the current directory "/home/mykits" and the new kit files will be created there. - - \ **cd /home/mykits**\ - - \ **buildkit create prodkit**\ - + + \ **cd /home/mykits**\ + + \ **buildkit create prodkit**\ + or - + 2. - + If a location is provided then the Kit files will be created there. Note that the Kit name does not necessarily have to be the directory name where the kit files are located. - - \ **buidkit create prodkit -l /home/mykits/prodkit**\ - + + \ **buidkit create prodkit -l /home/mykits/prodkit**\ + In both cases the /home/mykits/prodkit directory is created and the inital files for the kit are created in that directory. @@ -74,77 +74,77 @@ The following example illustrates the basic process for building a new Kit. In t 1. - + Change to the directory where you wish to create the Kit. - + 2. - + Create a template directory for your kit: - - \ **buildkit create mytstkit**\ - + + \ **buildkit create mytstkit**\ + 3. - + Change directory to the new "mytstkit" subdirectory that was just created. - - \ **cd mytstkit**\ - + + \ **cd mytstkit**\ + 4. - + Edit the buildkit configuration file for your kit: - - \ **vi buildkit.conf**\ - + + \ **vi buildkit.conf**\ + (See xCAT Kit documentation for details.) - + 5. - + Create all required files, scripts, plugins, and packages for your kit. - + 6. - + Validate your kit build configuration and fix any errors that are reported: - - \ **buildkit chkconfig**\ - + + \ **buildkit chkconfig**\ + 7. - + List the repos defined in your buildkit configuration file: - - \ **buildkit listrepo**\ - + + \ **buildkit listrepo**\ + 8. - + For each repo name listed, build the repository. Note that if you need to build repositories for OS distributions, versions, or architectures that do not match the current system, you may need to copy your kit template directory to an appropriate server to build that repository, and then copy the results back to your main build server. For example, to build a repo named "rhels6.3" you would run the following command. - - \ **buildkit buildrepo rhels6.3**\ - + + \ **buildkit buildrepo rhels6.3**\ + or, you can build all of the repos at one time if there are no OS or architecture dependencies for kitcomponent package builds or kitpackage builds: - - \ **buildkit buildrepo all**\ - + + \ **buildkit buildrepo all**\ + 9. - + Build the kit tar file: - - \ **buildkit buildtar**\ - + + \ **buildkit buildtar**\ + @@ -154,46 +154,46 @@ OPTIONS -\ **-h |-**\ **-help**\ - +\ **-h |-**\ **-help**\ + Display usage message. - -\ **-k|-**\ **-kitversion**\ \ *version*\ - + +\ **-k|-**\ **-kitversion**\ \ *version*\ + Product version. - -\ **-l|-**\ **-kitloc**\ \ *kit_location*\ - + +\ **-l|-**\ **-kitloc**\ \ *kit_location*\ + The directory location of the Kit files. - -\ **-p|-**\ **-pkgdir**\ \ *package_directory_list*\ - + +\ **-p|-**\ **-pkgdir**\ \ *package_directory_list*\ + A comma-separated list of directory locations for product RPMs. - -\ **-r|-**\ **-kitrelease**\ \ *release*\ - + +\ **-r|-**\ **-kitrelease**\ \ *release*\ + Product release. - -\ **-V |-**\ **-verbose**\ - + +\ **-V |-**\ **-verbose**\ + Verbose mode. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command version. - + @@ -203,73 +203,73 @@ SUB-COMMANDS -\ **create**\ \ *kit_basename*\ - +\ **create**\ \ *kit_basename*\ + Creates a new kit build directory structure for kit \ *kit_basename*\ using the location specified on the command line or the current directory. The sample kit files from /opt/xcat/share/xcat/kits/kit_template are copied over, and the buildkit.conf file is modified for the specified \ *kit_basename*\ . - -\ **chkconfig**\ - + +\ **chkconfig**\ + Reads the buildkit.conf file, verifies that the file syntax is correct and that all specified files exist. - -\ **listrepo**\ - + +\ **listrepo**\ + Reads the buildkit.conf file, lists all Kit package repositories listed in the file, and reports the build status for each repository. - + \ **buildrepo**\ {\ *repo_name*\ | \ **all**\ } - + Reads the buildkit.conf file, and builds the specified Kit package repository. The built packages are placed in the directory /build/kit_repodir/\ *repo_name*\ . If \ **all**\ is specified, all kit repositories are built. - + \ **cleanrepo**\ {\ *repo_name*\ | \ **all**\ } - + Reads the buildkit.conf file, and deletes all the package files and package meta data files from the /build/kit_repodir/\ *repo_name*\ directory. If \ **all**\ is specified, all kit repository files are deleted. - -\ **buildtar**\ - + +\ **buildtar**\ + Reads the buildkit.conf file, validates that all kit repositories have been built, and builds the Kit tar file /\ *kitname*\ .tar.bz2. - -\ **cleantar**\ - + +\ **cleantar**\ + Reads the /buildkit.conf file and \ *deletes*\ the following: - - + + - Kit tar files matching /\ *kit_name\\*.tar.bz2*\ . - - - /build/\ *kit_name*\ - + + - /build/\ *kit_name*\ + - /rpmbuild - + - /tmp - + - /debbuild - + Caution: Make sure you back up any tar files you would like to keep before running this subcommand. - -\ **cleanall**\ - + +\ **cleanall**\ + Equivalent to running \ **buildkit cleanrepo all**\ and \ **buildkit cleantar**\ . - -\ **addpkgs**\ - + +\ **addpkgs**\ + \ *kit_tarfile*\ {\ **-p**\ | \ **-**\ **-pkgdir**\ \ *package_directory_list*\ } [\ **-k**\ | \ **-**\ **-kitversion**\ \ *version*\ ] [\ **-r**\ | \ **-**\ **-kitrelease**\ \ *release*\ ] - + Add product package rpms to a previously built kit tar file. This is used for partial product kits that are built and shipped separately from the product packages, and are identified with a \ *kit_tarfile*\ name of \ *kitname*\ .\ **NEED_PRODUCT_PKGS.tar.bz2**\ . Optionally, change the kit release and version values when building the new kit tarfile. If kitcomponent version and/or release values are defaulted to the kit values, those will also be changed and new kitcomponent rpms will be built. If kit or kitcomponent scripts, plugins, or other files specify name, release, or version substitution strings, these will all be replaced with the new values when built into the new complete kit tarfile \ *kit_location*\ /\ *new_kitname*\ .\ **tar.bz2**\ . - + @@ -280,15 +280,15 @@ RETURN VALUE 0 - + The command completed successfully. - + 1 - + An error has occurred. - + @@ -299,49 +299,49 @@ EXAMPLES 1. - + To create the sample kit shipped with the xCAT-buildkit rpm on a RHELS 6.3 server and naming it \ **mykit**\ , run the following commands: - - \ **cd /home/myuserid/kits**\ - - \ **buildkit create mykit**\ - - \ **cd mykit**\ - - \ **vi buildkit.conf**\ - - \ **buildkit chkconfig**\ - - \ **buildkit listrepo**\ - - \ **buildkit buildrepo all**\ - - \ **buildkit buildtar**\ - + + \ **cd /home/myuserid/kits**\ + + \ **buildkit create mykit**\ + + \ **cd mykit**\ + + \ **vi buildkit.conf**\ + + \ **buildkit chkconfig**\ + + \ **buildkit listrepo**\ + + \ **buildkit buildrepo all**\ + + \ **buildkit buildtar**\ + 2. - + To clean up a kit repository directory after build failures on a RHELS 6.3 server to prepare for a new kit repository build, run: - - \ **buildkit cleanrepo rhels6.3**\ - + + \ **buildkit cleanrepo rhels6.3**\ + 3. - + To clean up all kit build files, including a previously built kit tar file, run - - \ **buildkit cleanall**\ - + + \ **buildkit cleanall**\ + 4. - + To create a kit named "tstkit" located in /home/foobar/tstkit instead of the current working directory. - - \ **buildkit create tstkit -l /home/foobar/tstkit**\ - + + \ **buildkit create tstkit -l /home/foobar/tstkit**\ + From 607205a9c786805200573358dcba03e8c0273503 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0263/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/cfgve.1.rst --- .../admin-guides/references/man1/cfgve.1.rst | 174 +++++++++--------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/cfgve.1.rst b/docs/source/guides/admin-guides/references/man1/cfgve.1.rst index 3c53d9b20..636f8aede 100644 --- a/docs/source/guides/admin-guides/references/man1/cfgve.1.rst +++ b/docs/source/guides/admin-guides/references/man1/cfgve.1.rst @@ -35,16 +35,16 @@ DESCRIPTION *********** -The \ **cfgve**\ command can be used to configure a virtual environment for +The \ **cfgve**\ command can be used to configure a virtual environment for 'Storage Domain', 'Network' and 'Template' objects. -The mandatory parameter \ **-m**\ \ *manager*\ is used to specify the address of the +The mandatory parameter \ **-m**\ \ *manager*\ is used to specify the address of the manager of virtual environment. xCAT needs it to access the RHEV manager. -The mandatory parameter \ **-t**\ \ *type*\ is used to specify the type of the target +The mandatory parameter \ **-t**\ \ *type*\ is used to specify the type of the target object. -Basically, \ **cfgve**\ command supports five types of object: \ **dc**\ , \ **cl**\ , +Basically, \ **cfgve**\ command supports five types of object: \ **dc**\ , \ **cl**\ , \ **sd**\ , \ **nw**\ and \ **tpl**\ . @@ -52,7 +52,7 @@ Basically, \ **cfgve**\ command supports five types of object: \ **dc**\ , \ ** \ **cl**\ - The \ **create**\ and \ **remove**\ operations are supported. -\ **sd**\ - The \ **create**\ , \ **attach**\ , \ **detach**\ , \ **activate**\ , +\ **sd**\ - The \ **create**\ , \ **attach**\ , \ **detach**\ , \ **activate**\ , \ **deactivate**\ and \ **remove**\ operations are supported. \ **nw**\ - The \ **create**\ , \ **attach**\ , \ **detach**\ and \ **remove**\ operations are supported. @@ -77,51 +77,51 @@ OPTIONS \ **-c**\ To create the target object. - - For creating of \ **Storage Domain**\ , the target storage domain will be created + + For creating of \ **Storage Domain**\ , the target storage domain will be created first, then attached to data center and activated. - - The parameters that used to create the storage domain are gotten + + The parameters that used to create the storage domain are gotten from 'virtsd' table. The detail parameters in the virtsd table: - - + + \ **virtsd.node**\ - The name of the storage domain. - - \ **virtsd.sdtype**\ - The type of storage domain. Valid value: data, iso, export. + + \ **virtsd.sdtype**\ - The type of storage domain. Valid value: data, iso, export. Default value is 'data'. - + \ **virtsd.stype**\ - The storage type. "nfs" or "localfs". - - \ **virtsd.location**\ - The location of the storage. - \ **nfs**\ : Format: [nfsserver:nfspath]. - The NFS export directory must be configured for read write access and must + + \ **virtsd.location**\ - The location of the storage. + \ **nfs**\ : Format: [nfsserver:nfspath]. + The NFS export directory must be configured for read write access and must be owned by vdsm:kvm. \ **localfs**\ : "/data/images/rhev" is set by default. - - \ **virtsd.host**\ - A host must be specified for a storage domain as SPM - (Storage Pool Manager) when initialize the storage domain. The role of SPM - may be migrated to other host by rhev-m during the running of the datacenter - (For example, when the current SPM encountered issue or going to maintenance + + \ **virtsd.host**\ - A host must be specified for a storage domain as SPM + (Storage Pool Manager) when initialize the storage domain. The role of SPM + may be migrated to other host by rhev-m during the running of the datacenter + (For example, when the current SPM encountered issue or going to maintenance status. - - \ **virtsd.datacenter**\ - The storage will be attached to. 'Default' data center + + \ **virtsd.datacenter**\ - The storage will be attached to. 'Default' data center is the default value. - -\ **-d**\ \ *data center*\ - + +\ **-d**\ \ *data center*\ + The name of data center. - - Specify the 'Data Center' that will be used for the object to be attached to. + + Specify the 'Data Center' that will be used for the object to be attached to. It is used by type. - + \ **-f**\ It can be used with \ **-r**\ to remove the target object by force. - + For removing of \ **Storage Domain**\ , if \ **-f**\ is specified, the storage domain will be deactivated and detached from data center before the removing. - + \ **-g**\ To activate the target object. @@ -132,73 +132,73 @@ OPTIONS -\ **-k**\ \ *storage type*\ - +\ **-k**\ \ *storage type*\ + To specify the type of the storage type when creating the data center. - + Supported type: nfs; localfs. - -\ **-l**\ \ *cluster*\ - + +\ **-l**\ \ *cluster*\ + Specify the cluster for the network to attach to. - -\ **-m**\ \ *manager*\ - + +\ **-m**\ \ *manager*\ + Specify the manager of the virtual environment. - - For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have + + For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have to be specified. - -\ **-n**\ \ *vlan ID*\ - + +\ **-n**\ \ *vlan ID*\ + To specify the vlan number when creating a network. - -\ **-o**\ \ *object*\ - + +\ **-o**\ \ *object*\ + The name of the target object. - -\ **-p**\ \ *cpu type*\ - + +\ **-p**\ \ *cpu type*\ + To specify the cpu type when creating the cluster. \ **Intel Penryn Family**\ is default type. - + Supported type: \ **Intel Conroe Family**\ , \ **Intel Penryn Family**\ , \ **Intel Nehalem Family**\ , \ **Intel Westmere Family**\ , \ **AMD Opteron G1**\ , - \ **AMD Opteron G2**\ , \ **AMD Opteron G3**\ - + \ **AMD Opteron G2**\ , \ **AMD Opteron G3**\ + \ **-r**\ To remove the target object. - + For removing of \ **Storage Domain**\ , the storage space will be formatted after removing. - + \ **-s**\ To deactivate the target object. -\ **-t**\ \ *type*\ - +\ **-t**\ \ *type*\ + Specify the \ **type**\ of the target object. - + Supported types: \ **dc**\ - Data Center \ **cl**\ - Cluster \ **sd**\ - Storage Domain \ **nw**\ - Network \ **tpl**\ - Template - + @@ -219,53 +219,53 @@ EXAMPLES 1. To create the Storage Domain 'sd1', enter: - - + + .. code-block:: perl - + cfgve -t sd -m -o sd1 -c - - + + 2. To deactivate the Storage Domain 'sd1' from data center, enter: - - + + .. code-block:: perl - + cfgve -t sd -m -o sd1 -s - - + + 3. To remove the Storage Domain 'sd1', enter: - - + + .. code-block:: perl - + cfgve -t sd -m -o sd1 -r - - + + 4. To create the network 'nw1', enter: - - + + .. code-block:: perl - + cfgve -t nw -m -o nw1 -c - - + + 5. To remove the template 'tpl01', enter: - - + + .. code-block:: perl - + cfgve -t tpl -m -o tpl01 -r - - + + From 182a55530a4858aa2f30a43c0770c10bf8b152f5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0264/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst --- .../source/guides/admin-guides/references/man1/cfm2xcat.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst b/docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst index c43171ce3..e04b5e922 100644 --- a/docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst +++ b/docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst @@ -15,7 +15,7 @@ NAME **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** @@ -25,7 +25,7 @@ NAME ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* From 7ec7584363617bab6f213627312f7a2830e6ed9c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0265/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/chdef.1.rst --- .../admin-guides/references/man1/chdef.1.rst | 240 +++++++++--------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/chdef.1.rst b/docs/source/guides/admin-guides/references/man1/chdef.1.rst index a18531e3c..dedf478e6 100644 --- a/docs/source/guides/admin-guides/references/man1/chdef.1.rst +++ b/docs/source/guides/admin-guides/references/man1/chdef.1.rst @@ -44,94 +44,94 @@ OPTIONS -\ *attr=val [attr=val ...]*\ - +\ *attr=val [attr=val ...]*\ + Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. Use the help option to get a list of valid attributes for each object type. - -\ **-d|-**\ **-dynamic**\ - + +\ **-d|-**\ **-dynamic**\ + Use the dynamic option to change dynamic node groups definition. This option must be used with -w option. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-m|-**\ **-minus**\ - + +\ **-m|-**\ **-minus**\ + If the value of the attribute is a list then this option may be used to remove one or more items from the list. - -\ **-n**\ \ *new-name*\ - + +\ **-n**\ \ *new-name*\ + Change the current object name to the new-name which is specified by the -n option. Objects of type site, group and monitoring cannot be renamed with the -n option. Note: For the \ **-n**\ option, only one node can be specified. For some special nodes such as fsp, bpa, frame, cec etc., their name is referenced in their own hcp attribute, or the hcp attribute of other nodes. If you use \ **-n**\ option, you must manually change all hcp attributes that refer to this name. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. (must be the first parameter) See the "noderange" man page for details on supported formats. - -\ **-o**\ \ *object-names*\ - + +\ **-o**\ \ *object-names*\ + A set of comma delimited object names. - -\ **-p|-**\ **-plus**\ - + +\ **-p|-**\ **-plus**\ + This option will add the specified values to the existing value of the attribute. It will create a comma-separated list of values. - -\ **-t**\ \ *object-types*\ - + +\ **-t**\ \ *object-types*\ + A set of comma delimited object types. Use the help option to get a list of valid object types. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - + \ **-w**\ \ *attr==val*\ \ **-w**\ \ *attr=~val*\ ... - + Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. Use the help option to get a list of valid attributes for each object type. - + Operator descriptions: == Select nodes where the attribute value is exactly this value. != Select nodes where the attribute value is not this specific value. =~ Select nodes where the attribute value matches this regular expression. !~ Select nodes where the attribute value does not match this regular expression. - + Note: the operator !~ will be parsed by shell, if you want to use !~ in the selection string, use single quote instead. For example:-w 'mgt!~ipmi'. - -\ **-z|-**\ **-stanza**\ - + +\ **-z|-**\ **-stanza**\ + Indicates that the file being piped to the command is in stanza format. See the xcatstanzafile man page for details on using xCAT stanza files. - -\ **-u**\ - + +\ **-u**\ + Fill in the attributes such as template file, pkglist file and otherpkglist file of osimage object based on the specified parameters. It will search "/install/custom/" directory first, and then "/opt/xcat/share/". - + Note: this option only works for objtype \ **osimage**\ . - + @@ -152,161 +152,161 @@ EXAMPLES 1. - + To change a site definition. - - + + .. code-block:: perl - + chdef -t site -o clustersite installdir=/xcatinstall - - + + 2. - + To change a basic node definition. - - + + .. code-block:: perl - + chdef -t node -o node01 groups="all,aix" - - + + (The group definitions are also created if they don't already exist.) - + 3. - + To add another group to the "groups" attribute in the previous example. - - + + .. code-block:: perl - + chdef -p -t node -o node01 groups="compute" - - + + 4. - + To remove the "all" group from the "groups" attribute in the previous example. - - + + .. code-block:: perl - + chdef -m -t node -o node01 groups="all" - - + + 5. - + To replace the current "groups" attribute value of "node01". - - + + .. code-block:: perl - + chdef -t node -o node01 groups="linux" - - + + 6. - + To add "node01" to the "members" attribute of a group definition called "LinuxNodes". - - + + .. code-block:: perl - + chdef -p -t group -o LinuxNodes members="node01" - - + + 7. - + To update a set of definitions based on information contained in the stanza file mystanzafile. - - + + .. code-block:: perl - + cat mystanzafile | chdef -z - - + + 8. - + To update a dynamic node group definition to add the cons=hmc wherevals pair. - - + + .. code-block:: perl - + chdef -t group -o dyngrp -d -p -w cons==hmc - - + + 9. - + To change the node object name from node1 to node2. - - + + .. code-block:: perl - + chdef -t node -o node1 -n node2 - - + + 10. - + To change the node hwtype, this command will change the value of ppc.nodetype. - - + + .. code-block:: perl - + chdef -t node -o node1 hwtype=lpar - - + + 11. - + To change the policy table for policy number 7.0 for admin1 - - + + .. code-block:: perl - + chdef -t policy -o 7.0 name=admin1 rule=allow - - + + 12. - + To change the node nic attributes - - + + .. code-block:: perl - + chdef -t node -o cn1 nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet" - - + + 13. - + To update an osimage definition. - - + + .. code-block:: perl - + chdef redhat6img -u provmethod=install - - + + From 6d2537ae905c2f85e1ed1040361c518fd87fc1cc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0266/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst --- .../references/man1/chhypervisor.1.rst | 252 +++++++++--------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst b/docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst index b0a3b667c..84e617cb5 100644 --- a/docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst +++ b/docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **RHEV specific :**\ +\ **RHEV specific :**\ \ **chhypervisor**\ \ *noderange*\ [\ **-a**\ ] @@ -32,7 +32,7 @@ SYNOPSIS \ **chhypervisor**\ \ *noderange*\ [\ **-d**\ ] -\ **zVM specific :**\ +\ **zVM specific :**\ \ **chhypervisor**\ \ *noderange*\ [\ **-**\ **-adddisk2pool**\ \ *function*\ \ *region*\ \ *volume*\ \ *group*\ ] @@ -65,10 +65,10 @@ DESCRIPTION The \ **chhypervisor**\ command can be used to configure the RHEV-h. -The rhev-h host will register to the rhev-m automatically, but admin needs to +The rhev-h host will register to the rhev-m automatically, but admin needs to approve the host can be added to the 'cluster' with \ **-a**\ flag . -After registering, the network interfaces of host need to be added to the 'network' of +After registering, the network interfaces of host need to be added to the 'network' of RHEV. And the power management for the host should be configured so that rhev-m could make proper decision when certain host encountered error. @@ -87,7 +87,7 @@ The columns of hypervisor table: \ **hypervisor.interface**\ - The configuration for the nics. Refer to \ **-n**\ . -\ **hypervisor.cluster**\ - The cluster that the host will be added to. The +\ **hypervisor.cluster**\ - The cluster that the host will be added to. The default is 'Default' cluster if not specified. @@ -102,51 +102,51 @@ RHEV specific : \ **-a**\ Approve the host that to be added to cluster. - + Before approve, the status of the host must be 'pending_approval'. - + \ **-n**\ Configure the network interfaces for the host. - - Note: This operation only can be run when host is in 'maintenance mode'. + + Note: This operation only can be run when host is in 'maintenance mode'. Use \ **-d**\ to switch the host to 'maintenance' mode. - + The interfaces which configured in hypervisor.interface will be added to the network of RHEV. - + The format of hypervisor.interface is multiple [network:interfacename: - protocol:IP:netmask:gateway] sections separated with '|'. For example: + protocol:IP:netmask:gateway] sections separated with '|'. For example: [rhevm2:eth0:static:10.1.0.236:255.255.255.0:0.0.0.0]. - - - \ **network**\ - The logic network which has been created by 'cfgve -t nw' + + + \ **network**\ - The logic network which has been created by 'cfgve -t nw' or the default management network 'rhevm'. - + \ **interfacename**\ - Physical network name: 'eth0','eth1'... - - \ **protocol**\ - To identify which boot protocol to use for the interface: dhcp + + \ **protocol**\ - To identify which boot protocol to use for the interface: dhcp or static. - + \ **IP**\ - The IP address for the interface. - + \ **netmask**\ - The network mask for the interface. - - \ **gateway**\ - The gateay for the interface. This field only can be set when + + \ **gateway**\ - The gateay for the interface. This field only can be set when the interface is added to 'rhevm' network. - + \ **-p**\ Configure the power management for the host. - - The power management must be configured for the rhev-h host to make the - rhev-m to monitor the power status of the host, so that when certain host + + The power management must be configured for the rhev-h host to make the + rhev-m to monitor the power status of the host, so that when certain host failed to function, rhev-m will fail over certain role like SPM to other active host. - - For rack mounted server, the bmc IP and user:password need to be set for the - power management (These parameters are gotten from ipmi table). rhev-m uses the + + For rack mounted server, the bmc IP and user:password need to be set for the + power management (These parameters are gotten from ipmi table). rhev-m uses the ipmi protocol to get the power status of the host. - + \ **-e**\ To activate the host. @@ -167,84 +167,84 @@ zVM specific : -\ **-**\ **-adddisk2pool**\ \ *function*\ \ *region*\ \ *volume*\ \ *group*\ - - Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be - either: (4) Define region as full volume and add to group OR (5) Add existing - region to group. If the volume already exists in the EXTENT CONTROL, use +\ **-**\ **-adddisk2pool**\ \ *function*\ \ *region*\ \ *volume*\ \ *group*\ + + Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be + either: (4) Define region as full volume and add to group OR (5) Add existing + region to group. If the volume already exists in the EXTENT CONTROL, use function 5. If the volume does not exist in the EXTENT CONTROL, but is attached to SYSTEM, use function 4. - -\ **-**\ **-addscsi**\ \ *device_number*\ \ *device_path*\ \ *option*\ \ *persist*\ - + +\ **-**\ **-addscsi**\ \ *device_number*\ \ *device_path*\ \ *option*\ \ *persist*\ + Dynamically add a SCSI disk to a running z/VM system. - -\ **-**\ **-addvlan**\ \ *name*\ \ *owner*\ \ *type*\ \ *transport*\ - + +\ **-**\ **-addvlan**\ \ *name*\ \ *owner*\ \ *type*\ \ *transport*\ + Create a virtual network LAN. - -\ **-**\ **-addvswitch**\ \ *name*\ \ *osa_dev_addr*\ \ *osa_exp_adapter*\ \ *controller*\ \ *connect (0, 1, or 2)*\ \ *memory_queue*\ \ *router*\ \ *transport*\ \ *vlan_id*\ \ *port_type*\ \ *update*\ \ *gvrp*\ \ *native_vlan*\ - + +\ **-**\ **-addvswitch**\ \ *name*\ \ *osa_dev_addr*\ \ *osa_exp_adapter*\ \ *controller*\ \ *connect (0, 1, or 2)*\ \ *memory_queue*\ \ *router*\ \ *transport*\ \ *vlan_id*\ \ *port_type*\ \ *update*\ \ *gvrp*\ \ *native_vlan*\ + Create a virtual switch. - -\ **-**\ **-addzfcp2pool**\ \ *pool*\ \ *status*\ \ *wwpn*\ \ *lun*\ \ *size*\ \ *owner*\ - - Add a zFCP device to a device pool defined in xCAT. The device must have been - carved up in the storage controller and configured with a WWPN/LUN before it - can be added to the xCAT storage pool. z/VM does not have the ability to + +\ **-**\ **-addzfcp2pool**\ \ *pool*\ \ *status*\ \ *wwpn*\ \ *lun*\ \ *size*\ \ *owner*\ + + Add a zFCP device to a device pool defined in xCAT. The device must have been + carved up in the storage controller and configured with a WWPN/LUN before it + can be added to the xCAT storage pool. z/VM does not have the ability to communicate directly with the storage controller to carve up disks dynamically. - -\ **-**\ **-removediskfrompool**\ \ *function*\ \ *region*\ \ *group*\ - - Remove a disk from a disk pool defined in the EXTENT CONTROL. Function type can - be either: (1) Remove region, (2) Remove region from group, (3) Remove region + +\ **-**\ **-removediskfrompool**\ \ *function*\ \ *region*\ \ *group*\ + + Remove a disk from a disk pool defined in the EXTENT CONTROL. Function type can + be either: (1) Remove region, (2) Remove region from group, (3) Remove region from all groups, OR (7) Remove entire group . - -\ **-**\ **-removescsi**\ \ *device_number*\ \ *persist (YES or NO)*\ - + +\ **-**\ **-removescsi**\ \ *device_number*\ \ *persist (YES or NO)*\ + Delete a real SCSI disk. - -\ **-**\ **-removevlan**\ \ *name*\ \ *owner*\ - + +\ **-**\ **-removevlan**\ \ *name*\ \ *owner*\ + Delete a virtual network LAN. - -\ **-**\ **-removevswitch**\ \ *name*\ - + +\ **-**\ **-removevswitch**\ \ *name*\ + Delete a virtual switch. - -\ **-**\ **-removezfcpfrompool**\ \ *pool*\ \ *lun*\ - + +\ **-**\ **-removezfcpfrompool**\ \ *pool*\ \ *lun*\ + Remove a zFCP device from a device pool defined in xCAT. - -\ **-**\ **-smcli**\ \ *function*\ \ *arguments*\ - - Execute a SMAPI function. A list of APIs supported can be found by using the - help flag, e.g. chhypervisor pokdev61 --smcli -h. Specific arguments associated - with a SMAPI function can be found by using the help flag for the function, - e.g. chhypervisor pokdev61 --smcli Image_Query_DM -h. Only z/VM 6.2 and older - SMAPI functions are supported at this time. Additional SMAPI functions will be + +\ **-**\ **-smcli**\ \ *function*\ \ *arguments*\ + + Execute a SMAPI function. A list of APIs supported can be found by using the + help flag, e.g. chhypervisor pokdev61 --smcli -h. Specific arguments associated + with a SMAPI function can be found by using the help flag for the function, + e.g. chhypervisor pokdev61 --smcli Image_Query_DM -h. Only z/VM 6.2 and older + SMAPI functions are supported at this time. Additional SMAPI functions will be added in subsequent zHCP versions. - + @@ -270,53 +270,53 @@ RHEV specific : 1. To approve the host 'host1', enter: - - + + .. code-block:: perl - + chhypervisor host1 -a - - + + 2. To configure the network interface for the host 'host1', enter: - - + + .. code-block:: perl - + chhypervisor host1 -n - - + + 3. To configure the power management for the host 'host1', enter: - - + + .. code-block:: perl - + chhypervisor host1 -p - - + + 4. To activate the host 'host1', enter: - - + + .. code-block:: perl - + chhypervisor host1 -e - - + + 5. To deactivate the host 'host1', enter: - - + + .. code-block:: perl - + chhypervisor host1 -d - - + + @@ -326,53 +326,53 @@ zVM specific : 1. To add a disk to a disk pool defined in the EXTENT CONTROL, enter: - - + + .. code-block:: perl - + chhypervisor pokdev61 --adddisk2pool 4 DM1234 DM1234 POOL1 - - + + 2. To add a zFCP device to a device pool defined in xCAT, enter: - - + + .. code-block:: perl - + chhypervisor pokdev61 --addzfcp2pool zfcp1 free 500501234567C890 4012345600000000 8G - - + + 3. To remove a region from a group in the EXTENT CONTROL, enter: - - + + .. code-block:: perl - + chhypervisor pokdev61 --removediskfrompool 2 DM1234 POOL1 - - + + 4. To remove a zFCP device from a device pool defined in xCAT, enter: - - + + .. code-block:: perl - + chhypervisor pokdev61 --removezfcpfrompool zfcp1 4012345600000000 500501234567C890 - - + + 5. To execute a SMAPI function (Image_Query_DM), enter: - - + + .. code-block:: perl - + chhypervisor pokdev61 --smcli Image_Query_DM -T LNX3 - - + + From bac0d813e20dcdb1d2485a23a88bbd5488c6a50d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0267/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst --- .../references/man1/chkkitcomp.1.rst | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst b/docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst index ffb675f04..841de9808 100644 --- a/docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **chkkitcomp**\ [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ] -\ **chkkitcomp**\ [\ **-V | -**\ **-verbose**\ ] \ **-i**\ \ *osimage*\ \ *kitcompname_list*\ +\ **chkkitcomp**\ [\ **-V | -**\ **-verbose**\ ] \ **-i**\ \ *osimage*\ \ *kitcompname_list*\ *********** @@ -42,34 +42,34 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command version. - -\ **-i**\ \ *osimage*\ - + +\ **-i**\ \ *osimage*\ + The name of the osimage to check against. - -\ *kitcompname_list*\ - + +\ *kitcompname_list*\ + A comma-delimited list of valid full kit component names or kit component basenames that are to be checked against the osimage. - + From 6c180cef8315551eded4461a6be14861e4083128 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0268/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/chkosimage.1.rst --- .../references/man1/chkosimage.1.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/chkosimage.1.rst b/docs/source/guides/admin-guides/references/man1/chkosimage.1.rst index 800184021..f09ea69ae 100644 --- a/docs/source/guides/admin-guides/references/man1/chkosimage.1.rst +++ b/docs/source/guides/admin-guides/references/man1/chkosimage.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **chkosimage [-h | -**\ **-help ]**\ +\ **chkosimage [-h | -**\ **-help ]**\ -\ **chkosimage [-V] [-c|-**\ **-clean]**\ \ *osimage_name*\ +\ **chkosimage [-V] [-c|-**\ **-clean]**\ \ *osimage_name*\ *********** @@ -31,12 +31,12 @@ DESCRIPTION This command is currently supported for AIX osimages only. -Use this command to verify if the NIM lpp_source directories contain the +Use this command to verify if the NIM lpp_source directories contain the correct software. The lpp_source directory must contain all the software -that is specified in the "installp_bundle" and "otherpkgs" +that is specified in the "installp_bundle" and "otherpkgs" attributes of the osimage definition. -The command gets the name of the lpp_source resource from the xCAT osimage +The command gets the name of the lpp_source resource from the xCAT osimage definition and the location of the lpp_source directory from the NIM resource definition. @@ -46,16 +46,16 @@ Note: Remember to use the prefixes, "I:", "R:", and "E:", respectively, when specifying package names in an installp_bundle file or an otherpkgs list. In addition to checking for missing software the chkosimage command will -also check to see if there are multiple matches. This could happen +also check to see if there are multiple matches. This could happen when you use wildcards in the software file names. For example, if you -have perl-xCAT\* in a bundle file it could match multiple versions of the xCAT +have perl-xCAT\* in a bundle file it could match multiple versions of the xCAT rpm package saved in your lpp_source directory. If this happens you must remove the unwanted versions of the rpms. If the extra rpms are not removed you will get install errors. -To help with this process you can use the "-c|--clean" option. This -option will keep the rpm package with the most recent timestamp and +To help with this process you can use the "-c|--clean" option. This +option will keep the rpm package with the most recent timestamp and remove the others. The chkosimage command should always be used to verify the lpp_source content @@ -68,29 +68,29 @@ OPTIONS -\ **-c |-**\ **-clean**\ - +\ **-c |-**\ **-clean**\ + Remove any older versions of the rpms. Keep the version with the latest timestamp. - -\ **-h |-**\ **-help**\ - + +\ **-h |-**\ **-help**\ + Display usage message. - -\ *osimage_name*\ - + +\ *osimage_name*\ + The name of the xCAT for AIX osimage definition. - -\ **-V |-**\ **-verbose**\ - + +\ **-V |-**\ **-verbose**\ + Verbose mode. - + @@ -115,27 +115,27 @@ EXAMPLES -1. Check the XCAT osimage called "61image" to verify that the lpp_source +1. Check the XCAT osimage called "61image" to verify that the lpp_source directories contain all the software that is specified in the "installp_bundle" and "otherpkgs" attributes. - - + + .. code-block:: perl - + chkosimage -V 61image - - + + 2. Clean up the lpp_source directory for the osimage named "61img" by removing any older rpms with the same names but different versions. - - + + .. code-block:: perl - + chkosimage -c 61img - - + + From 139103a979f47c120e59361376c260f19143f64a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0269/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/chvlan.1.rst --- .../admin-guides/references/man1/chvlan.1.rst | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/chvlan.1.rst b/docs/source/guides/admin-guides/references/man1/chvlan.1.rst index 0f749399b..917f8948e 100644 --- a/docs/source/guides/admin-guides/references/man1/chvlan.1.rst +++ b/docs/source/guides/admin-guides/references/man1/chvlan.1.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **chvlan**\ \ *vlanid*\ \ **-n | -**\ **-nodes**\ \ *noderange*\ [\ **-i | -**\ **-interface**\ \ *nic*\ ] -\ **chvlan**\ \ *vlanid*\ \ **-n | -**\ **-nodes**\ \ *noderange*\ \ **-d | -**\ **-delete**\ +\ **chvlan**\ \ *vlanid*\ \ **-n | -**\ **-nodes**\ \ *noderange*\ \ **-d | -**\ **-delete**\ \ **chvlan**\ [\ **-h | -**\ **-help**\ ] @@ -86,77 +86,77 @@ EXAMPLES 1. - + To add node1, node2 and node3 to vlan 3. - - + + .. code-block:: perl - + chvlan 3 -n node1,node2,node3 - - + + 2. - + To add node1, node2 and node3 to vlan 3 using eth1 interface. - - + + .. code-block:: perl - + chvlan 3 -n node1,node2,node3 -i eth1 - - + + 3. - + TO remove node1, node2 and node3 from vlan 3. - - + + .. code-block:: perl - + chvlan -n node1,node2,node3 -d - - + + 4. - + To add KVM guests node1 and node2 to vlan 3 - - + + .. code-block:: perl - + mkdef node1 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms - + mkdef node2 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms - + chvlan 3 -n node1,node2 - + mkvm node1,node2 -s 20G - + rpower node1,node2 on - + rinstall node1,node2 - - + + 5. - + To remove KVM guests node1 and node2 from vlan 3 - - + + .. code-block:: perl - + chvlan 3 -n node1,node2 -d - + rpower node1,node2 off - + rmvm node1,node2 - - + + From 99277f230f6157572a275369be44fc5095864639 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0270/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/chvlanports.1.rst --- .../references/man1/chvlanports.1.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/chvlanports.1.rst b/docs/source/guides/admin-guides/references/man1/chvlanports.1.rst index 1f1e27fff..3ff3d6f5f 100644 --- a/docs/source/guides/admin-guides/references/man1/chvlanports.1.rst +++ b/docs/source/guides/admin-guides/references/man1/chvlanports.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **chvlanports**\ \ *vlanid*\ \ **-n | -**\ **-nodes**\ \ *noderange*\ \ **-i | -**\ **-interface**\ \ *nic*\ +\ **chvlanports**\ \ *vlanid*\ \ **-n | -**\ **-nodes**\ \ *noderange*\ \ **-i | -**\ **-interface**\ \ *nic*\ -\ **chvlanports**\ \ *vlanid*\ \ **-n | -**\ **-nodes**\ \ *noderange*\ \ **-i | -**\ **-interface**\ \ *nic*\ \ **-d | -**\ **-delete**\ +\ **chvlanports**\ \ *vlanid*\ \ **-n | -**\ **-nodes**\ \ *noderange*\ \ **-i | -**\ **-interface**\ \ *nic*\ \ **-d | -**\ **-delete**\ \ **chvlanports**\ [\ **-h | -**\ **-help**\ ] @@ -81,27 +81,27 @@ EXAMPLES 1. - + To add node1, node2 and node3 to vlan 3 using eth1 interface. - - + + .. code-block:: perl - + chvlanports 3 -n node1,node2,node3 -i eth1 - - + + 2. - + TO remove eth1 interface of node1, node2 and node3 from vlan 3. - - + + .. code-block:: perl - + chvlanports 3 -n node1,node2,node3 -i eth1 -d - - + + From 3ebb80da6369f07f91722fc19d237d20764b5109 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0271/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/chvm.1.rst --- .../admin-guides/references/man1/chvm.1.rst | 354 +++++++++--------- 1 file changed, 177 insertions(+), 177 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/chvm.1.rst b/docs/source/guides/admin-guides/references/man1/chvm.1.rst index 14b1f28ea..a6c0f2bf7 100644 --- a/docs/source/guides/admin-guides/references/man1/chvm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/chvm.1.rst @@ -38,7 +38,7 @@ PPC (using Direct FSP Management) specific: \ **chvm**\ \ *noderange*\ \ **-**\ **-p775**\ [\ **-p**\ \ *profile*\ ] -\ **chvm**\ \ *noderange*\ \ **-**\ **-p775**\ \ **-i id**\ [\ **-m**\ \ *memory_interleaving*\ ] \ **-r**\ \ *partition_rule*\ +\ **chvm**\ \ *noderange*\ \ **-**\ **-p775**\ \ **-i id**\ [\ **-m**\ \ *memory_interleaving*\ ] \ **-r**\ \ *partition_rule*\ \ **chvm**\ \ *noderange*\ [\ **lparname**\ ={ \* | \ *name*\ }] @@ -180,16 +180,16 @@ Common: -\ **-h**\ - +\ **-h**\ + Display usage message. - -\ **-v**\ - + +\ **-v**\ + Command Version. - + @@ -198,22 +198,22 @@ PPC (with HMC) specific: -\ **-p**\ \ *profile*\ - +\ **-p**\ \ *profile*\ + Name of an existing partition profile. - -\ *attr*\ =\ *val*\ - + +\ *attr*\ =\ *val*\ + Specifies one or more "attribute equals value" pairs, separated by spaces. - -\ **-V**\ - + +\ **-V**\ + Verbose output. - + @@ -222,80 +222,80 @@ PPC (using Direct FSP Management) specific: -\ **-**\ **-p775**\ - +\ **-**\ **-p775**\ + Specify the operation is for Power 775 machines. - -\ **-i**\ - + +\ **-i**\ + Starting numeric id of the newly created partitions. For Power 775 using Direct FSP Management, the id value only could be \ **1**\ , \ **5**\ , \ **9**\ , \ **13**\ , \ **17**\ , \ **21**\ , \ **25**\ and \ **29**\ . Shall work with option \ **-**\ **-p775**\ . - -\ **-m**\ - + +\ **-m**\ + memory interleaving. The setting value only could be \ **1**\ or \ **2**\ . \ **2**\ means \ **non-interleaved**\ mode (also 2MC mode), the memory cannot be shared across the processors in an octant. \ **1**\ means \ **interleaved**\ mode (also 8MC mode) , the memory can be shared. The default value is \ **1**\ . Shall work with option \ **-**\ **-p775**\ . - -\ **-r**\ - + +\ **-r**\ + partition rule. Shall work with option \ **-**\ **-p775**\ . - + If all the octants configuration value are same in one CEC, it will be " \ **-r**\ \ **0-7**\ :\ *value*\ " . - + If the octants use the different configuration value in one cec, it will be "\ **-r**\ \ **0**\ :\ *value1*\ ,\ **1**\ :\ *value2*\ ,...\ **7**\ :\ *value7*\ ", or "\ **-r**\ \ **0**\ :\ *value1*\ ,\ **1-7**\ :\ *value2*\ " and so on. - + The octants configuration value for one Octant could be \ **1**\ , \ **2**\ , \ **3**\ , \ **4**\ , \ **5**\ . The meanings of the octants configuration value are as following: - - + + .. code-block:: perl - + 1 -- 1 partition with all cpus and memory of the octant 2 -- 2 partitions with a 50/50 split of cpus and memory 3 -- 3 partitions with a 25/25/50 split of cpus and memory 4 -- 4 partitions with a 25/25/25/25 split of cpus and memory 5 -- 2 partitions with a 25/75 split of cpus and memory - - -\ **-p**\ \ *profile*\ - + + +\ **-p**\ \ *profile*\ + Name of I/O slots assignment profile. Shall work with option \ **-**\ **-p775**\ . - + \ **lparname**\ ={\ **\\* | name**\ } - + Set LPAR name for the specified lpars. If '\*' specified, it means to get names from xCAT database and then set them for the specified lpars. If a string is specified, it only supports single node and the string will be set for the specified lpar. The user can use lsvm to check the lparnames for lpars. - -\ **vmcpus=value**\ \ **vmmemory=value**\ \ **add_physlots=value**\ \ **vmothersetting=value**\ - + +\ **vmcpus=value**\ \ **vmmemory=value**\ \ **add_physlots=value**\ \ **vmothersetting=value**\ + To specify the parameters that will be modified. - + \ **add_vmnics=value**\ \ **add_vmstorage=value**\ [\ **-**\ **-vios**\ ] - + To create new virtual adapter for the specified node. - -\ **del_physlots=drc_index1,drc_index2...**\ - + +\ **del_physlots=drc_index1,drc_index2...**\ + To delete physical slots which are specified by the \ *drc_index1,drc_index2...*\ . - -\ **del_vadapter=slotid**\ - + +\ **del_vadapter=slotid**\ + To delete a virtual adapter specified by the \ *slotid*\ . - + @@ -304,40 +304,40 @@ VMware/KVM specific: -\ **-a**\ \ *size*\ - +\ **-a**\ \ *size*\ + Add a new Hard disk with size defaulting to GB. Multiple can be added with comma separated values. - -\ **-**\ **-cpus**\ \ *count*\ - + +\ **-**\ **-cpus**\ \ *count*\ + Set the number of CPUs. - -\ **-d**\ \ *disk*\ - + +\ **-d**\ \ *disk*\ + Deregister the Hard disk but leave the backing files. Multiple can be done with comma separated values. The disks are specified by SCSI id. - -\ **-**\ **-mem**\ \ *memory*\ - + +\ **-**\ **-mem**\ \ *memory*\ + Set the memory, defaults to MB. - -\ **-p**\ \ *disk*\ - + +\ **-p**\ \ *disk*\ + Purge the Hard disk. Deregisters and deletes the files. Multiple can be done with comma separated values. The disks are specified by SCSI id. - -\ **-**\ **-resize**\ \ *disk*\ =\ *size*\ - + +\ **-**\ **-resize**\ \ *disk*\ =\ *size*\ + Change the size of the Hard disk. The disk in \ *qcow2*\ format can not be set to less than its current size. The disk in \ *raw*\ format can be resized smaller, use caution. Multiple disks can be resized by using comma separated \ *disk*\ \ **=**\ \ *size*\ pairs. The disks are specified by SCSI id. Size defaults to GB. - + @@ -346,38 +346,38 @@ KVM specific: -\ **-**\ **-cpupin hostcpuset**\ - +\ **-**\ **-cpupin hostcpuset**\ + To pin guest domain virtual CPUs to physical host CPUs specified with \ *hostcpuset*\ . \ *hostcpuset*\ is a list of physical CPU numbers. Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and the '^' denotes exclusive. - + Note: The expression is sequentially evaluated, so "0-15,^8" is identical to "9-14,0-7,15" but not identical to "^8,0-15". - -\ **-**\ **-membind numanodeset**\ - - It is possible to restrict a guest to allocate memory from the specified set of NUMA nodes \ *numanodeset*\ . + +\ **-**\ **-membind numanodeset**\ + + It is possible to restrict a guest to allocate memory from the specified set of NUMA nodes \ *numanodeset*\ . If the guest vCPUs are also pinned to a set of cores located on that same set of NUMA nodes, memory access is local and improves memory access performance. - -\ **-**\ **-devpassthru pcidevice1,pcidevice2...**\ - - The PCI passthrough gives a guest VM direct access to I/O devices \ *pcidevice1,pcidevice2...*\ . + +\ **-**\ **-devpassthru pcidevice1,pcidevice2...**\ + + The PCI passthrough gives a guest VM direct access to I/O devices \ *pcidevice1,pcidevice2...*\ . The PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively. The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\ on the host. - -\ **-**\ **-devdetach pcidevice1,pcidevice2...**\ - + +\ **-**\ **-devdetach pcidevice1,pcidevice2...**\ + To detaching the PCI devices which are attached to VM guest via PCI passthrough from the VM guest. The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\ on the host. - + @@ -386,185 +386,185 @@ zVM specific: -\ **-**\ **-add3390**\ \ *disk_pool*\ \ *device_address*\ \ *size*\ \ *mode*\ \ *read_password*\ \ *write_password*\ \ *multi_password*\ - +\ **-**\ **-add3390**\ \ *disk_pool*\ \ *device_address*\ \ *size*\ \ *mode*\ \ *read_password*\ \ *write_password*\ \ *multi_password*\ + Adds a 3390 (ECKD) disk to a virtual machine's directory entry. The device address can be automatically assigned by specifying 'auto'. The size of the disk can be specified in GB, MB, or the number of cylinders. - -\ **-**\ **-add3390active**\ \ *device_address*\ \ *mode*\ - + +\ **-**\ **-add3390active**\ \ *device_address*\ \ *mode*\ + Adds a 3390 (ECKD) disk that is defined in a virtual machine's directory entry to that virtual server's active configuration. - -\ **-**\ **-add9336**\ \ *disk_pool*\ \ *device_address*\ \ *size*\ \ *mode*\ \ *read_password*\ \ *write_password*\ \ *multi_password*\ - + +\ **-**\ **-add9336**\ \ *disk_pool*\ \ *device_address*\ \ *size*\ \ *mode*\ \ *read_password*\ \ *write_password*\ \ *multi_password*\ + Adds a 9336 (FBA) disk to a virtual machine's directory entry. The device address can be automatically assigned by specifying 'auto'. The size of the disk can be specified in GB, MB, or the number of blocks. - -\ **-**\ **-adddisk2pool**\ \ *function*\ \ *region*\ \ *volume*\ \ *group*\ - + +\ **-**\ **-adddisk2pool**\ \ *function*\ \ *region*\ \ *volume*\ \ *group*\ + Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be either: (4) Define region as full volume and add to group OR (5) Add existing region to group. The disk has to already be attached to SYSTEM. - -\ **-**\ **-addnic**\ \ *device_address*\ \ *type*\ \ *device_count*\ - + +\ **-**\ **-addnic**\ \ *device_address*\ \ *type*\ \ *device_count*\ + Adds a network adapter to a virtual machine's directory entry (case sensitive). - -\ **-**\ **-addpagespool**\ \ *volume_addr*\ \ *volume_label*\ \ *volume_use*\ \ *system_config_name*\ \ *system_config_type*\ \ *parm_disk_owner*\ \ *parm_disk_number*\ \ *parm_disk_password*\ - + +\ **-**\ **-addpagespool**\ \ *volume_addr*\ \ *volume_label*\ \ *volume_use*\ \ *system_config_name*\ \ *system_config_type*\ \ *parm_disk_owner*\ \ *parm_disk_number*\ \ *parm_disk_password*\ + Add a full volume page or spool disk to the virtual machine. - -\ **-**\ **-addprocessor**\ \ *device_address*\ - + +\ **-**\ **-addprocessor**\ \ *device_address*\ + Adds a virtual processor to a virtual machine's directory entry. - -\ **-**\ **-addprocessoractive**\ \ *device_address*\ \ *type*\ - + +\ **-**\ **-addprocessoractive**\ \ *device_address*\ \ *type*\ + Adds a virtual processor to a virtual machine's active configuration (case sensitive). - -\ **-**\ **-addvdisk**\ \ *device_address*\ \ *size*\ - + +\ **-**\ **-addvdisk**\ \ *device_address*\ \ *size*\ + Adds a v-disk to a virtual machine's directory entry. - -\ **-**\ **-addzfcp**\ \ *pool*\ \ *device_address*\ \ *loaddev*\ \ *size*\ \ *tag*\ \ *wwpn*\ \ *lun*\ - - Add a zFCP device to a device pool defined in xCAT. The device must have been - carved up in the storage controller and configured with a WWPN/LUN before it can - be added to the xCAT storage pool. z/VM does not have the ability to communicate - directly with the storage controller to carve up disks dynamically. xCAT will - find the a zFCP device in the specified pool that meets the size required, if - the WWPN and LUN are not given. The device address can be automatically assigned + +\ **-**\ **-addzfcp**\ \ *pool*\ \ *device_address*\ \ *loaddev*\ \ *size*\ \ *tag*\ \ *wwpn*\ \ *lun*\ + + Add a zFCP device to a device pool defined in xCAT. The device must have been + carved up in the storage controller and configured with a WWPN/LUN before it can + be added to the xCAT storage pool. z/VM does not have the ability to communicate + directly with the storage controller to carve up disks dynamically. xCAT will + find the a zFCP device in the specified pool that meets the size required, if + the WWPN and LUN are not given. The device address can be automatically assigned by specifying 'auto'. The WWPN/LUN can be set as the LOADDEV in the directory entry if (1) is specified as the 'loaddev'. - -\ **-**\ **-connectnic2guestlan**\ \ *device_address*\ \ *lan*\ \ *owner*\ - + +\ **-**\ **-connectnic2guestlan**\ \ *device_address*\ \ *lan*\ \ *owner*\ + Connects a given network adapter to a GuestLAN. - -\ **-**\ **-connectnic2vswitch**\ \ *device_address*\ \ *vswitch*\ - + +\ **-**\ **-connectnic2vswitch**\ \ *device_address*\ \ *vswitch*\ + Connects a given network adapter to a VSwitch. - -\ **-**\ **-copydisk**\ \ *target_address*\ \ *source_node*\ \ *source_address*\ - + +\ **-**\ **-copydisk**\ \ *target_address*\ \ *source_node*\ \ *source_address*\ + Copy a disk attached to a given virtual server. - -\ **-**\ **-dedicatedevice**\ \ *virtual_device*\ \ *real_device*\ \ *mode*\ - + +\ **-**\ **-dedicatedevice**\ \ *virtual_device*\ \ *real_device*\ \ *mode*\ + Adds a dedicated device to a virtual machine's directory entry. - -\ **-**\ **-deleteipl**\ - + +\ **-**\ **-deleteipl**\ + Deletes the IPL statement from the virtual machine's directory entry. - -\ **-**\ **-disconnectnic**\ \ *device_address*\ - + +\ **-**\ **-disconnectnic**\ \ *device_address*\ + Disconnects a given network adapter. - -\ **-**\ **-formatdisk**\ \ *disk_address*\ \ *multi_password*\ - + +\ **-**\ **-formatdisk**\ \ *disk_address*\ \ *multi_password*\ + Formats a disk attached to a given virtual server (only ECKD disks supported). The disk should not be linked to any other virtual server. This command is best used after add3390(). - -\ **-**\ **-grantvswitch**\ \ *vswitch*\ - + +\ **-**\ **-grantvswitch**\ \ *vswitch*\ + Grant vSwitch access for given virtual machine. - -\ **-**\ **-purgerdr**\ - + +\ **-**\ **-purgerdr**\ + Purge the reader belonging to the virtual machine - -\ **-**\ **-removedisk**\ \ *device_address*\ - + +\ **-**\ **-removedisk**\ \ *device_address*\ + Removes a minidisk from a virtual machine's directory entry. - -\ **-**\ **-removenic**\ \ *device_address*\ - + +\ **-**\ **-removenic**\ \ *device_address*\ + Removes a network adapter from a virtual machine's directory entry. - -\ **-**\ **-removeprocessor**\ \ *device_address*\ - + +\ **-**\ **-removeprocessor**\ \ *device_address*\ + Removes a processor from an active virtual machine's configuration. - -\ **-**\ **-removeloaddev**\ \ *wwpn*\ \ *lun*\ - + +\ **-**\ **-removeloaddev**\ \ *wwpn*\ \ *lun*\ + Removes the LOADDEV statement from a virtual machines's directory entry. - -\ **-**\ **-removezfcp**\ \ *device_address*\ \ *wwpn*\ \ *lun*\ - + +\ **-**\ **-removezfcp**\ \ *device_address*\ \ *wwpn*\ \ *lun*\ + Removes a given SCSI/FCP device belonging to the virtual machine. - -\ **-**\ **-replacevs**\ \ *directory_entry*\ - + +\ **-**\ **-replacevs**\ \ *directory_entry*\ + Replaces a virtual machine's directory entry. The directory entry can be echoed into stdin or a text file. - -\ **-**\ **-setipl**\ \ *ipl_target*\ \ *load_parms*\ \ *parms*\ - + +\ **-**\ **-setipl**\ \ *ipl_target*\ \ *load_parms*\ \ *parms*\ + Sets the IPL statement for a given virtual machine. - -\ **-**\ **-setpassword**\ \ *password*\ - + +\ **-**\ **-setpassword**\ \ *password*\ + Sets the password for a given virtual machine. - -\ **-**\ **-setloaddev**\ \ *wwpn*\ \ *lun*\ - + +\ **-**\ **-setloaddev**\ \ *wwpn*\ \ *lun*\ + Sets the LOADDEV statement in the virtual machine's directory entry. - -\ **-**\ **-undedicatedevice**\ \ *device_address*\ - + +\ **-**\ **-undedicatedevice**\ \ *device_address*\ + Delete a dedicated device from a virtual machine's active configuration and directory entry. - + From 7b372825e56278d1d7318d0ff4def1949cf26d31 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0272/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/chzone.1.rst --- .../admin-guides/references/man1/chzone.1.rst | 152 +++++++++--------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/chzone.1.rst b/docs/source/guides/admin-guides/references/man1/chzone.1.rst index 097fab231..7e9e9dd99 100644 --- a/docs/source/guides/admin-guides/references/man1/chzone.1.rst +++ b/docs/source/guides/admin-guides/references/man1/chzone.1.rst @@ -7,7 +7,7 @@ chzone.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,7 +15,7 @@ chzone.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** @@ -25,176 +25,176 @@ chzone.1 ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* The \ **chzone**\ command is designed to change the definition of a zone previous defined in the cluster. The chzone command is only supported on Linux ( No AIX support). -The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. +The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. *************** -\ **OPTIONS**\ +\ **OPTIONS**\ *************** -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Displays usage information. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Displays command version and build date. - -\ **-k | -**\ **-sshkeypath**\ \ *full path to the ssh RSA private key*\ - + +\ **-k | -**\ **-sshkeypath**\ \ *full path to the ssh RSA private key*\ + This is the path to the id_rsa key that will be used to build new root's ssh keys for the zone. If -k is used, it will generate the ssh public key from the input ssh RSA private key, and store both in /etc/xcat/sshkeys//.ssh directory. - -\ **-K | -**\ **-genkeys**\ - + +\ **-K | -**\ **-genkeys**\ + Using this flag, will generate new ssh RSA private and public keys for the zone into the /etc/xcat/sshkeys//.ssh directory. The nodes are not automatically updated with the new root ssh keys by chzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. - -\ **-**\ **-defaultzone**\ - + +\ **-**\ **-defaultzone**\ + if \ **-**\ **-defaultzone**\ is input, then it will set the zone defaultzone attribute to yes. if \ **-**\ **-defaultzone**\ is input and another zone is currently the default, then the \ **-f**\ flag must be used to force a change to the new defaultzone. - If \ **-f**\ flag is not use an error will be returned and no change made. + If \ **-f**\ flag is not use an error will be returned and no change made. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. - -\ **-a | -**\ **-addnoderange**\ \ *noderange*\ - + +\ **-a | -**\ **-addnoderange**\ \ *noderange*\ + For each node in the noderange, it will set the zonename attribute for that node to the input zonename. If the -g flag is also on the command, then it will add the group name "zonename" to each node in the noderange. - -\ **-r | -**\ **-rmnoderange**\ \ *noderange*\ - + +\ **-r | -**\ **-rmnoderange**\ \ *noderange*\ + For each node in the noderange, if the node is a member of the input zone, it will remove the zonename attribute for that node. If any of the nodes in the noderange is not a member of the zone, you will get an error and nothing will be changed. If the -g flag is also on the command, then it will remove the group name "zonename" from each node in the noderange. - -\ **-s| -**\ **-sshbetweennodes**\ \ **yes|no**\ - + +\ **-s| -**\ **-sshbetweennodes**\ \ **yes|no**\ + If -s entered, the zone sshbetweennodes attribute will be set to yes or no based on the input. When this is set to yes, then ssh will be setup to allow passwordless root access between nodes. If no, then root will be prompted for a password when running ssh between the nodes in the zone. - -\ **-f | -**\ **-force**\ - + +\ **-f | -**\ **-force**\ + Used with the \ **-**\ **-defaultzone**\ flag to override the current default zone. - -\ **-g | -**\ **-assigngroup**\ - + +\ **-g | -**\ **-assigngroup**\ + Used with the \ **-a**\ or \ **-r**\ flag to add or remove the group zonename for all nodes in the input noderange. - -\ **-V | -**\ **-Verbose**\ - + +\ **-V | -**\ **-Verbose**\ + Verbose mode. - + **************** -\ **EXAMPLES**\ +\ **EXAMPLES**\ **************** 1. To chzone zone1 to the default zone, enter: - - + + .. code-block:: perl - + chzone> zone1 --default -f - - + + 2. To generate new root ssh keys for zone2A using the ssh id_rsa private key in /root/.ssh: - - + + .. code-block:: perl - + chzone zone2A -k /root/.ssh - - + + Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys - + 3. To generate new root ssh keys for zone2A, enter : - - + + .. code-block:: perl - + chzone zone2A -K - - + + Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys - + 4. To add a new group of nodes (compute3) to zone3 and add zone3 group to the nodes, enter: - - + + .. code-block:: perl - + chzone zone3 -a compute3 -g - - + + 5. - + To remove a group of nodes (compute4) from zone4 and remove zone4 group from the nodes, enter: - - + + .. code-block:: perl - + chzone> zone4 -r compute4 -g - - + + 6. To change the sshbetweennodes setting on the zone to not allow passwordless ssh between nodes, enter: - - + + .. code-block:: perl - + chzone zone5 -s no - - + + Note: you must use \ **xdsh -K**\ or \ **updatenode -k**\ to update the nodes with this new setting. - + ************* -\ **FILES**\ +\ **FILES**\ ************* @@ -204,7 +204,7 @@ Location of the chzone command. **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From 3b41782c94e221909df5c2f69bbd6b65c856b09d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0273/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/clonevm.1.rst --- .../references/man1/clonevm.1.rst | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/clonevm.1.rst b/docs/source/guides/admin-guides/references/man1/clonevm.1.rst index f97967bae..0db09970f 100644 --- a/docs/source/guides/admin-guides/references/man1/clonevm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/clonevm.1.rst @@ -27,19 +27,19 @@ DESCRIPTION *********** -Command to promote a VM's current configuration and storage to a master as well as +Command to promote a VM's current configuration and storage to a master as well as performing the converse operation of creating VMs based on a master. -By default, attempting to create a master from a running VM will produce an error. +By default, attempting to create a master from a running VM will produce an error. The \ **-**\ **-force**\ argument will request that a master be made of the VM anyway. -Also, by default a VM that is used to create a master will be rebased as a thin +Also, by default a VM that is used to create a master will be rebased as a thin clone of that master. If the \ **-**\ **-force**\ argument is used to create a master of a powered -on vm, this will not be done. Additionally, the \ **-**\ **-detached**\ option can be used to -explicitly request that a clone not be tethered to a master image, allowing the +on vm, this will not be done. Additionally, the \ **-**\ **-detached**\ option can be used to +explicitly request that a clone not be tethered to a master image, allowing the clones to not be tied to the health of a master, at the cost of additional storage. -When promoting a VM's current state to master, all related virtual disks will be +When promoting a VM's current state to master, all related virtual disks will be copied and merged with any prerequisite images. A master will not be tethered to other masters. @@ -50,46 +50,46 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-b**\ \ *master_to_base_vms_upon*\ - + +\ **-b**\ \ *master_to_base_vms_upon*\ + The master to base the clones upon - -\ **-t**\ \ *master_to_be_made*\ - + +\ **-t**\ \ *master_to_be_made*\ + The target master to copy a single VM's state to - -\ **-d|-**\ **-detached**\ - + +\ **-d|-**\ **-detached**\ + Explicitly request that the noderange be untethered from any masters. - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + Force cloning of a powered on VM. Implies \ **-d**\ if the VM is on. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose output. - + @@ -110,23 +110,23 @@ EXAMPLES 1. Creating a master named \ *appserver*\ from a node called \ *vm1*\ : - - + + .. code-block:: perl - + clonevm vm1 -t appserver - - + + 2. Cleating 30 VMs from a master named \ *appserver*\ : - - + + .. code-block:: perl - + clonevm vm1-vm30 -b appserver - - + + From 28c5b271f373c817d64836268ce3ac5129779112 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0274/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/configfpc.1.rst --- .../references/man1/configfpc.1.rst | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/configfpc.1.rst b/docs/source/guides/admin-guides/references/man1/configfpc.1.rst index 1801eeee5..71fedfd73 100644 --- a/docs/source/guides/admin-guides/references/man1/configfpc.1.rst +++ b/docs/source/guides/admin-guides/references/man1/configfpc.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **configfpc**\ \ **-i**\ \ *interface*\ +\ **configfpc**\ \ **-i**\ \ *interface*\ -\ **configfpc**\ \ **-i**\ \ *interface*\ \ **-**\ **-ip**\ \ *default ip address*\ +\ **configfpc**\ \ **-i**\ \ *interface*\ \ **-**\ **-ip**\ \ *default ip address*\ \ **configfpc**\ [\ **-V | -**\ **-verbose**\ ] @@ -55,22 +55,22 @@ OPTIONS -\ **-i**\ \ *interface*\ - +\ **-i**\ \ *interface*\ + Use this flag to specify which xCAT MN interface (example: eth4) that is connected to the NeXtScale FPCs. This option is required. - -\ **-**\ **-ip**\ \ *default ip address*\ - + +\ **-**\ **-ip**\ \ *default ip address*\ + Use this flag to override the default ip address of 192.168.0.100 with a new address. - -\ **-V | -**\ **-verbose**\ - + +\ **-V | -**\ **-verbose**\ + Verbose mode - + @@ -81,22 +81,22 @@ EXAMPLES 1. To discover and configure all NeXtScale Fan Power Controllers (FPCs) connected on eth0 interface. - - + + .. code-block:: perl - + configfpc -i eth0 - - + + 2. To override the default ip address and run in Verbose mode. - - + + .. code-block:: perl - + configfpc -i eth0 --ip 196.68.0.100 -V - - + + From 3b46aa1c41ab47cf77999dfd8be79801b3302fe8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0275/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst --- docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst b/docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst index cd06071a9..a6ef13d9b 100644 --- a/docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst +++ b/docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst @@ -73,7 +73,7 @@ EXAMPLES .. code-block:: perl cat node.stanza | chdef -z - + cat device.stanza | chdef -z From 15d37fcd18cac51f0e270129a2559712131d9f05 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0276/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst --- .../references/man1/db2sqlsetup.1.rst | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst b/docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst index 2ea1fed24..6bb891cae 100644 --- a/docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst +++ b/docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst @@ -48,8 +48,8 @@ When running of db2sqlsetup on the MN: One password must be supplied for the setup, a password for the xcatdb unix id which will be used as the DB2 instance id and database name. The password will be prompted for interactively or can be input with the XCATDB2PW environment variable. The script will create the xcat database instance (xcatdb) in the /var/lib/db2 directory unless overridden by setting the site.databaseloc attribute. This attribute should not be set to the directory that is defined in the installloc attribute and it is recommended that the databaseloc be a new filesystem dedicated to the DB2 database, especially in very large clusters. -When running db2sqlseutp on the SN: -Not only will the password for the DB2 instance Id be prompted for and must match the one on the Management Node; but also the hostname or ip address of the Management Node as known by the Service Node must be supplied , unless the XCATDB2SERVER environment variable is set. +When running db2sqlseutp on the SN: +Not only will the password for the DB2 instance Id be prompted for and must match the one on the Management Node; but also the hostname or ip address of the Management Node as known by the Service Node must be supplied , unless the XCATDB2SERVER environment variable is set. You can automatically install and setup of DB2 on the SN using the db2install and odbcsetup postscripts and not need to manually run the command. See the full documentation. Note: On AIX , root must be running ksh and on Linux, bash shell. @@ -61,52 +61,52 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Displays the usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Displays the release version of the code. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Displays verbose messages. - -\ **-i|-**\ **-init**\ - + +\ **-i|-**\ **-init**\ + The init option is used to setup an installed DB2 database on AIX or Linux (p-Series) so that xCAT can use the database. This must be combined with either the -S or -C flag to indicate whether we are setting up the Server or the Client. With the -S flag, it involves creating the xcatdb database, the xcatdb instance id, allowing access to the xcatdb database by the Management Node. It also backs up the current xCAT database and restores it into the newly setup xcatdb DB2 database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the DB2 database and restarts the xcatd daemon using the database. - -\ **-p|-**\ **-passwd**\ - + +\ **-p|-**\ **-passwd**\ + The password change option is to change the database access password for the DB2 xcatdb database. If -S is input then it will only change the password on the DB2 Server (MN). If -C is input it will only change on the DB2 clients (SN). If neither -S or -C are input with this flag, then it will change both the DB2 Server and Clients. When changing the password the xcatd daemon will be stopped and restarted. Any other tools accessing the database should also be stopped before changing and restarted after changing. - -\ **-S|-C**\ - + +\ **-S|-C**\ + This options says whether to setup the Server (-S) on the Management Node, or the Client (-C) on the Service Nodes. - -\ **-N|-**\ **-nostart**\ - + +\ **-N|-**\ **-nostart**\ + This option with the -S flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database. This can be used to setup the xCAT DB2 database during or before install. - -\ **-o|-**\ **-setupODBC**\ - + +\ **-o|-**\ **-setupODBC**\ + This option sets up the ODBC /etc/../odbcinst.ini, /etc/../odbc.ini and the .odbc.ini file in roots home directory will be created and initialized to run off the xcatdb DB2 database. - + @@ -136,64 +136,64 @@ EXAMPLES 1. To setup DB2 Server for xCAT to run on the DB2 xcatdb database, on the MN: - - + + .. code-block:: perl - + db2sqlsetup -i -S - - + + 2. To setup DB2 Client for xCAT to run on the DB2 xcatdb database, on the SN: - - + + .. code-block:: perl - + db2sqlsetup -i -C - - + + 3. To setup the ODBC for DB2 xcatdb database access, on the MN : - - + + .. code-block:: perl - + db2sqlsetup -o -S - - + + 4. To setup the ODBC for DB2 xcatdb database access, on the SN : - - + + .. code-block:: perl - + db2sqlsetup -o -C - - + + 5. - + To setup the DB2 database but not start xcat running with it: - - + + .. code-block:: perl - + db2sqlsetup -i -S -N - - + + 6. To change the DB2 xcatdb password on both the Management and Service Nodes: - - + + .. code-block:: perl - + db2sqlsetup -p - - + + From cb2d8107ee5371b8fa2c9fc7e2be8581fdb32854 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0277/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst --- .../guides/admin-guides/references/man1/dumpxCATdb.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst b/docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst index af89c9fef..dabcca42b 100644 --- a/docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst +++ b/docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst @@ -93,7 +93,7 @@ EXAMPLES .. code-block:: perl chtab key=skiptables site.value="hosts,passwd" - + dumpxCATdb -p /tmp/db @@ -103,7 +103,7 @@ EXAMPLES .. code-block:: perl export XCAT_SKIPTABLES="hosts,passwd" - + dumpxCATdb -p /tmp/db From 18ba3f7c6b727d15b7d482a810925bb4d5d8339d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0278/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/genimage.1.rst --- .../references/man1/genimage.1.rst | 176 +++++++++--------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/genimage.1.rst b/docs/source/guides/admin-guides/references/man1/genimage.1.rst index d28fd3880..1e869d7ad 100644 --- a/docs/source/guides/admin-guides/references/man1/genimage.1.rst +++ b/docs/source/guides/admin-guides/references/man1/genimage.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **genimage**\ +\ **genimage**\ -\ **genimage**\ [\ **-o**\ \ *osver*\ ] [\ **-a**\ \ *arch*\ ] [\ **-p**\ \ *profile*\ ] [\ **-i**\ \ *nodebootif*\ ] [\ **-n**\ \ *nodenetdrivers*\ ] [\ **-**\ **-onlyinitrd**\ ] [\ **-r**\ \ *otherifaces*\ ] [\ **-k**\ \ *kernelver*\ ] [\ **-g**\ \ *krpmver*\ ] [\ **-m**\ \ *statelite*\ ] [\ **-l**\ \ *rootlimitsize*\ ] [\ **-**\ **-permission**\ \ *permission*\ ] [\ **-**\ **-interactive**\ ] [\ **-**\ **-dryrun**\ ] [\ **-**\ **-ignorekernelchk**\ ] [\ **-**\ **-noupdate**\ ] \ *imagename*\ +\ **genimage**\ [\ **-o**\ \ *osver*\ ] [\ **-a**\ \ *arch*\ ] [\ **-p**\ \ *profile*\ ] [\ **-i**\ \ *nodebootif*\ ] [\ **-n**\ \ *nodenetdrivers*\ ] [\ **-**\ **-onlyinitrd**\ ] [\ **-r**\ \ *otherifaces*\ ] [\ **-k**\ \ *kernelver*\ ] [\ **-g**\ \ *krpmver*\ ] [\ **-m**\ \ *statelite*\ ] [\ **-l**\ \ *rootlimitsize*\ ] [\ **-**\ **-permission**\ \ *permission*\ ] [\ **-**\ **-interactive**\ ] [\ **-**\ **-dryrun**\ ] [\ **-**\ **-ignorekernelchk**\ ] [\ **-**\ **-noupdate**\ ] \ *imagename*\ \ **genimage**\ [\ **-h**\ | \ **-**\ **-help**\ | \ **-v**\ | \ **-**\ **-version**\ ] @@ -42,9 +42,9 @@ The \ **genimage**\ command will generate two initial ramdisks for \ **stateles After your image is generated, you can chroot to the image, install any additional software you would like, or make modifications to files, and then run the following command to prepare the image for deployment. -for stateless: \ **packimage**\ +for stateless: \ **packimage**\ -for statelite: \ **liteimg**\ +for statelite: \ **liteimg**\ Besides prompting for some parameter values, the \ **genimage**\ command takes default guesses for the parameters not specified or not defined in the \ *osimage*\ and \ *linuximage*\ tables. It also assumes default answers for questions from the yum/zypper command when installing rpms into the image. Use \ **-**\ **-interactive**\ flag if you want the yum/zypper command to prompt you for the answers. @@ -70,135 +70,135 @@ OPTIONS -\ **-a**\ \ *arch*\ - +\ **-a**\ \ *arch*\ + The hardware architecture of this node: x86_64, ppc64, x86, ia64, etc. If omitted, the current hardware architecture will be used. - -\ **-o**\ \ *osver*\ - + +\ **-o**\ \ *osver*\ + The operating system for the image: fedora8, rhel5, sles10, etc. The OS packages must be in /install// (use copycds(8)|copycds.8). - -\ **-p**\ \ *profile*\ - + +\ **-p**\ \ *profile*\ + The profile (e.g. compute, service) to use to create the image. This determines what package lists are used from /opt/xcat/share/xcat/netboot/ to create the image with. When deploying nodes with this image, the nodes' nodetype.profile attribute must be set to this same value. - -\ **-i**\ \ *nodebootif*\ - + +\ **-i**\ \ *nodebootif*\ + This argument is now optional, and allows you to specify the network boot interface to be configured in the image (e.g. eth0). If not specified, the interface will be determined and configured during the network boot process. - -\ **-n**\ \ *nodenetdrivers*\ - + +\ **-n**\ \ *nodenetdrivers*\ + This argument is now optional, and allows you to specify the driver modules needed for the network interface(s) on your stateless nodes. If you do not specify this option, the default is to include all recent IBM xSeries network drivers. - + If specified, \ *nodenetdrivers*\ should be a comma separated list of network drivers to be used by the stateless nodes (Ie.: -n tg3,e1000). Note that the drivers will be loaded in the order that you list them, which may prove important in some cases. - -\ **-l**\ \ *rootlimit*\ - + +\ **-l**\ \ *rootlimit*\ + The maximum size allowed for the root file system in the image. Specify in bytes, or can append k, m, or g. - -\ **-**\ **-onlyinitrd**\ - + +\ **-**\ **-onlyinitrd**\ + Regenerates the initrd for a stateless image to be used for a diskless install. - + Regenerates the initrd that is part of a stateless/statelite image that is used to boot xCAT nodes in a stateless/stateli te mode. - + The \ **genimage -**\ **-onlyinitrd**\ command will generate two initial ramdisks, one is \ **initrd-statelite.gz**\ for \ **statelite**\ mode, the other one is \ **initrd-stateless.gz**\ for \ **stateless**\ mode. - -\ **-**\ **-permission**\ \ *permission*\ - + +\ **-**\ **-permission**\ \ *permission*\ + The mount permission of \ **/.statelite**\ directory for \ **statelite**\ mode, which is only used for \ **statelite**\ mode, and the default permission is 755. - -\ **-r**\ \ *otherifaces*\ - + +\ **-r**\ \ *otherifaces*\ + Other network interfaces (e.g. eth1) in the image that should be configured via DHCP. - -\ **-k**\ \ *kernelver*\ - + +\ **-k**\ \ *kernelver*\ + Use this flag if you want to use a specific version of the kernel in the image. Defaults to the first kernel found in the install image. - -\ **-g**\ \ *krpmver*\ - + +\ **-g**\ \ *krpmver*\ + Use this flag to specify the rpm version for kernel packages in the image. It must be present if -k flag is specified in the command for SLES. Generally, the value of -g is the part after \ **linux-**\ and before \ **.rpm**\ in a kernel rpm name. - + \ **-m**\ statelite - + This flag is for Ubuntu, Debian and Fedora12 only. Use this flag to specify if you want to generate statelite image. The default is to generate stateless image for these three operating systems. For others, this flag is invalid because both stateless and statelite images will be generated with this command. - -\ **-**\ **-interactive**\ - + +\ **-**\ **-interactive**\ + This flag allows the user to answer questions from yum/zypper command when installing rpms into the image. If it is not specified, '-y' will be passed to the yum command and '--non-interactive --no-gpg-checks' will be passed to the zypper command as default answers. - -\ **-**\ **-dryrun**\ - + +\ **-**\ **-dryrun**\ + This flag shows the underlying call to the os specific genimage function. The user can copy and the paste the output to run the command on another machine that does not have xCAT installed. - -\ **-t**\ \ *tmplimit*\ - + +\ **-t**\ \ *tmplimit*\ + (Deprecated) This flag allows the user to setup the /tmp and the /var/tmp file system sizes. This flag is no longer supported. You can overwrite any file system size using the .postinstall script where you can create a new /etc/fstab file. - -\ **-**\ **-ignorekernelchk**\ - + +\ **-**\ **-ignorekernelchk**\ + Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel. - -\ **-**\ **-noupdate**\ - + +\ **-**\ **-noupdate**\ + This flag allows the user to bypass automatic package updating when installing other packages. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Display version. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - + @@ -219,53 +219,53 @@ EXAMPLES 1 To prompt the user for inputs: - - + + .. code-block:: perl - + genimage - - + + 2 To generate an image using information from an osimage definition: - - + + .. code-block:: perl - + genimage myimagename - - + + 3 To run genimage in test mode without actually generating an image: - - + + .. code-block:: perl - + genimage --dryrun myimagename - - + + 4 To generate an image and have yum/zypper prompt for responses: - - + + .. code-block:: perl - + genimage myimagename --interactive - - + + 5 To generate an image, replacing some values in the osimage definition: - - + + .. code-block:: perl - + genimage -i eth0 -n tg3 myimagename - - + + From d05535ec16f558b32df2a3032fe4946d03b643a6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0279/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/geninitrd.1.rst --- .../references/man1/geninitrd.1.rst | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst b/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst index 881fff450..fa871f0aa 100644 --- a/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst +++ b/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst @@ -31,40 +31,40 @@ DESCRIPTION Generate the initrd for the osimage: \ **imagename**\ which is an xCAT object of \ *osimage*\ type. -\ **Diskful Osimage**\ +\ **Diskful Osimage**\ -If the \ **imagename**\ is a stateful one (The provmethod attribute for the osimage is 'install'), -this command is used to rebuild the initrd to inject the new drivers from driver rpms or -'update distro' and copy the rebuilt initrd and new kernel (If there's new kernel in 'update +If the \ **imagename**\ is a stateful one (The provmethod attribute for the osimage is 'install'), +this command is used to rebuild the initrd to inject the new drivers from driver rpms or +'update distro' and copy the rebuilt initrd and new kernel (If there's new kernel in 'update distro') to the directory \ */tftpboot/xcat/. -If the initrd has been rebuilt by geninitrd, when run nodeset, the \ *--noupdateinitrd*\ option +If the initrd has been rebuilt by geninitrd, when run nodeset, the \ *--noupdateinitrd*\ option should be used to skip the rebuilding of initrd to improve the performance. -Three attributes of osimage object can be used to specify the Driver RPM location and Driver names +Three attributes of osimage object can be used to specify the Driver RPM location and Driver names for injecting new drivers to initrd. -\ **netdrivers**\ - comma separated driver names that need to be injected to the initrd. -The postfix '.ko' can be ignored. The netdrivers attribute must be set to specify the new driver list. +\ **netdrivers**\ - comma separated driver names that need to be injected to the initrd. +The postfix '.ko' can be ignored. The netdrivers attribute must be set to specify the new driver list. If you want to load all the drivers from the driver rpms, using the keyword allupdate. \ **driverupdatesrc**\ - comma separated driver rpm packages (full path should be specified) -\ **osupdatename**\ - comma separated 'osdistroupdate' object. Each 'osdistroupdate' object specifies a -Linux distro update. When run geninitrd, 'kernel-\*.rpm' will be searched from osdistroupdate.dirpath +\ **osupdatename**\ - comma separated 'osdistroupdate' object. Each 'osdistroupdate' object specifies a +Linux distro update. When run geninitrd, 'kernel-\*.rpm' will be searched from osdistroupdate.dirpath to get all the rpm packages and then search the drivers from the rpm packages. Refer to the doc: Using_Linux_Driver_Update_Disk -\ **Stateless Osimage**\ +\ **Stateless Osimage**\ If the \ **imagename**\ is a stateless one (The provmethod attribute for the osimage is 'netboot'), -this command is used to generate the initrd from the rootimg which generated by 'genimage' command. +this command is used to generate the initrd from the rootimg which generated by 'genimage' command. So the 'genimage' must be run once before running the geninitrd command. -Two attributes of osimage object can be used to specify the Driver RPM location and Driver names +Two attributes of osimage object can be used to specify the Driver RPM location and Driver names for injecting new drivers to initrd. \ **netdrivers**\ - comma separated driver names that need to be injected to the initrd. @@ -82,10 +82,10 @@ Parameters \ *imagename*\ specifies the name of an os image definition to be used. The specification for the image is stored in the \ *osimage*\ table and \ *linuximage*\ table. -\ **-**\ **-ignorekernelchk**\ - +\ **-**\ **-ignorekernelchk**\ + Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel. - + @@ -106,13 +106,13 @@ EXAMPLES 1 To generate initrd for the osimage \ **myimagename**\ : - - + + .. code-block:: perl - + geninitrd myimagename - - + + From 094e388f9c3d8d34415a5c19555f5838829e1aea Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0280/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/getmacs.1.rst --- .../references/man1/getmacs.1.rst | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/getmacs.1.rst b/docs/source/guides/admin-guides/references/man1/getmacs.1.rst index a38bc1abf..ced794535 100644 --- a/docs/source/guides/admin-guides/references/man1/getmacs.1.rst +++ b/docs/source/guides/admin-guides/references/man1/getmacs.1.rst @@ -72,63 +72,63 @@ OPTIONS ******* -\ **-**\ **-arp**\ +\ **-**\ **-arp**\ Read MAC address with ARP protocol. -\ **-C**\ +\ **-C**\ Specify the IP address of the partition for ping test. The default is to read from xCAT database if no \ **-C**\ specified. -\ **-d**\ +\ **-d**\ Display MAC only. The default is to write the first valid adapter MAC to the xCAT database. -\ **-D**\ +\ **-D**\ Perform discovery for mac address. By default, it will run ping test to test the connection between adapter and xCAT management node. Use '--noping' can skip the ping test to save time. Be aware that in this way, the lpars will be reset. -\ **-f**\ +\ **-f**\ Force immediate shutdown of the partition. This flag must be used with -D flag. -\ **-F**\ +\ **-F**\ Specify filters to select the correct adapter. Acceptable filters are Type, MAC_Address, Phys_Port_Loc, Adapter, Port_Group, Phys_Port, Logical_Port, VLan, VSwitch, Curr_Conn_Speed. -\ **-G**\ +\ **-G**\ Gateway IP address of the partition. The default is to read from xCAT database if no \ **-G**\ specified. -\ **-h**\ +\ **-h**\ Display usage message. -\ **-M**\ +\ **-M**\ Return multiple MAC addresses for the same adapter or port, if available from the hardware. For some network adapters (e.g. HFI) the MAC can change when there are some recoverable internal errors. In this case, the hardware can return several MACs that the adapter can potentially have, so that xCAT can put all of them in DHCP. This allows successful booting, even after a MAC change, but on Linux at this time, it can also cause duplicate IP addresses, so it is currently not recommended on Linux. By default (without this flag), only a single MAC address is returned for each adapter. -\ **-**\ **-noping**\ +\ **-**\ **-noping**\ Only can be used with '-D' to display all the available adapters with mac address but do NOT run ping test. -\ **-o**\ +\ **-o**\ Read MAC address when the lpar is in openfirmware state. This option mush be used with [\ **-D**\ ] option to perform ping test. Before use \ **-o**\ , the lpar must be in openfirmware state. -\ **-S**\ +\ **-S**\ The IP address of the machine to ping. The default is to read from xCAT database if no \ **-S**\ specified. -\ **-v**\ +\ **-v**\ Command Version. -\ **-V**\ +\ **-V**\ Verbose output. -\ **-i**\ +\ **-i**\ Specify the interface whose mac address will be collected and written into mac table. If 4 mac addresses are returned by option '-d', they all are the mac addresses of the blade. The N can start from 0(map to the eth0 of the blade) to 3. If 5 mac addresses are returned, the 1st mac address must be the mac address of the blade's FSP, so the N will start from 1(map to the eth0 of the blade) to 4. From 6210ee85c4d7ad7183df336154e979ed504e8b83 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0281/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/getslnodes.1.rst --- .../references/man1/getslnodes.1.rst | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/getslnodes.1.rst b/docs/source/guides/admin-guides/references/man1/getslnodes.1.rst index 34a34f3f3..9c4979fa5 100644 --- a/docs/source/guides/admin-guides/references/man1/getslnodes.1.rst +++ b/docs/source/guides/admin-guides/references/man1/getslnodes.1.rst @@ -65,16 +65,16 @@ OPTIONS -\ **-?|-h|-**\ **-help**\ - +\ **-?|-h|-**\ **-help**\ + Display usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - + @@ -95,39 +95,39 @@ EXAMPLES 1. - + Display information about all of the nodes in your SoftLayer account: - - + + .. code-block:: perl - + getslnodes - - + + 2. - + Display information about all of the nodes whose hostname starts with foo: - - + + .. code-block:: perl - + getslnodes foo - - + + 3. - + Create xCAT node defintions in the xCAT DB for all of the nodes in your SoftLayer account: - - + + .. code-block:: perl - + getslnodes | mkdef -z - - + + From 51c38de10fe8f82708ea3127c8a47ccab9247828 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0282/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/gettab.1.rst --- .../admin-guides/references/man1/gettab.1.rst | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/gettab.1.rst b/docs/source/guides/admin-guides/references/man1/gettab.1.rst index b158b6122..71bb19c0f 100644 --- a/docs/source/guides/admin-guides/references/man1/gettab.1.rst +++ b/docs/source/guides/admin-guides/references/man1/gettab.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **gettab**\ [\ **-H**\ | \ **-**\ **-with-fieldname**\ ] \ *key=value,... table.attribute ...*\ +\ **gettab**\ [\ **-H**\ | \ **-**\ **-with-fieldname**\ ] \ *key=value,... table.attribute ...*\ \ **gettab**\ [\ **-?**\ | \ **-h**\ | \ **-**\ **-help**\ ] @@ -41,17 +41,17 @@ OPTIONS -\ **-H|-**\ **-with-fieldname**\ - +\ **-H|-**\ **-with-fieldname**\ + Always display table.attribute name next to result. By default, this is done only if more than one table.attribute is requested. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -77,39 +77,39 @@ EXAMPLES 1. To display setting for \ **master**\ (management node) in the site table: - - + + .. code-block:: perl - + gettab -H key=master site.value - - + + The output would be similar to: - - + + .. code-block:: perl - + site.value: mgmtnode.cluster.com - - + + 2. To display the first node or group name that has \ **mgt**\ set to \ **blade**\ in the nodehm table: - - + + .. code-block:: perl - + gettab mgt=blade nodehm.node - - + + The output would be similar to: - - + + .. code-block:: perl - + blades - - + + From b31af7772a5de8cea08338b18744300c6d22eafe Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0283/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst --- .../guides/admin-guides/references/man1/groupfiles4dsh.1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst b/docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst index 3a2675767..8ebbde2dd 100644 --- a/docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst +++ b/docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst @@ -82,7 +82,7 @@ To use with dsh: export DSH_CONTEXT=DSH ( default unless CSM is installed) export DSH_NODE_RSH=/bin/ssh (default is rsh) export DSH_NODEGROUP_PATH= /tmp/nodegroupfiles - + dsh -N all date (where all is a group defined in xCAT) dsh -a date (will look in all nodegroupfiles and build a list of all nodes) From 7505a96554a35fcee6034e3f8208e5c6063cf1c4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0284/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/imgcapture.1.rst --- .../references/man1/imgcapture.1.rst | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/imgcapture.1.rst b/docs/source/guides/admin-guides/references/man1/imgcapture.1.rst index 663064609..5e2546dbb 100644 --- a/docs/source/guides/admin-guides/references/man1/imgcapture.1.rst +++ b/docs/source/guides/admin-guides/references/man1/imgcapture.1.rst @@ -58,80 +58,80 @@ OPTIONS -\ **-t | -**\ **-type**\ - +\ **-t | -**\ **-type**\ + Specify the osimage type you want to capture, two types are supported: diskless and sysclone. - -\ **-p|-**\ **-profile**\ \ *profile*\ - + +\ **-p|-**\ **-profile**\ \ *profile*\ + Assign \ *profile*\ as the profile of the image to be created. - -\ **-o|-**\ **-osimage**\ \ *osimage*\ - + +\ **-o|-**\ **-osimage**\ \ *osimage*\ + The osimage name. - -\ **-i**\ \ *nodebootif*\ - + +\ **-i**\ \ *nodebootif*\ + The network interface the diskless node will boot over (e.g. eth0), which is used by the \ **genimage**\ command to generate initial ramdisks. - -\ **-n**\ \ *nodenetdrivers*\ - + +\ **-n**\ \ *nodenetdrivers*\ + The driver modules needed for the network interface, which is used by the \ **genimage**\ command to generate initial ramdisks. - + By default, the \ **genimage**\ command can provide drivers for the following network interfaces: - + For x86 or x86_64 platform: - - + + .. code-block:: perl - + tg3 bnx2 bnx2x e1000 e1000e igb m1x_en - - + + For ppc64 platform: - - + + .. code-block:: perl - + e1000 e1000e igb ibmveth ehea - - + + For S390x: - - + + .. code-block:: perl - + qdio ccwgroup - - + + If the network interface is not in the above list, you'd better specify the driver modules with this option. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display the usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Display the version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose output. - + From 6a04c11efc523ef43e60cbb1a1cf6af60ac26923 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0285/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/imgexport.1.rst --- .../references/man1/imgexport.1.rst | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/imgexport.1.rst b/docs/source/guides/admin-guides/references/man1/imgexport.1.rst index 3626725f1..c9359d8cf 100644 --- a/docs/source/guides/admin-guides/references/man1/imgexport.1.rst +++ b/docs/source/guides/admin-guides/references/man1/imgexport.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **imgexport [-h| -**\ **-help]**\ +\ **imgexport [-h| -**\ **-help]**\ \ **imgexport**\ \ *image_name*\ [\ *destination*\ ] [[\ **-e | -**\ **-extra**\ \ *file:dir*\ ] ... ] [\ **-p | -**\ **-postscripts**\ \ *node_name*\ ] [\ **-v | -**\ **-verbose**\ ] @@ -72,40 +72,40 @@ OPTIONS -\ **-e|-**\ **-extra**\ \ *srcfile:destdir*\ - +\ **-e|-**\ **-extra**\ \ *srcfile:destdir*\ + Pack up extra files. If \ *destdir*\ is omitted, the destination directory will be the same as the source directory. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-p|-**\ **-postscripts**\ \ *node_name*\ - + +\ **-p|-**\ **-postscripts**\ \ *node_name*\ + Get the names of the postscripts and postbootscripts for the given node and pack them into the image. - -\ **-v|-**\ **-verbose**\ - + +\ **-v|-**\ **-verbose**\ + Verbose output. - -\ *image_name*\ - + +\ *image_name*\ + The name of the image. Use \ **lsdef -t osimage**\ to find out all the image names. - -\ *destination*\ - + +\ *destination*\ + The output bundle file name. - + From 4392954a7c1aecb921935e3da58ec6ad2014de11 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0286/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/imgimport.1.rst --- .../references/man1/imgimport.1.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/imgimport.1.rst b/docs/source/guides/admin-guides/references/man1/imgimport.1.rst index 6359d535d..df19fae09 100644 --- a/docs/source/guides/admin-guides/references/man1/imgimport.1.rst +++ b/docs/source/guides/admin-guides/references/man1/imgimport.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **imgimport [-h|-**\ **-help]**\ +\ **imgimport [-h|-**\ **-help]**\ \ **imgimport**\ \ *bundle_file_name*\ [\ **-p | -**\ **-postscripts**\ \ *nodelist*\ ] [\ **-f | -**\ **-profile**\ \ *new_profile*\ ] [\ **-v | -**\ **-verbose**\ ] @@ -74,7 +74,7 @@ After this command, you can run the \ **nodeset**\ command and then start deplo For stateful: nodeset -For stateless: +For stateless: genimage packimage nodeset @@ -91,28 +91,28 @@ OPTIONS -\ **-f|-**\ **-profile**\ \ *new_profile*\ - +\ **-f|-**\ **-profile**\ \ *new_profile*\ + Import the image with a new profile name. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-p|-**\ **-postscripts**\ \ *nodelist*\ - + +\ **-p|-**\ **-postscripts**\ \ *nodelist*\ + Import the postscripts. The postscripts contained in the image will be set in the postscripts table for \ *nodelist*\ . - -\ **-v|-**\ **-verbose**\ - + +\ **-v|-**\ **-verbose**\ + Verbose output. - + From 2b0540fe8c1522ef96109f7d21d74f40ac4a4f72 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0287/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/liteimg.1.rst --- .../references/man1/liteimg.1.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/liteimg.1.rst b/docs/source/guides/admin-guides/references/man1/liteimg.1.rst index 266f59b73..8235e1717 100644 --- a/docs/source/guides/admin-guides/references/man1/liteimg.1.rst +++ b/docs/source/guides/admin-guides/references/man1/liteimg.1.rst @@ -19,11 +19,11 @@ SYNOPSIS ******** -\ **liteimg [-h| -**\ **-help]**\ +\ **liteimg [-h| -**\ **-help]**\ -\ **liteimg [-v| -**\ **-version]**\ +\ **liteimg [-v| -**\ **-version]**\ -\ **liteimg**\ \ *imagename*\ +\ **liteimg**\ \ *imagename*\ *********** @@ -31,29 +31,29 @@ DESCRIPTION *********** -This command modifies the statelite image by creating a series of links. +This command modifies the statelite image by creating a series of links. It creates 2 levels of indirection so that files can be modified while in their image state as well as during runtime. For example, a file like <$imgroot>/etc/ntp.conf will have the following operations done to it: -\ * mkdir -p $imgroot/.default/etc*\ +\ * mkdir -p $imgroot/.default/etc*\ -\ * mkdir -p $imgroot/.statelite/tmpfs/etc*\ +\ * mkdir -p $imgroot/.statelite/tmpfs/etc*\ -\ * mv $imgroot/etc/ntp.conf $imgroot/.default/etc*\ +\ * mv $imgroot/etc/ntp.conf $imgroot/.default/etc*\ -\ * cd $imgroot/.statelite/tmpfs/etc*\ +\ * cd $imgroot/.statelite/tmpfs/etc*\ -\ * ln -sf ../../../.default/etc/ntp.conf .*\ +\ * ln -sf ../../../.default/etc/ntp.conf .*\ -\ * cd $imgroot/etc*\ +\ * cd $imgroot/etc*\ -\ * ln -sf ../.statelite/tmpfs/etc/ntp.conf .*\ +\ * ln -sf ../.statelite/tmpfs/etc/ntp.conf .*\ When finished, the original file will reside in \ *$imgroot/.default/etc/ntp.conf*\ . \ *$imgroot/etc/ntp.conf*\ will link to \ *$imgroot/.statelite/tmpfs/etc/ntp.conf*\ which will in turn link to -\ *$imgroot/.default/etc/ntp.conf*\ +\ *$imgroot/.default/etc/ntp.conf*\ Note: If you make any changes to your litefile table after running liteimg then you will need to rerun liteimg again. From 7816dced6f1ff81b1076e496453d3674e8a0b3f0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0288/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lsdef.1.rst --- .../admin-guides/references/man1/lsdef.1.rst | 342 +++++++++--------- 1 file changed, 171 insertions(+), 171 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsdef.1.rst b/docs/source/guides/admin-guides/references/man1/lsdef.1.rst index 5e4bbe84d..85cf5b30f 100644 --- a/docs/source/guides/admin-guides/references/man1/lsdef.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsdef.1.rst @@ -21,12 +21,12 @@ SYNOPSIS \ **lsdef**\ [\ **-h | -**\ **-help**\ ] [\ **-t**\ \ *object-types*\ ] [\ **-i**\ \ *attr-list*\ ] -\ **lsdef**\ [\ **-V | -**\ **-verbose**\ ] [\ **-l | -**\ **-long**\ ] [\ **-s | -**\ **-short**\ ] [\ **-a | -**\ **-all**\ ] [\ **-S**\ ] +\ **lsdef**\ [\ **-V | -**\ **-verbose**\ ] [\ **-l | -**\ **-long**\ ] [\ **-s | -**\ **-short**\ ] [\ **-a | -**\ **-all**\ ] [\ **-S**\ ] [\ **-t**\ \ *object-types*\ ] [\ **-o**\ \ *object-names*\ ] [\ **-z | -**\ **-stanza**\ ] [\ **-i**\ \ *attr-list*\ ] [\ **-c | -**\ **-compress**\ ] [\ **-**\ **-osimage**\ ] [\ **-**\ **-nics**\ ] [[\ **-w**\ \ *attr*\ ==\ *val*\ ] [\ **-w**\ \ *attr*\ =~\ *val*\ ] ...] [\ *noderange*\ ] -\ **lsdef**\ [\ **-l | -**\ **-long**\ ] [\ **-a | -**\ **-all**\ ] [\ **-t**\ \ *object-types*\ ] [\ **-z | -**\ **-stanza**\ ] +\ **lsdef**\ [\ **-l | -**\ **-long**\ ] [\ **-a | -**\ **-all**\ ] [\ **-t**\ \ *object-types*\ ] [\ **-z | -**\ **-stanza**\ ] [\ **-i**\ \ *attr-list*\ ] [\ **-**\ **-template**\ [\ *template-object-name*\ ]] @@ -45,113 +45,113 @@ OPTIONS -\ **-a|-**\ **-all**\ - +\ **-a|-**\ **-all**\ + Display all definitions. For performance consideration, the auditlog and eventlog objects will not be listed. To list auditlog or eventlog objects, use lsdef -t auditlog or lsdef -t eventlog instead. - -\ **-c|-**\ **-compress**\ - + +\ **-c|-**\ **-compress**\ + Display information in compressed mode, each output line has format ": ". - The output can be passed to command xcoll or xdshbak for formatted output. + The output can be passed to command xcoll or xdshbak for formatted output. The -c flag must be used with -i flag. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-i**\ \ *attr-list*\ - + +\ **-i**\ \ *attr-list*\ + Comma separated list of attribute names to display. - -\ **-l|-**\ **-long**\ - + +\ **-l|-**\ **-long**\ + List the complete object definition. - -\ **-s|-**\ **-short**\ - + +\ **-s|-**\ **-short**\ + Only list the object names. - -\ **-S**\ - + +\ **-S**\ + List all the hidden nodes (FSP/BPA nodes) with other ones. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on supported formats. - -\ **-o**\ \ *object-names*\ - + +\ **-o**\ \ *object-names*\ + A set of comma delimited object names. - + \ **-**\ **-template**\ [\ *template-object-name*\ ] - + Show the object definition templates \ *template-object-name*\ shipped in xCAT. If no \ *template-object-name*\ is specified, all the object definition templates of the specified type \ **-t**\ \ *object-types*\ will be listed. Use \ **-a|-**\ **-all**\ option to list all the object definition templates. - -\ **-**\ **-osimage**\ - + +\ **-**\ **-osimage**\ + Show all the osimage information for the node. - -\ **-**\ **-nics**\ - + +\ **-**\ **-nics**\ + Show the nics configuration information for the node. - -\ **-t**\ \ *object-types*\ - + +\ **-t**\ \ *object-types*\ + A set of comma delimited object types. Use the help option to get a list of valid objects. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - + \ **-w**\ \ *attr==val*\ \ **-w**\ \ *attr=~val*\ ... - + Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. Use the help option to get a list of valid attributes for each object type. - + Operator descriptions: == Select nodes where the attribute value is exactly this value. != Select nodes where the attribute value is not this specific value. =~ Select nodes where the attribute value matches this regular expression. !~ Select nodes where the attribute value does not match this regular expression. - + Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attrval" needs to be quoted. If the operator is "!~", the "attrval" needs to be quoted using single quote. - -\ **-z|-**\ **-stanza**\ - + +\ **-z|-**\ **-stanza**\ + Display output in stanza format. See the xcatstanzafile man page for details on using xCAT stanza files. - + @@ -172,253 +172,253 @@ EXAMPLES 1. - + To display a description of all the valid attributes that could be used when defining an xCAT node. - - + + .. code-block:: perl - + lsdef -t node -h - - + + 2. - + To get a list of all the objects that have been defined. - - + + .. code-block:: perl - + lsdef OR lsdef -a - - + + 3. - + To get all the attributes of the node1 - - + + .. code-block:: perl - + lsdef node1 OR lsdef -t node node1 OR lsdef -t node -o node1 - - + + 4. - + To get the object name of node1 instead of all the attributes - - + + .. code-block:: perl - + lsdef -s node1 - - + + 5. - + To get a list of all the network definitions. - - + + .. code-block:: perl - + lsdef -t network - - + + 6. - + To get a complete listing of all network definitions. - - + + .. code-block:: perl - + lsdef -l -t network - - + + 7. - + To list the whole xCAT database and write it to a stanza file. (backup database) - - + + .. code-block:: perl - + lsdef -a -l -z > mydbstanzafile - - + + 8. - + To list the MAC and install adapter name for each node. - - + + .. code-block:: perl - + lsdef -t node -i mac,installnic - - + + 9. - + To list an osimage definition named "aix53J". - - + + .. code-block:: perl - + lsdef -t osimage -l -o aix53J - - + + 10. - + To list all node definitions that have a status value of "booting". - - + + .. code-block:: perl - + lsdef -t node -w status==booting - - + + 11. - + To list all the attributes of the group "service". - - + + .. code-block:: perl - + lsdef -l -t group -o service - - + + 12. - + To list all the attributes of the nodes that are members of the group "service". - - + + .. code-block:: perl - + lsdef -t node -l service - - + + 13. - + To get a listing of object definitions that includes information about what xCAT database tables are used to store the data. - - + + .. code-block:: perl - + lsdef -V -l -t node -o node01 - - + + 14. - + To list the hidden nodes that can't be seen with other flags. The hidden nodes are FSP/BPAs. - - + + .. code-block:: perl - + lsdef -S - - + + 15. - + To list the nodes status and use xcoll to format the output. - - + + .. code-block:: perl - + lsdef -t node -i status -c | xcoll - - + + 16. - + To display the description for some specific attributes that could be used when defining an xCAT node. - - + + .. code-block:: perl - + lsdef -t node -h -i profile,pprofile - - + + 17. - + To display the nics configuration information for node cn1. - - + + .. code-block:: perl - + lsdef cn1 --nics - - + + 18. - + To list all the object definition templates shipped in xCAT. - - + + .. code-block:: perl - + lsdef --template -a - - + + 19. - + To display the details of "node" object definition template "ppc64le-template" shipped in xCAT. - - + + .. code-block:: perl - + lsdef -t node --template ppc64le-template - - + + 20. - + To list all the "node" object definition templates shipped in xCAT. - - + + .. code-block:: perl - + lsdef -t node --template - - + + From 3385675cec425649ce29e8dce7d6bf18c90b2470 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0289/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lsdocker.1.rst --- .../references/man1/lsdocker.1.rst | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsdocker.1.rst b/docs/source/guides/admin-guides/references/man1/lsdocker.1.rst index 67b5fd0fa..239e7408d 100644 --- a/docs/source/guides/admin-guides/references/man1/lsdocker.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsdocker.1.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **lsdocker**\ \ *noderange*\ [\ **-l | -**\ **-logs**\ ] -\ **lsdocker**\ \ *dockerhost*\ +\ **lsdocker**\ \ *dockerhost*\ \ **lsdocker**\ [\ **-h | -**\ **-help**\ ] @@ -42,7 +42,7 @@ OPTIONS -\ **-l|-**\ **-logs**\ +\ **-l|-**\ **-logs**\ @@ -56,40 +56,40 @@ EXAMPLES 1. To get info for docker instance "host01c01" - - + + .. code-block:: perl - + lsdocker host01c01 - - + + Output is similar to: - - + + .. code-block:: perl - + host01c01: 50800dfd8b5f ubuntu /bin/bash 2016-01-13T06:32:59 running /host01c01 - - + + 2. To get info for running docker instance on dockerhost "host01" - - + + .. code-block:: perl - + lsdocker host01 - - + + Output is similar to: - - + + .. code-block:: perl - + host01: 50800dfd8b5f ubuntu /bin/bash 2016-1-13 - 1:32:59 Up 12 minutes /host01c01 host01: 875ce11d5987 ubuntu /bin/bash 2016-1-21 - 1:12:37 Up 5 seconds /host01c02 - - + + From 9faf9fc9e9d10efed16d680768ed8c4ef58a6617 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0290/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst --- .../references/man1/lsflexnode.1.rst | 152 +++++++++--------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst b/docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst index e72fc0ce0..68c3d604a 100644 --- a/docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst @@ -23,7 +23,7 @@ SYNOPSIS \ **lsflexnode**\ [\ **-v**\ | \ **-**\ **-version**\ ] -\ **lsflexnode**\ \ *noderange*\ +\ **lsflexnode**\ \ *noderange*\ *********** @@ -55,16 +55,16 @@ OPTIONS -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Display the usage message. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display the version information. - + @@ -76,102 +76,102 @@ ATTRIBUTES The meaning of attributes which displayed by the \ **lsflexnode**\ . The word 'node' in this section means \ **Blade slot node**\ . -\ **Complex**\ - +\ **Complex**\ + The unique numeric identifier for a complex installed in the chassis. - -\ **Partition number**\ - + +\ **Partition number**\ + The number of partitions currently defined for this complex. - -\ **Complex node number**\ - + +\ **Complex node number**\ + The number of nodes existing in this complex, regardless of their assignment to any given partition. - -\ **Partition**\ - + +\ **Partition**\ + The unique numeric identifier for a partition defined within a complex installed in the chassis. - -\ **Partition Mode**\ - + +\ **Partition Mode**\ + The currently configured mode of this partition. It can be 'partition' or 'standalone'. - -\ **Partition node number**\ - + +\ **Partition node number**\ + The number of nodes currently defined for this partition. - -\ **Partition status**\ - + +\ **Partition status**\ + The current power status of this partition when the partition has a valid partition configuration. It can be 'poweredoff', 'poweredon', 'resetting' or 'invalid'. - -\ **Node**\ - + +\ **Node**\ + The unique numeric identifier for this node, unique within the partition. If this node does not belong to a partition, the slot number will be displayed. - -\ **Node state**\ - + +\ **Node state**\ + The physical power state of this node. It can be 'poweredoff', 'poweredon' or 'resetting'. - -\ **Node slot**\ - + +\ **Node slot**\ + The base slot number where the node exists in the chassis. - -\ **Node resource**\ - + +\ **Node resource**\ + A string providing a summary overview of the resources provided by this node. It includes the CPU number, CPU frequency and Memory size. - -\ **Node type**\ - + +\ **Node type**\ + The general categorization of the node. It can be 'processor', 'memory' or 'io'. - -\ **Node role**\ - + +\ **Node role**\ + Indicates if the node is assigned to a partition, and if so, provides an indication of whether the node is the primary node of the partition or not. - -\ **Flexnode state**\ - + +\ **Flexnode state**\ + The state of a flexible node. It is the state of the partition which this node belongs to. If this node does NOT belong to a partition, the value should be 'invalid'. - + It can be 'poweredoff', 'poweredon', 'resetting' or 'invalid'. - -\ **Complex id**\ - + +\ **Complex id**\ + The identifier of the complex this node belongs to. - -\ **Partition id**\ - + +\ **Partition id**\ + The identifier of the partition this node belongs to. - + @@ -182,18 +182,18 @@ EXAMPLES 1 Display all the \ **Complex**\ , \ **Partition**\ and \ **Blade slot node**\ which managed by a AMM. - - + + .. code-block:: perl - + lsflexnode amm1 - - + + The output: - - + + .. code-block:: perl - + amm1: Complex - 24068 amm1: ..Partition number - 1 amm1: ..Complex node number - 2 @@ -214,23 +214,23 @@ EXAMPLES amm1: ......Node type - processor amm1: ......Node resource - 2 (1866 MHz) / 8 (2 GB) amm1: ......Node role - unassigned - - + + 2 Display a flexible node. - - + + .. code-block:: perl - + lsflexnode blade1 - - + + The output: - - + + .. code-block:: perl - + blade1: Flexnode state - poweredoff blade1: Complex id - 24068 blade1: Partition id - 1 @@ -239,8 +239,8 @@ EXAMPLES blade1: Slot14: Node type - processor blade1: Slot14: Node resource - 2 (1866 MHz) / 8 (2 GB) blade1: Slot14: Node role - secondary - - + + From f0d077829624ae4185c5845c0b3f3fa2004e89d2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0291/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lshwconn.1.rst --- .../references/man1/lshwconn.1.rst | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lshwconn.1.rst b/docs/source/guides/admin-guides/references/man1/lshwconn.1.rst index 017ef1cc2..e3ae23a33 100644 --- a/docs/source/guides/admin-guides/references/man1/lshwconn.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lshwconn.1.rst @@ -27,14 +27,14 @@ PPC (with HMC) specific: ======================== -\ **lshwconn**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ +\ **lshwconn**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ PPC (without HMC, using FSPAPI) specific: ========================================= -\ **lshwconn**\ \ *noderange*\ \ **-T**\ \ *tooltype*\ +\ **lshwconn**\ \ *noderange*\ \ **-T**\ \ *tooltype*\ @@ -52,22 +52,22 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose output. - -\ **-T**\ - + +\ **-T**\ + The tooltype is used to communicate to the CEC/Frame. The value could be lpar or fnm. The tooltype value lpar is for xCAT and fnm is for CNM. - + @@ -88,66 +88,66 @@ EXAMPLES 1. - + To display connection status for all CEC nodes in node group CEC: - - + + .. code-block:: perl - + lshwconn cec - - + + Output is similar to: - - + + .. code-block:: perl - + cec1: ipaddr=192.168.200.245,alt_ipaddr=unavailable,state=Connected cec2: Connection not found - - + + 2. - + To display connection status for Frame node frame1: - - + + .. code-block:: perl - + lshwconn frame1 - - + + Output is similar to: - - + + .. code-block:: perl - + frame1: side=a,ipaddr=192.168.200.247,alt_ipaddr=unavailable,state=Connected frame1: side=b,ipaddr=192.168.200.248,alt_ipaddr=unavailable,state=Connected - - + + 3. - + To display connection status for all CEC nodes in node group CEC to hardware server, and using lpar tooltype: - - + + .. code-block:: perl - + lshwconn cec -T lpar - - + + Output is similar to: - - + + .. code-block:: perl - + cec1: sp=primary,ipadd=40.3.7.1,alt_ipadd=unavailable,state=LINE UP cec2: Connection not found - - + + From ce03af6985b5b43ad38b70daee69d8ed86a4592f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0292/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lskit.1.rst --- .../admin-guides/references/man1/lskit.1.rst | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lskit.1.rst b/docs/source/guides/admin-guides/references/man1/lskit.1.rst index e0e74377e..c845cadb3 100644 --- a/docs/source/guides/admin-guides/references/man1/lskit.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lskit.1.rst @@ -46,44 +46,44 @@ OPTIONS -\ **-F|-**\ **-framework**\ \ *kit_path_name*\ - +\ **-F|-**\ **-framework**\ \ *kit_path_name*\ + Use this option to display the framework values of the specified Kit tarfile. This information is retreived directly from the tarfile and can be done before the Kit has been defined in the xCAT database. This option cannot be combined with other options. - -\ **-K|-**\ **-kitattr**\ \ *kitattr_names*\ - + +\ **-K|-**\ **-kitattr**\ \ *kitattr_names*\ + Where \ *kitattr_names*\ is a comma-delimited list of kit attribute names. The names correspond to attribute names in the \ **kit**\ table. The \ **lskit**\ command will only display the specified kit attributes. - -\ **-R|-**\ **-repoattr**\ \ *repoattr_names*\ - + +\ **-R|-**\ **-repoattr**\ \ *repoattr_names*\ + Where \ *repoattr_names*\ is a comma-delimited list of kit repository attribute names. The names correspond to attribute names in the \ **kitrepo**\ table. The \ **lskit**\ command will only display the specified kit repository attributes. - -\ **-C|-**\ **-compattr**\ \ *compattr_names*\ - + +\ **-C|-**\ **-compattr**\ \ *compattr_names*\ + where \ *compattr_names*\ is a comma-delimited list of kit component attribute names. The names correspond to attribute names in the \ **kitcomponent**\ table. The \ **lskit**\ command will only display the specified kit component attributes. - -\ *kit_names*\ - + +\ *kit_names*\ + is a comma-delimited list of kit names. The \ **lskit**\ command will only display the kits matching these names. - -\ **-x|-**\ **-xml|-**\ **-XML**\ - + +\ **-x|-**\ **-xml|-**\ **-XML**\ + Need XCATXMLTRACE=1 env when using -x|--xml|--XML, for example: XCATXMLTRACE=1 lskit -x testkit-1.0.0 Return the output with XML tags. The data is returned as: - - + + .. code-block:: perl - + ... @@ -95,58 +95,58 @@ OPTIONS ... - - + + Each tag contains info for one kit. The info inside is structured as follows: - - + + .. code-block:: perl - + The sub-tag contains the kit's basic info. The sub-tags store info about the kit's repositories. The sub-tags store info about the kit's components. - - + + The data inside is returned as: - - + + .. code-block:: perl - + ... - + ... ... - + ... ... - - -\ **-V|-**\ **-verbose**\ - + + +\ **-V|-**\ **-verbose**\ + Display additional progress and error messages. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -172,64 +172,64 @@ EXAMPLES 1. To list all kits, enter: - - + + .. code-block:: perl - + lskit - - + + 2. To list the kit "kit-test1-1.0-Linux", enter: - - + + .. code-block:: perl - + lskit kit-test1-1.0-Linux - - + + 3. To list the kit "kit-test1-1.0-Linux" for selected attributes, enter: - - + + .. code-block:: perl - + lskit -K basename,description -R kitreponame -C kitcompname kit-test1-1.0-Linux - - + + 4. To list the framework value of a Kit tarfile. - - + + .. code-block:: perl - + lskit -F /myhome/mykits/pperte-1.3.0.2-0-x86_64.tar.bz2 - - + + Output is similar to: - - + + .. code-block:: perl - + Extracting the kit.conf file from /myhome/mykits/pperte-1.3.0.2-0-x86_64.tar.bz2. Please wait. - + kitframework=2 compatible_kitframeworks=0,1,2 - - + + 5. To list kit "testkit-1.0-1" with XML tags, enter: - - + + .. code-block:: perl - + XCATXMLTRACE=1 lskit -x testkit-1.0-1 - - + + From 68241f981da29aee8dd65cca71ee8c6b3fea3901 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0293/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst --- .../references/man1/lskitcomp.1.rst | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst b/docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst index 895a065e1..615db005a 100644 --- a/docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst @@ -44,38 +44,38 @@ OPTIONS -\ **-C|-**\ **-compattr**\ \ *compattr_names*\ - +\ **-C|-**\ **-compattr**\ \ *compattr_names*\ + where \ *compattr_names*\ is a comma-delimited list of kit component attribute names. The names correspond to attribute names in the \ **kitcomponent**\ table. The \ **lskitcomp**\ command will only display the specified kit component attributes. - -\ **-O|-**\ **-osdistro**\ \ *os_distro*\ - + +\ **-O|-**\ **-osdistro**\ \ *os_distro*\ + where \ *os_distro*\ is the name of an osdistro in \ **osdistro**\ table. The \ **lskitcomp**\ command will only display the kit components matching the specified osdistro. - -\ **-S|-**\ **-serverrole**\ \ *server_role*\ - + +\ **-S|-**\ **-serverrole**\ \ *server_role*\ + where \ *server_role*\ is the name of a server role. The typical server roles are: mgtnode, servicenode, computenode, loginnode, storagennode. The \ **lskitcomp**\ command will only display the kit components matching the specified server role. - -\ *kitcomp_names*\ - + +\ *kitcomp_names*\ + is a comma-delimited list of kit component names. The \ **lskitcomp**\ command will only display the kit components matching the specified names. - -\ **-x|-**\ **-xml|-**\ **-XML**\ - + +\ **-x|-**\ **-xml|-**\ **-XML**\ + Need XCATXMLTRACE=1 env when using -x|--xml|--XML. Return the output with XML tags. The data is returned as: - - + + .. code-block:: perl - + ... @@ -87,52 +87,52 @@ OPTIONS ... - - + + Each tag contains info for a group of kit components belonging to the same kit. The info inside is structured as follows: - - + + .. code-block:: perl - + The sub-tag contains the kit's name. The sub-tags store info about the kit's components. - - + + The data inside is returned as: - - + + .. code-block:: perl - + ... - + ... ... - - -\ **-V|-**\ **-verbose**\ - + + +\ **-V|-**\ **-verbose**\ + Display additional progress and error messages. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -158,75 +158,75 @@ EXAMPLES 1. - + To list all kit components, enter: - - + + .. code-block:: perl - + lskitcomp - - + + 2. - + To list the kit component "comp-server-1.0-1-rhels-6-x86_64", enter: - - + + .. code-block:: perl - + lskitcomp comp-server-1.0-1-rhels-6-x86_64 - - + + 3. - + To list the kit component "comp-server-1.0-1-rhels-6-x86_64" for selected kit component attributes, enter: - - + + .. code-block:: perl - + lskitcomp -C kitcompname,desc comp-server-1.0-1-rhels-6-x86_64 - - + + 4. - + To list kit components compatible with "rhels-6.2-x86_64" osdistro, enter: - - + + .. code-block:: perl - + lskitcomp -O rhels-6.2-x86_64 - - + + 5. - + To list kit components compatible with "rhels-6.2-x86_64" osdistro and "computenode" server role, enter: - - + + .. code-block:: perl - + lskitcomp -O rhels-6.2-x86_64 -S computenode - - + + 6. - + To list the kit component "testkit-compute-1.0-1-ubuntu-14.04-ppc64el" with XML tags, enter: - - + + .. code-block:: perl - + XCATXMLTRACE=1 lskitcomp -x testkit-compute-1.0-1-ubuntu-14.04-ppc64el - - + + From 516a11caa2d2b96c5f9607e1e81fd179dd4c80c4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0294/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst --- .../references/man1/lskitdeployparam.1.rst | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst b/docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst index 28cc34092..099688d2d 100644 --- a/docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst @@ -44,25 +44,25 @@ OPTIONS -\ **-k|-**\ **-kitname**\ \ *kit_names*\ - +\ **-k|-**\ **-kitname**\ \ *kit_names*\ + Where \ *kit_names*\ is a comma-delimited list of kit names. The \ **lskitdeployparam**\ command will only display the deployment parameters for the kits with the matching names. - -\ **-c|-**\ **-compname**\ \ *comp_names*\ - + +\ **-c|-**\ **-compname**\ \ *comp_names*\ + Where \ *comp_names*\ is a comma-delimited list of kit component names. The \ **lskitdeployparam**\ command will only display the deployment parameters for the kit components with the matching names. - -\ **-x|-**\ **-xml|-**\ **-XML**\ - + +\ **-x|-**\ **-xml|-**\ **-XML**\ + Return the output with XML tags. The data is returned as: - - + + .. code-block:: perl - + KIT_KIT1_PARAM1 @@ -76,26 +76,26 @@ OPTIONS ... - - -\ **-V|-**\ **-verbose**\ - + + +\ **-V|-**\ **-verbose**\ + Display additional progress and error messages. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -121,27 +121,27 @@ EXAMPLES 1. - + To list kit deployment parameters for kit "kit-test1-1.0-Linux", enter: - - + + .. code-block:: perl - + lskitdeployparam -k kit-test1-1.0-Linux - - + + 2. - + To list kit deployment parameters for kit component "comp-server-1.0-1-rhels-6-x86_64", enter: - - + + .. code-block:: perl - + lskitdeployparam -c comp-server-1.0-1-rhels-6-x86_64 - - + + From 4977884ae57102143d7a421b996f9b55d9ab1cb3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0295/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lskmodules.1.rst --- .../references/man1/lskmodules.1.rst | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lskmodules.1.rst b/docs/source/guides/admin-guides/references/man1/lskmodules.1.rst index f2787f892..39042bd4e 100644 --- a/docs/source/guides/admin-guides/references/man1/lskmodules.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lskmodules.1.rst @@ -40,63 +40,63 @@ OPTIONS -\ **-i|-**\ **-osimage**\ \ *osimage_names*\ - +\ **-i|-**\ **-osimage**\ \ *osimage_names*\ + where \ *osimage_names*\ is a comma-delimited list of xCAT database osimage object names. For each \ *osimage_name*\ , lskmodules will use the entries in osimage.driverupdatesrc for the rpms and driver disk image files to search. - -\ **-c|-**\ **-kitcomponent**\ \ *kitcomponent_names*\ - + +\ **-c|-**\ **-kitcomponent**\ \ *kitcomponent_names*\ + where \ *kitcomponent_names*\ is a comma-delimited list of xCAT database kitcomponent object names. For each \ *kitcomponent_name*\ , lskmodules will use the entries in kitcomponent.driverpacks for the rpm list and the repodir of the kitcomponent.kitreponame for the location of the rpm files to search. - -\ **-o|-**\ **-osdistro**\ \ *osdistro_names*\ - + +\ **-o|-**\ **-osdistro**\ \ *osdistro_names*\ + where \ *osdistro_names*\ is a comma-delimited list of xCAT database osdistro object names. For each \ *osdistro_name*\ , lskmodules will search each /Packages/kernel-.rpm file. - -\ **-u|-**\ **-osdistroupdate**\ \ *osdistroupdate_names*\ - + +\ **-u|-**\ **-osdistroupdate**\ \ *osdistroupdate_names*\ + where \ *osdistroupdate_names*\ is a comma-delimited list of xCAT database osdistroupdate table entries. For each \ *osdistroupdate_name*\ , lskmodules will search the /kernel-.rpm file. - -\ **-x|-**\ **-xml|-**\ **-XML**\ - + +\ **-x|-**\ **-xml|-**\ **-XML**\ + Return the output with XML tags. The data is returned as: - - + + .. code-block:: perl - + xxx.ko this is module xxx - - + + This option is intended for use by other programs. The XML will not be displayed. To view the returned XML, set the XCATSHOWXML=yes environment variable before running this command. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Display additional progress and error messages. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -122,15 +122,15 @@ EXAMPLES 1. - + To list the kernel modules included in the driverpacks shipped with kitcomponent kit1_comp1-x86_64, enter: - - + + .. code-block:: perl - + lskmodules -c kit1_comp1-x86_64 - - + + From 78958170c3f97d6a2466b76f6302e630a92ecf15 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0296/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lslite.1.rst --- .../admin-guides/references/man1/lslite.1.rst | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lslite.1.rst b/docs/source/guides/admin-guides/references/man1/lslite.1.rst index fce8f56e9..ebff6f37b 100644 --- a/docs/source/guides/admin-guides/references/man1/lslite.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lslite.1.rst @@ -38,28 +38,28 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-i**\ \ *imagename*\ - + +\ **-i**\ \ *imagename*\ + The name of an existing xCAT osimage definition. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats. - + @@ -80,61 +80,61 @@ EXAMPLES 1. - + To list the statelite information for an xCAT node named "node01". - - + + .. code-block:: perl - + lslite node01 - - + + Output is similar to: - - + + .. code-block:: perl - + >>>Node: node01 - + Osimage: 61img - + Persistent directory (statelite table): xcatmn1:/statelite - + Litefiles (litefile table): tmpfs,rw /etc/adjtime tmpfs,rw /etc/lvm/.cache tmpfs,rw /etc/mtab ........ - + Litetree path (litetree table): 1,MN:/etc 2,server1:/etc - - + + 2. - + To list the statelite information for an xCAT osimage named "osimage01". - - + + .. code-block:: perl - + lslite -i osimage01 - - + + Output is similar to: - - + + .. code-block:: perl - + tmpfs,rw /etc/adjtime tmpfs,rw /etc/lvm/.cache tmpfs,rw /etc/mtab ........ - - + + From 402a55d63b8882c3712beb27b2830c82b63a0a1b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0297/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lsslp.1.rst --- .../admin-guides/references/man1/lsslp.1.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsslp.1.rst b/docs/source/guides/admin-guides/references/man1/lsslp.1.rst index 3c83cb355..89add6b84 100644 --- a/docs/source/guides/admin-guides/references/man1/lsslp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsslp.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **lsslp [-h| -**\ **-help]**\ +\ **lsslp [-h| -**\ **-help]**\ -\ **lsslp [-v| -**\ **-version]**\ +\ **lsslp [-v| -**\ **-version]**\ \ **lsslp**\ [\ *noderange*\ ] [\ **-V**\ ] [\ **-i**\ \ *ip[,ip..]*\ ] \ **[-w] [-r|-x|-z] [-n] [-s CEC|FRAME|MM|IVM|RSA|HMC|CMM|IMM2|FSP]**\ [\ **-t**\ \ *tries*\ ] [\ **-I**\ ] [\ **-C**\ \ *counts*\ ] [\ **-T**\ \ *timeout*\ ] [\ **-**\ **-vpdtable**\ ] @@ -176,7 +176,7 @@ Output is similar to: ip=192.168.200.125 groups=hmc,all mgt=hmc - mac=00:1a:64:fb:7d:50 + mac=00:1a:64:fb:7d:50 hidden=0 192.168.200.244: objtype=node @@ -251,7 +251,7 @@ Output is similar to: id=0 mac=00:14:5E:F0:5C:FD otherinterfaces=50.0.0.5 - + bpa01: objtype=node nodetype=bpa @@ -270,8 +270,8 @@ Output is similar to: .. code-block:: perl - lsslp -s CEC - + lsslp -s CEC + device type-model serial-number side ip-addresses hostname FSP 9117-MMB 105EBEP A-1 20.0.0.138 20.0.0.138 FSP 9117-MMB 105EBEP B-1 20.0.0.139 20.0.0.139 @@ -292,7 +292,7 @@ Output is similar to: .. code-block:: perl These nodes defined in database but can't be discovered: f17c00bpcb_b,f17c01bpcb_a,f17c01bpcb_b,f17c02bpcb_a, - + device type-model serial-number side ip-addresses hostname bpa 9458-100 BPCF017 A-0 40.17.0.1 f17c00bpca_a bpa 9458-100 BPCF017 B-0 40.17.0.2 f17c00bpcb_a @@ -305,7 +305,7 @@ Output is similar to: lsslp CEC1-CEC3 or lsslp CEC1,CEC2,CEC3 - + device type-model serial-number side ip-addresses hostname FSP 9A01-100 0P1P336 A-0 192.168.200.34 192.168.200.34 FSP 9A01-100 0P1P336 B-0 192.168.200.35 192.168.200.35 From 744a5fe928804baeb246c9511ec30bf50014da1b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0298/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lstree.1.rst --- .../admin-guides/references/man1/lstree.1.rst | 190 +++++++++--------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lstree.1.rst b/docs/source/guides/admin-guides/references/man1/lstree.1.rst index e6a4eeddf..677690c31 100644 --- a/docs/source/guides/admin-guides/references/man1/lstree.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lstree.1.rst @@ -38,34 +38,34 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-s|-**\ **- servicenode**\ - + +\ **-s|-**\ **- servicenode**\ + Show the tree of service node hierarchy. - -\ **-H|-**\ **-hardwaremgmt**\ - + +\ **-H|-**\ **-hardwaremgmt**\ + Show the tree of hardware hierarchy. - -\ **-**\ **-v|-**\ **-virtualmachine**\ - + +\ **-**\ **-v|-**\ **-virtualmachine**\ + Show the tree of VM hierarchy. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats. - + @@ -86,173 +86,173 @@ EXAMPLES 1. To display the tree of service node hierarchy for all the nodes. - - + + .. code-block:: perl - + lstree -s - - + + Output is similar to: - - + + .. code-block:: perl - + Service Node: mysn01 |__mycn01 |__mycn02 |__mycn03 - + Service Node: mysn02 |__mycn11 |__mycn12 |__mycn13 ...... - - + + 2. - + To display the tree of service node hierarchy for service node "mysn01". - - + + .. code-block:: perl - + lstree -s mysn01 - - + + Output is similar to: - - + + .. code-block:: perl - + Service Node: mysn01 |__mycn01 |__mycn02 |__mycn03 - - + + 3. - + To display the tree of hardware hierarchy for all the nodes. - - + + .. code-block:: perl - + lstree -H - - + + Output is similar to: - - + + .. code-block:: perl - + HMC: myhmc01 |__Frame: myframe01 |__CEC: mycec01 |__CEC: mycec02 ...... - + Service Focal Point: myhmc02 |__Frame: myframe01 |__CEC: mycec01 |__CEC: mycec02 |__CEC: mycec03 ...... - + Management Module: mymm01 |__Blade 1: js22n01 |__Blade 2: js22n02 |__Blade 3: js22n03 ...... - + BMC: 192.168.0.1 |__Server: x3650n01 - - + + 4. To display the tree of hardware hierarchy for HMC "myhmc01". - - + + .. code-block:: perl - + lstree -H myhmc01 - - + + Output is similar to: - - + + .. code-block:: perl - + HMC: myhmc01 |__Frame: myframe01 |__CEC: mycec01 |__CEC: mycec02 ...... - - + + 5. To display the tree of VM hierarchy for all the nodes. - - + + .. code-block:: perl - + lstree -v - - + + Output is similar to: - - + + .. code-block:: perl - + Server: hs22n01 |__ hs22vm1 - + Server: x3650n01 |__ x3650n01kvm1 |__ x3650n01kvm2 - - + + 6. To display the tree of VM hierarchy for the node "x3650n01". - - + + .. code-block:: perl - + lstree -v x3650n01 - - + + Output is similar to: - - + + .. code-block:: perl - + Server: x3650n01 |__ x3650n01kvm1 |__ x3650n01kvm2 - - + + 7. To display both the hardware tree and VM tree for all nodes. - - + + .. code-block:: perl - + lstree - - + + Output is similar to: - - + + .. code-block:: perl - + HMC: myhmc01 |__Frame: myframe01 |__CEC: mycec01 @@ -265,7 +265,7 @@ EXAMPLES |__LPAR 2: node12 |__LPAR 3: node13 ...... - + Service Focal Point: myhmc02 |__Frame: myframe01 |__CEC: mycec01 @@ -279,7 +279,7 @@ EXAMPLES |__LPAR 2: node22 |__LPAR 3: node23 ...... - + Management Module: mymm01 |__Blade 1: hs22n01 |__hs22n01vm1 @@ -288,13 +288,13 @@ EXAMPLES |__hs22n02vm1 |__hs22n02vm2 ...... - + BMC: 192.168.0.1 |__Server: x3650n01 |__ x3650n01kvm1 |__ x3650n01kvm2 - - + + From de82ea08e2de6363cacab027e4061fb7753579ba Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0299/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lsve.1.rst --- .../admin-guides/references/man1/lsve.1.rst | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsve.1.rst b/docs/source/guides/admin-guides/references/man1/lsve.1.rst index 59c351f2b..ab01f49fb 100644 --- a/docs/source/guides/admin-guides/references/man1/lsve.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsve.1.rst @@ -27,16 +27,16 @@ DESCRIPTION *********** -The \ **lsve**\ command can be used to list a virtual environment for +The \ **lsve**\ command can be used to list a virtual environment for 'Data Center', 'Cluster', 'Storage Domain', 'Network' and 'Template' objects. -The mandatory parameter \ **-m**\ \ *manager*\ is used to specify the address of the +The mandatory parameter \ **-m**\ \ *manager*\ is used to specify the address of the manager of virtual environment. xCAT needs it to access the RHEV manager. -The mandatory parameter \ **-t**\ \ *type*\ is used to specify the type of the target +The mandatory parameter \ **-t**\ \ *type*\ is used to specify the type of the target object. -Basically, \ **lsve**\ command supports three types of object: \ **dc**\ , \ **cl**\ , \ **sd**\ , \ **nw**\ +Basically, \ **lsve**\ command supports three types of object: \ **dc**\ , \ **cl**\ , \ **sd**\ , \ **nw**\ and \ **tpl**\ . The parameter \ **-o object**\ is used to specify which object to list. If no \ **-o**\ is specified, @@ -54,9 +54,9 @@ OPTIONS \ **-m**\ Specify the manager of the virtual environment. - + For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have to be specified. - + \ **-o**\ The target object to display. @@ -64,19 +64,19 @@ OPTIONS \ **-t**\ Specify the \ **type**\ of the target object. - + Supported types: - - + + .. code-block:: perl - + B - Data Center (For type of 'dc', all the elements belongs to the data center will be listed.) B - Cluster B - Storage Domain (To get the status of Storage Doamin, show it from I it attached to. B - Network B - Template - - + + @@ -97,18 +97,18 @@ EXAMPLES 1. To list the data center 'Default', enter: - - + + .. code-block:: perl - + lsve -t dc -m -o Default - - + + Output is similar to: - - + + .. code-block:: perl - + datacenters: [Default] description: The default Data Center state: up @@ -148,44 +148,44 @@ EXAMPLES state: ok stateless: false type: desktop - - + + 2. To list the cluster 'Default', enter: - - + + .. code-block:: perl - + lsve -t cl -m -o Default - - + + Output is similar to: - - + + .. code-block:: perl - + cpu: Intel Westmere Family description: The default server cluster memory_hugepage: true memory_overcommit: 10 - - + + 3. To list the Storage Domain 'image', enter: - - + + .. code-block:: perl - + lsve -t sd -m -o image - - + + Output is similar to: - - + + .. code-block:: perl - + storagedomains: [image] available: 55834574848 committed: 13958643712 @@ -197,44 +197,44 @@ EXAMPLES storage_type: nfs type: data used: 9663676416 - - + + 4. To list the network 'rhevm', enter: - - + + .. code-block:: perl - + lsve -t nw -m -o rhevm - - + + Output is similar to: - - + + .. code-block:: perl - + networks: [rhevm] description: Management Network state: operational stp: false - - + + 5. To list the template 'tpl01', enter: - - + + .. code-block:: perl - + lsve -t tpl -m -o tpl01 - - + + Output is similar to: - - + + .. code-block:: perl - + templates: [tpl01] bootorder: network cpucore: 2 @@ -245,8 +245,8 @@ EXAMPLES state: ok stateless: false type: server - - + + From 99577250b1b7a570afc5337586c2be2848ffda8f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0300/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lsvlan.1.rst --- .../admin-guides/references/man1/lsvlan.1.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsvlan.1.rst b/docs/source/guides/admin-guides/references/man1/lsvlan.1.rst index 00a70be90..e9a797b8c 100644 --- a/docs/source/guides/admin-guides/references/man1/lsvlan.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsvlan.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **lsvlan**\ +\ **lsvlan**\ \ **lsvlan**\ [\ *vlanid*\ ] @@ -76,54 +76,54 @@ EXAMPLES 1. To list all the vlans in the cluster - - + + .. code-block:: perl - + lsvlan - - + + Output is similar to: - - + + .. code-block:: perl - + vlan 3: subnet 10.3.0.0 netmask 255.255.0.0 - + vlan 4: subnet 10.4.0.0 netmask 255.255.0.0 - - + + 2. To list the details for vlan3 - - + + .. code-block:: perl - + lsvlan 3 - - + + Output is similar to: - - + + .. code-block:: perl - + vlan 3 subnet 10.3.0.0 netmask 255.255.0.0 - + hostname ip address node vm host v3n1 10.3.0.1 c68m4hsp06 v3n2 10.3.0.2 x3455n01 v3n3 10.3.0.3 x3650n01 v3n4 10.3.0.4 x3650n01kvm1 x3650n01 v3n5 10.3.0.5 x3650n01kvm2 x3650n01 - - + + From 2a9ab33ae442b24eaf09c6c49c286a624965e884 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0301/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lsvm.1.rst --- .../admin-guides/references/man1/lsvm.1.rst | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsvm.1.rst b/docs/source/guides/admin-guides/references/man1/lsvm.1.rst index ad48cc0af..4b7f5dd20 100644 --- a/docs/source/guides/admin-guides/references/man1/lsvm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsvm.1.rst @@ -19,35 +19,35 @@ SYNOPSIS ******** -\ **lsvm**\ [\ **-h**\ | \ **-**\ **-help]**\ +\ **lsvm**\ [\ **-h**\ | \ **-**\ **-help]**\ \ **lsvm**\ [\ **-v**\ | \ **-**\ **-version**\ ] -\ **lsvm**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ +\ **lsvm**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ -\ **lsvm**\ [\ **-a**\ | \ **-**\ **-all**\ ] \ *noderange*\ +\ **lsvm**\ [\ **-a**\ | \ **-**\ **-all**\ ] \ *noderange*\ For PPC (using Direct FSP Management): ====================================== -\ **lsvm**\ [\ **-l**\ | \ **-**\ **-long**\ ] \ **-**\ **-p775**\ \ *noderange*\ +\ **lsvm**\ [\ **-l**\ | \ **-**\ **-long**\ ] \ **-**\ **-p775**\ \ *noderange*\ -\ **lsvm**\ \ *noderange*\ +\ **lsvm**\ \ *noderange*\ For KVM and VMware ================== -\ **lsvm**\ \ *noderange*\ +\ **lsvm**\ \ *noderange*\ For zVM: ======== -\ **lsvm**\ \ *noderange*\ +\ **lsvm**\ \ *noderange*\ @@ -70,12 +70,12 @@ The pump mode value has the valid options: 1 - Node Pump Mode 2 - Chip Pump Mode -The Memory Interleaving Mode has 3 valid options: +The Memory Interleaving Mode has 3 valid options: 0 - not Applicable 1 - interleaved 2 - non-interleaved -More information about this part, refer to the section Using the \*vm commands to define partitions in xCAT DFM in the doc below. +More information about this part, refer to the section Using the \*vm commands to define partitions in xCAT DFM in the doc below. XCAT_Power_775_Hardware_Management @@ -101,27 +101,27 @@ OPTIONS ******* -\ **-h**\ +\ **-h**\ Display usage message. -\ **-v**\ +\ **-v**\ Command version. -\ **-V**\ +\ **-V**\ Verbose output. -\ **-a**\ +\ **-a**\ List all the profiles for one partition -\ **-**\ **-p775**\ +\ **-**\ **-p775**\ Specify the operation is for Power 775 machines. -\ **-l**\ +\ **-l**\ Show lparnames for lpars. It shall work with option \ **-**\ **-p775**\ . From c73b330fdb2c7579b995ed83b095e66855c54d33 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0302/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst --- .../references/man1/lsxcatd.1.rst | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst b/docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst index 86b95f19b..51a5ecb35 100644 --- a/docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst @@ -36,34 +36,34 @@ OPTIONS -\ **-v|-**\ **-version**\ - +\ **-v|-**\ **-version**\ + Command Version. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-d|-**\ **-database**\ - + +\ **-d|-**\ **-database**\ + Displays information about the current database being used by xCAT. - -\ **-t|-**\ **-nodetype**\ - + +\ **-t|-**\ **-nodetype**\ + Displays whether the node is a Management Node or a Service Node. - -\ **-a|-**\ **-all**\ - + +\ **-a|-**\ **-all**\ + Displays all information about the daemon supported by the command. - + @@ -84,44 +84,44 @@ EXAMPLES 1. - + To display information about the current database: - - + + .. code-block:: perl - + lsxcatd -d - - + + Output is similar to: - - + + .. code-block:: perl - + cfgloc=Pg:dbname=xcatdb;host=7.777.47.250|xcatadm dbengine=Pg dbname=xcatdb dbhost=7.777.47.250 dbadmin=xcatadm - - + + 2. - + To display all information: - - + + .. code-block:: perl - + lsxcatd -a - - + + Output is similar to: - - + + .. code-block:: perl - + Version 2.8.5 (git commit 0d4888af5a7a96ed521cb0e32e2c918a9d13d7cc, built Tue Jul 29 02:22:47 EDT 2014) This is a Management Node cfgloc=mysql:dbname=xcatdb;host=9.114.34.44|xcatadmin @@ -129,8 +129,8 @@ EXAMPLES dbname=xcatdb dbhost=9.114.34.44 dbadmin=xcatadmin - - + + From 9fa528f731875ef12f626c5dede8ce17080054ec Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0303/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/makentp.1.rst --- .../references/man1/makentp.1.rst | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/makentp.1.rst b/docs/source/guides/admin-guides/references/man1/makentp.1.rst index 866d2e20f..3632e838a 100644 --- a/docs/source/guides/admin-guides/references/man1/makentp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/makentp.1.rst @@ -11,11 +11,11 @@ SYNOPSIS ******** -\ **makentp [-h|-**\ **-help]**\ +\ **makentp [-h|-**\ **-help]**\ -\ **makentp [-v|-**\ **-version]**\ +\ **makentp [-v|-**\ **-version]**\ -\ **makentp [-a|-**\ **-all] [-V|-**\ **-verbose]**\ +\ **makentp [-a|-**\ **-all] [-V|-**\ **-verbose]**\ *********** @@ -41,28 +41,28 @@ OPTIONS -\ **-a|-**\ **-all**\ - +\ **-a|-**\ **-all**\ + Setup NTP servers for both management node and the service node. If management node has SLES installed and used as \ *ntpservers*\ , it is recommanded to use the \ **setupntp**\ postscript to set up NTP server for service nodes. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose output. - + @@ -83,23 +83,23 @@ EXAMPLES 1. To setup NTP server on the management node: - - + + .. code-block:: perl - + makentp - - + + 2. To setup NTP servers on both management node and the service node: - - + + .. code-block:: perl - + makentp -a - - + + From 5f9f8caf41774145a955aa670d10eabcdcfffada Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0304/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mkdef.1.rst --- .../admin-guides/references/man1/mkdef.1.rst | 248 +++++++++--------- 1 file changed, 124 insertions(+), 124 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mkdef.1.rst b/docs/source/guides/admin-guides/references/man1/mkdef.1.rst index 066084735..ddc68d3e8 100644 --- a/docs/source/guides/admin-guides/references/man1/mkdef.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkdef.1.rst @@ -38,89 +38,89 @@ OPTIONS -\ *attr=val [attr=val ...]*\ - +\ *attr=val [attr=val ...]*\ + Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. Use the help option to get a list of valid attributes for each object type. - + Note: when creating node object definitions, the 'groups' attribute is required. - -\ **-d|-**\ **-dynamic**\ - + +\ **-d|-**\ **-dynamic**\ + Use the dynamic option to create dynamic node groups. This option must be used with -w option. - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + Use the force option to re-create object definitions. This option removes the old definition before creating the new one. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. (must be the first parameter) See the "noderange" man page for details on supported formats. - -\ **-o**\ \ *object-names*\ - + +\ **-o**\ \ *object-names*\ + A set of comma delimited object names. - -\ **-t**\ \ *object-types*\ - + +\ **-t**\ \ *object-types*\ + A set of comma delimited object types. Use the help option to get a list of valid object types. - -\ **-**\ **-template**\ \ *template-object-name*\ - + +\ **-**\ **-template**\ \ *template-object-name*\ + Name of the xCAT shipped object definition template or an existing object, from which the new object definition will be created. The newly created object will inherit the attributes of the template definition unless the attribute is specified in the arguments of \ **mkdef**\ command. If there are a template and an existing object with the same name \ *template-object-name*\ , the template object takes precedence over the existing object. For the details of xCAT shipped object definition templates, refer to the manpage of \ **-**\ **-template**\ option in lsdef(1)|lsdef.1. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - + \ **-w**\ \ *attr==val*\ \ **-w**\ \ *attr=~val*\ ... - + Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. For mkdef command, the -w flag only makes sense for creating dynamic node group. Use the help option to get a list of valid attributes for each object type. - + Operator descriptions: == Select nodes where the attribute value is exactly this value. != Select nodes where the attribute value is not this specific value. =~ Select nodes where the attribute value matches this regular expression. !~ Select nodes where the attribute value does not match this regular expression. - + Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attrval" needs to be quoted. If the operator is "!~", the "attrval" needs to be quoted using single quote. - -\ **-z|-**\ **-stanza**\ - + +\ **-z|-**\ **-stanza**\ + Indicates that the file being piped to the command is in stanza format. See the xcatstanzafile man page for details on using xCAT stanza files. - -\ **-u**\ - + +\ **-u**\ + Fill in the attributes such as template file, pkglist file and otherpkglist file of osimage object based on the specified parameters. It will search "/install/custom/" directory first, and then "/opt/xcat/share/". The \ *provmethod*\ and \ *profile*\ must be specified. If \ *osvers*\ or \ *osarch*\ is not specified, the corresponding value of the management node will be used. - + Note: this option only works for objtype \ **osimage**\ . - + @@ -141,173 +141,173 @@ EXAMPLES 1. - + To create a site definition. - - + + .. code-block:: perl - + mkdef -t site -o clustersite installdir=/xcatinstall - - + + 2. - + To create a basic node definition. - - + + .. code-block:: perl - + mkdef -t node -o node01 groups="all,aix" - - + + 3. - + To re-create the current definition of "node01". - - + + .. code-block:: perl - + mkdef -f -t node -o node01 nodetype=osi groups="linux" - - + + (The group definitions are also created if they don't already exist.) - + 4. - + To create a set of different types of definitions based on information contained in a stanza file. - - + + .. code-block:: perl - + cat defstanzafile | mkdef -z - - + + 5. - + To create a group definition called LinuxNodes containing the nodes clstrn01 and clstrn02. - - + + .. code-block:: perl - + mkdef -t group -o LinuxNodes members="clstrn01,clstrn02" - - + + 6. - + To create a node definition for an FSP node using the attributes provided by the group fspnodes. - - + + .. code-block:: perl - + mkdef -t node fspn1 groups=fspnodes nodetype=fsp - - + + 7. - + To create node definitions for a set of node host names contained in the node range "node1,node2,node3" - - + + .. code-block:: perl - + mkdef -t node node1,node2,node3 power=hmc groups="all,aix" - - + + 8. - + To create a dynamic node group definition called HMCMgtNodes containing all the HMC managed nodes" - - + + .. code-block:: perl - + mkdef -t group -o HMCMgtNodes -d -w mgt==hmc -w cons==hmc - - + + 9. - + To create a dynamic node group definition called SLESNodes containing all the SLES nodes - - + + .. code-block:: perl - + mkdef -t group -o SLESNodes -d -w "os=~^sles[0-9]+$" - - + + 10. - + To create a entry (7.0) in the policy table for user admin1 - - + + .. code-block:: perl - + mkdef -t policy -o 7.0 name=admin1 rule=allow - - + + 11. - + To create a node definition with nic attributes - - + + .. code-block:: perl - + mkdef -t node cn1 groups=all nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet" - - + + 12. - + To create an osimage definition and fill in attributes automatically. - - + + .. code-block:: perl - + mkdef redhat6img -u profile=compute provmethod=statelite - - + + 13. - + To create a PowerLE kvm node definition with the xCAT shipped template "ppc64lekvmguest-template". - - + + .. code-block:: perl - + mkdef -t node cn1 --template ppc64lekvmguest-template ip=1.1.1.1 mac=42:3d:0a:05:27:0b vmhost=1.1.0.1 vmnics=br0 - - + + 14. - + To create a node definition from an existing node definition "cn1" - - + + .. code-block:: perl - + mkdef -t node cn2 --template cn1 ip=1.1.1.2 mac=42:3d:0a:05:27:0c - - + + From b554849c67d2c5774158714c76a0572db3f5ea46 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0305/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mkdocker.1.rst --- .../references/man1/mkdocker.1.rst | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mkdocker.1.rst b/docs/source/guides/admin-guides/references/man1/mkdocker.1.rst index f1e2d2e47..808b1eda9 100644 --- a/docs/source/guides/admin-guides/references/man1/mkdocker.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkdocker.1.rst @@ -40,79 +40,79 @@ OPTIONS -\ **image**\ - +\ **image**\ + The docker image name that the instance will use. - -\ **command**\ - + +\ **command**\ + The command that the instance will run based on the \ **image**\ specified. The \ **image**\ option must be specified in order to use this option. - -\ **dockerflag**\ - + +\ **dockerflag**\ + A JSON string which will be used as parameters to create a docker. Reference https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/ for more information about which parameters can be specified. - + Some useful flags are: - - - \ **AttachStdin**\ =\ **true | false**\ - + + + \ **AttachStdin**\ =\ **true | false**\ + Whether attaches to stdin. - - - - \ **AttachStdout**\ =\ **true | false**\ - + + + + \ **AttachStdout**\ =\ **true | false**\ + Whether attaches to stdout. - - - - \ **AttachStderr**\ =\ **true | false**\ - + + + + \ **AttachStderr**\ =\ **true | false**\ + Whether attaches to stderr. - - - - \ **OpenStdin**\ =\ **true | false**\ - + + + + \ **OpenStdin**\ =\ **true | false**\ + Whether opens stdin. - - - - \ **Tty**\ =\ **true | false**\ - + + + + \ **Tty**\ =\ **true | false**\ + Attach standard streams to a tty, including stdin if it is not closed. - - - - \ **ExposedPorts**\ - + + + + \ **ExposedPorts**\ + An object mapping ports to an empty object in the form of: - - + + .. code-block:: perl - + "ExposedPorts": { "/\: {}" } - - - - - \ **HostConfig: {"Binds"}**\ - + + + + + \ **HostConfig: {"Binds"}**\ + A list of volume bindings for this docker instance, the form will be: - - + + .. code-block:: perl - + "HostConfig": {"Binds":[":"]} - - - - + + + + From 76a8b4c08714542376ea4ca2485931a4f533a283 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0306/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst --- .../references/man1/mkdsklsnode.1.rst | 188 +++++++++--------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst b/docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst index 6968e6039..35eda685e 100644 --- a/docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **mkdsklsnode [-h|-**\ **-help ]**\ +\ **mkdsklsnode [-h|-**\ **-help ]**\ \ **mkdsklsnode [-V|-**\ **-verbose] [-f|-**\ **-force] [-n|-**\ **-newname] [-i**\ \ *osimage_name*\ ] [\ **-l**\ \ *location*\ ] [\ **-u | -**\ **-updateSN**\ ] [\ **-k | -**\ **-skipsync**\ ] [\ **-p | -**\ **-primarySN**\ ] [\ **-b | -**\ **-backupSN**\ ] [\ **-S | -**\ **-setuphanfs**\ ] \ *noderange*\ [\ *attr=val [attr=val ...]*\ ] @@ -37,7 +37,7 @@ This command will also create a NIM resolv_conf resource to be used when install The "domain" and "nameservers" attributes can be set in either the xCAT "network" definition used by the nodes or in the xCAT cluster "site" definition. The setting in the "network" definition will take priority. -The "search" field of the resolv.conf file will contain a list all the domains +The "search" field of the resolv.conf file will contain a list all the domains listed in the xCAT network definitions and the xCAT site definition. The "nameservers" value can either be set to a specific IP address or the "" key word. The "" key word means that the value of the "xcatmaster" attribute of the node definition will be used in the /etc/resolv.conf file. (I.e. The name of the install server as known by the node.) @@ -70,46 +70,46 @@ OPTIONS -\ *attr=val [attr=val ...]*\ - +\ *attr=val [attr=val ...]*\ + Specifies one or more "attribute equals value" pairs, separated by spaces. Attr= val pairs must be specified last on the command line. These are used to specify additional values that can be passed to the underlying NIM commands. - + Valid values: - - - \ **duplex**\ - + + + \ **duplex**\ + Specifies the duplex setting (optional). Used when defining the NIM machine. Use this setting to configure the client's network interface. This value can be full or half. The default is full. (ex. "duplex=full") - - - - \ **speed**\ - + + + + \ **speed**\ + Specifies the speed setting (optional). Used when defining the NIM machine. This is the communication speed to use when configuring the client's network interface. This value can be 10, 100, or 1000. The default is 100. (ex. "speed=100") - - - - \ **psize**\ - + + + + \ **psize**\ + Specifies the size in Megabytes of the paging space for the diskless node.(optional) Used when initializing the NIM machine. The minimum and default size is 64 MB of paging space. (ex. "psize=256") - - - - \ **sparse_paging**\ - + + + + \ **sparse_paging**\ + Specifies that the paging file should be created as an AIX sparse file, (ex. "sparse_paging=yes"). The default is "no". - - - - \ **dump_iscsi_port**\ - + + + + \ **dump_iscsi_port**\ + The tcpip port number to use to communicate dump images from the client to the dump resource server. Normally set by default. This port number is used by a dump resource server. - - - - \ **configdump**\ - + + + + \ **configdump**\ + Specifies the type dump to be collected from the client. The values are "selective", "full", and "none". If the configdump attribute is set to "full" or "selective" the client will automatically be configured to dump to an iSCSI @@ -118,81 +118,81 @@ OPTIONS and full memory dumps will be stored in subdirectory of the dump resource allocated to the client. This attribute is saved in the xCAT osimage definition. - - - -\ **-b |-**\ **-backupSN**\ - + + + +\ **-b |-**\ **-backupSN**\ + When using backup service nodes only update the backup. The default is to update both the primary and backup service nodes. - -\ **-f |-**\ **-force**\ - + +\ **-f |-**\ **-force**\ + Use the force option to reinitialize the NIM machines. - -\ **-h |-**\ **-help**\ - + +\ **-h |-**\ **-help**\ + Display usage message. - -\ **-i**\ \ *image_name*\ - + +\ **-i**\ \ *image_name*\ + The name of an existing xCAT osimage definition. If this information is not provided on the command line the code checks the node definition for the value of the "provmethod" attribute. If the "-i" value is provided on the command line then that value will be used to set the "provmethod" attribute of the node definitions. - -\ **-k|-**\ **-skipsync**\ - + +\ **-k|-**\ **-skipsync**\ + Use this option to have the mkdsklsnode command skip the NIM sync_roots operation. This option should only be used if you are certain that the shared_root resource does not have to be updated from the SPOT. Normally, when the SPOT is updated, you should do a sync_roots on the shared_root resource. - -\ **-l|-**\ **-location**\ - + +\ **-l|-**\ **-location**\ + The directory location to use when creating new NIM resolv_conf resources. The default location is /install/nim. - -\ **-n|-**\ **-newname**\ - + +\ **-n|-**\ **-newname**\ + Create a new NIM machine object name for the xCAT node. Use the naming convention "_" for the new NIM machine definition. - -\ **-p|-**\ **-primarySN**\ - + +\ **-p|-**\ **-primarySN**\ + When using backup service nodes only update the primary. The default is to update both the primary and backup service nodes. - -\ **-S|-**\ **-setuphanfs**\ - + +\ **-S|-**\ **-setuphanfs**\ + Setup NFSv4 replication between the primary service nodes and backup service nodes to provide high availability NFS for the compute nodes. This option only exports the /install directory with NFSv4 replication settings, the data synchronization between the primary service nodes and backup service nodes needs to be taken care of through some mechanism. - -\ **-u|-**\ **-updateSN**\ - + +\ **-u|-**\ **-updateSN**\ + Use this option if you wish to update the osimages but do not want to define or initialize the NIM client definitions. This option is only valid when the xCAT "site" definition attribute "sharedinstall" is set to either "sns" or "all". - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats. - -\ **-V |-**\ **-verbose**\ - + +\ **-V |-**\ **-verbose**\ + Verbose mode. - + @@ -218,45 +218,45 @@ EXAMPLES 1. Initialize an xCAT node named "node01" as an AIX diskless machine. The xCAT osimage named "61spot" should be used to boot the node. - - + + .. code-block:: perl - + mkdsklsnode -i 61spot node01 - - + + 2. Initialize all AIX diskless nodes contained in the xCAT node group called "aixnodes" using the image definitions pointed to by the "provmethod" attribute of the xCAT node definitions. - - + + .. code-block:: perl - + mkdsklsnode aixnodes - - + + 3. Initialize diskless node "clstrn29" using the xCAT osimage called "61dskls". Also set the paging size to be 128M and specify the paging file be an AIX sparse file. - - + + .. code-block:: perl - + mkdsklsnode -i 61dskls clstrn29 psize=128 sparse_paging=yes - - + + 4. - + Initialize an xCAT node called "node02" as an AIX diskless node. Create a new NIM machine definition name with the osimage as an extension to the xCAT node name. - - + + .. code-block:: perl - + mkdsklsnode -n -i 61spot node02 - - + + From b0352093a9407bfe71b6299c7f98f365de2ffee9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0307/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst --- .../references/man1/mkflexnode.1.rst | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst b/docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst index 853e34221..159d42042 100644 --- a/docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst @@ -23,7 +23,7 @@ SYNOPSIS \ **mkflexnode**\ [\ **-v**\ | \ **-**\ **-version**\ ] -\ **mkflexnode**\ \ *noderange*\ +\ **mkflexnode**\ \ *noderange*\ *********** @@ -48,16 +48,16 @@ OPTIONS -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Display the usage message. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display the version information. - + @@ -68,15 +68,15 @@ EXAMPLES 1. Create a flexible node base on the xCAT node blade1. - + The blade1 should belong to a complex, the \ *id*\ attribute should be set correctly and all the slots should be in \ **power off**\ state. - - + + .. code-block:: perl - + mkflexnode blade1 - - + + From e69bdf77f882b42dc1932410d93d9f2fbea15e16 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0308/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst --- .../references/man1/mkhwconn.1.rst | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst b/docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst index 87ece91f7..c8fe55adf 100644 --- a/docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst @@ -77,53 +77,53 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-t**\ - + +\ **-t**\ + Read connection information from xCAT DB (ppc and ppcdirect tables). Use this option if you need to connect multiple CECs/Frames to multiple HMCs in a single command. - -\ **-p**\ - + +\ **-p**\ + The HMC node name. Only one HMC nodes can be specified by this flag. To setup connection for multiple HMC nodes, use flag \ **-t**\ . - -\ **-P**\ - + +\ **-P**\ + The password of HMC based CEC/Frame login user(Default user name is 'HMC'). This flag is optional. - -\ **-T**\ - + +\ **-T**\ + The tooltype is used to communicate to the CEC/Frame. The value could be \ **lpar**\ or \ **fnm**\ . The tooltype value \ **lpar**\ is for xCAT and \ **fnm**\ is for CNM. The default value is "\ **lpar**\ ". - -\ **-**\ **-port**\ - + +\ **-**\ **-port**\ + The port value specifies which special side will be used to create the connection to the CEC/Frame. The value could only be specified as "\ **0**\ " or "\ **1**\ " and the default value is "\ **0,1**\ ". If the user wants to use all ports to create the connection, he should not specify this value. If the port value is specified as "\ **0**\ ", in the vpd table, the side column should be \ **A-0**\ and \ **B-0**\ ; If the port value is specified as "\ **1**\ ", the side column should be \ **A-1**\ and \ **B-1**\ . When making hardware connection between CEC/Frame and HMC, the value is used to specify the fsp/bpa port of the cec/frame and will be organized in order of "\ **A-0,A-1,B-0,B-1**\ ". If any side does not exist, the side would simply be ignored. Generally, only one port of a fsp/bap can be connected while another port be used as backup. - -\ **-s**\ - + +\ **-s**\ + The flag -s is used to make the connection between the frame and its Service Focal Point(HMC). -s flag is not supposed to work with other functional flags. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose output. - + @@ -144,63 +144,63 @@ EXAMPLES 1. - + To setup the connection for all CEC nodes in node group cec to HMC node, according to the definition in xCAT DB: - - + + .. code-block:: perl - + mkhwconn cec -t - - + + 2. - + To setup the connection for Frame nodes in node group frame to HMC node hmc1, with password 'abc123': - - + + .. code-block:: perl - + mkhwconn frame -p hmc1 -P abc123 - - + + 3. - + To setup the connections for all CEC nodes in node group cec to hardware server, and the tooltype value is lpar: - - + + .. code-block:: perl - + mkhwconn cec -t -T lpar - - + + 4. - + To setup the connections for all cecs nodes in node group cec to hardware server, and the tooltype value is lpar, and the port value is 1: - - + + .. code-block:: perl - + mkhwconn cec -t -T lpar --port 1 - - + + 5. - + To setup the connection between the frame and it's SFP node. This command will also set the connections between the CECs within this frame and their SFP node. User need to define HMC_name in the database in advance, but no need to set the sfp attribute for these node, xCAT will set the HMC_name as ppc.sfp for these nodes. The CECs within this frame should have the same sfp attribute as the frame. - - + + .. code-block:: perl - + mkhwconn cec -s HMC_name -P HMC_passwd - - + + From b979b92827b76dbea1a34f851b7e0ead1ab1368b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0309/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mknimimage.1.rst --- .../references/man1/mknimimage.1.rst | 370 +++++++++--------- 1 file changed, 185 insertions(+), 185 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mknimimage.1.rst b/docs/source/guides/admin-guides/references/man1/mknimimage.1.rst index 1d2985946..5428ec80e 100644 --- a/docs/source/guides/admin-guides/references/man1/mknimimage.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mknimimage.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **mknimimage [-h | -**\ **-help ]**\ +\ **mknimimage [-h | -**\ **-help ]**\ \ **mknimimage [-V] -u**\ \ *osimage_name [attr=val [attr=val ...]*\ ] @@ -39,13 +39,13 @@ The naming convention for the NIM SPOT resource definition is to use the same na When creating a mksysb image definition you must specify either the "-n" or the "-b" option. The "-n" option can be used to create a mksysb image from an existing NIM client machine. The "-b" option can be used to specify an existing mksysb backup file. -\ **Adding software and configuration files to the osimage.**\ +\ **Adding software and configuration files to the osimage.**\ When creating a diskless osimage definition you also have the option of automatically updating the NIM SPOT resource. You can have additional software installed or you can have configuration files added or updated. To have software installed you must provide either the names of NIM installp_bundle resources or fileset names on the command line using the "attr=val" option. You may also supply the installp flags, RPM flags, emgr flags to use when installing the software. To have configuration files updated you must provide the full path name of a "synclists" file which contains the list of actual files to update. The xCAT osimage definition that is created will contain the installp_bundle, otherpkgs, and synclists files that are provided on the command line. -\ **Updating an existing xCAT osimage**\ +\ **Updating an existing xCAT osimage**\ If you wish to update an existing diskless image after it has already been created you can use the "-u" (update) option. In this case the xCAT osimage definition will not be updated. @@ -57,7 +57,7 @@ Or, you could do a more ad hoc update by providing one or more of the "installp_ WARNING: Installing random RPM packages in a SPOT may have unpredictable consequences. The SPOT is a very restricted environment and some RPM packages may corrupt the SPOT or even hang your management system. Try to be very careful about the packages you install. When installing RPMs, if the mknimimage command hangs or if there are file systems left mounted after the command completes you may need to reboot your management node to recover. This is a limitation of the current AIX support for diskless systems -\ **Copying an xCAT osimage.**\ +\ **Copying an xCAT osimage.**\ You can use the "-i" and "-p" options to copy an existing diskless osimage. To do this you must supply the name of an existing xCAT osimage definition and the name of the new osimage you wish to create. The \ **mknimimage**\ command will do the following: @@ -71,7 +71,7 @@ You can use the "-i" and "-p" options to copy an existing diskless osimage. To - if the "-p" option is specified then the original NIM lpp_source resource will be copied to a new location and redefined to NIM. (The default would be to use the original lpp_source - to save file system space.) -\ **Additional information**\ +\ **Additional information**\ IMPORTANT: The NIM lpp_source and SPOT resources can get quite large. Always make sure that you have sufficient file system space available before running the \ **mknimimage**\ command. @@ -94,265 +94,265 @@ OPTIONS -\ *attr=val [attr=val ...]*\ - +\ *attr=val [attr=val ...]*\ + Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. - + Currently supported attributes: - - - \ **bosinst_data**\ - + + + \ **bosinst_data**\ + The name of a NIM bosinst_data resource. - - - - \ **dump**\ - + + + + \ **dump**\ + The name of the NIM dump resource. - - - - \ **fb_script**\ - + + + + \ **fb_script**\ + The name of a NIM fb_script resource. - - - - \ **home**\ - + + + + \ **home**\ + The name of the NIM home resource. - - - - \ **installp_bundle**\ - + + + + \ **installp_bundle**\ + One or more comma separated NIM installp_bundle resources. - - - - \ **lpp_source**\ - + + + + \ **lpp_source**\ + The name of the NIM lpp_source resource. - - - - \ **mksysb**\ - + + + + \ **mksysb**\ + The name of a NIM mksysb resource. - - - - \ **otherpkgs**\ - + + + + \ **otherpkgs**\ + One or more comma separated installp, emgr, or rpm packages. The packages must have prefixes of 'I:', 'E:', or 'R:', respectively. (ex. R:foo.rpm) - - - - \ **paging**\ - + + + + \ **paging**\ + The name of the NIM paging resource. - - - - \ **resolv_conf**\ - + + + + \ **resolv_conf**\ + The name of the NIM resolv_conf resource. - - - - \ **root**\ - + + + + \ **root**\ + The name of the NIM root resource. - - - - \ **script**\ - + + + + \ **script**\ + The name of a NIM script resource. - - - - \ **shared_home**\ - + + + + \ **shared_home**\ + The name of the NIM shared_home resource. - - - - \ **shared_root**\ - + + + + \ **shared_root**\ + A shared_root resource represents a directory that can be used as a / (root) directory by one or more diskless clients. - - - - \ **spot**\ - + + + + \ **spot**\ + The name of the NIM SPOT resource. - - - - \ **synclists**\ - + + + + \ **synclists**\ + The fully qualified name of a file containing a list of files to synchronize on the nodes. - - - - \ **tmp**\ - + + + + \ **tmp**\ + The name of the NIM tmp resource. - - - - \ **installp_flags**\ - + + + + \ **installp_flags**\ + The alternate flags to be passed along to the AIX installp command. (The default for installp_flags is "-abgQXY".) - - - - \ **rpm_flags**\ - + + + + \ **rpm_flags**\ + The alternate flags to be passed along to the AIX rpm command. (The default for - rpm_flags is "-Uvh ".) The mknimimage command will check each rpm to see if + rpm_flags is "-Uvh ".) The mknimimage command will check each rpm to see if it is installed. It will not be reinstalled unless you specify the appropriate rpm option, such as '--replacepkgs'. - - - - \ **emgr_flags**\ - + + + + \ **emgr_flags**\ + The alternate flags to be passed along to the AIX emgr command. (There is no default flags for the emgr command.) - - - - \ **dumpsize**\ - + + + + \ **dumpsize**\ + The maximum size for a single dump image the dump resource will accept. Space is not allocated until a client starts to dump. The default size is 50GB. The dump resource should be large enough to hold the expected AIX dump and snap data. - - - - \ **max_dumps**\ - + + + + \ **max_dumps**\ + The maximum number of archived dumps for an individual client. The default is one. - - - - \ **snapcollect**\ - + + + + \ **snapcollect**\ + Indicates that after a dump is collected then snap data should be collected. The snap data will be collected in the clients dump resource directory. Values are "yes" or "no". The default is "no". - - - - \ **nfs_vers**\ - + + + + \ **nfs_vers**\ + Value Specifies the NFS protocol version required for NFS access. - - - - \ **nfs_sec**\ - + + + + \ **nfs_sec**\ + Value Specifies the security method required for NFS access. - - - + + + Note that you may specify multiple "script", "otherpkgs", and "installp_bundle" resources by using a comma separated list. (ex. "script=ascript,bscript"). RPM names may be included in the "otherpkgs" list by using a "R:" prefix(ex. "R:whatever.rpm"). epkg (AIX interim fix package) file names may be included in the "otherpkgs" using the 'E:' prefix. (ex. "otherpkgs=E:IZ38930TL0.120304.epkg.Z"). - -\ **-b**\ \ *mksysbfile*\ - + +\ **-b**\ \ *mksysbfile*\ + Used to specify the path name of a mksysb file to use when defining a NIM mksysb resource. - -\ **-c|-**\ **-completeosimage**\ - + +\ **-c|-**\ **-completeosimage**\ + Complete the creation of the osimage definition passed in on the command line. This option will use any additional values passed in on the command line and/or it will attempt to create required resources in order to complete the definition of the xCAT osimage. For example, if the osimage definition is missing a spot or shared_root resource the command will create those resources and add them to the osimage definition. - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + Use the force option to re-create xCAT osimage definition. This option removes the old definition before creating the new one. It does not remove any of the NIM resource definitions named in the osimage definition. Use the \ **rmnimimage**\ command to remove the NIM resources associated with an xCAT osimage definition. - -\ **-h |-**\ **-help**\ - + +\ **-h |-**\ **-help**\ + Display usage message. - -\ *osimage_name*\ - + +\ *osimage_name*\ + The name of the xCAT osimage definition. This will be used as the name of the xCAT osimage definition as well as the name of the NIM SPOT resource. - -\ **-D|-**\ **-mkdumpres**\ - + +\ **-D|-**\ **-mkdumpres**\ + Create a diskless dump resource. - -\ **-i**\ \ *current_image*\ - + +\ **-i**\ \ *current_image*\ + The name of an existing xCAT osimage that should be copied to make a new xCAT osimage definition. Only valid when defining a "diskless" or "dataless" type image. - -\ **-l**\ \ *location*\ - + +\ **-l**\ \ *location*\ + The directory location to use when creating new NIM resources. The default location is /install/nim. - -\ **-m**\ \ *nimmethod*\ - + +\ **-m**\ \ *nimmethod*\ + Used to specify the NIM installation method to use. The possible values are "rte" and "mksysb". The default is "rte". - -\ **-n**\ \ *mksysbnode*\ - + +\ **-n**\ \ *mksysbnode*\ + The xCAT node to use to create a mksysb image. The node must be a defined as a NIM client machine. - -\ **-p|-**\ **-cplpp**\ - + +\ **-p|-**\ **-cplpp**\ + Use this option when copying existing diskless osimages to indicate that you also wish to have the lpp_resource copied. This option is only valid when using the "-i" option. - -\ **-r|-**\ **-sharedroot**\ - + +\ **-r|-**\ **-sharedroot**\ + Use this option to specify that a NIM "shared_root" resource be created for the AIX diskless nodes. The default is to create a NIM "root" resource. This feature is only available when using AIX version 6.1.4 or beyond. See the AIX/NIM documentation for a description of the "root" and "shared_root" resources. - -\ **-s**\ \ *image_source*\ - + +\ **-s**\ \ *image_source*\ + The source of software to use when creating the new NIM lpp_source resource. This could be a source directory or a previously defined NIM lpp_source resource name. - -\ **-t nimtype**\ - + +\ **-t nimtype**\ + Used to specify the NIM machine type. The possible values are "standalone", "diskless" or "dataless". The default is "standalone". - -\ **-u**\ - + +\ **-u**\ + Used to update an AIX/NIM SPOT resource with additional software and configuration files. This option is only valid for xCAT diskless osimage objects. The SPOT resource associated with the xCAT osimage definition will be updated. This option can also be used to update the nfs_vers attribute from NFSv3 to NFSv4 for the NIM resources associated with diskful or diskless image. - -\ **-V |-**\ **-verbose**\ - + +\ **-V |-**\ **-verbose**\ + Verbose mode. - + From 991fdc853169d27723b75ec547b10e3bbca37398 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0310/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mkvlan.1.rst --- .../admin-guides/references/man1/mkvlan.1.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mkvlan.1.rst b/docs/source/guides/admin-guides/references/man1/mkvlan.1.rst index e97321fbe..7bf761def 100644 --- a/docs/source/guides/admin-guides/references/man1/mkvlan.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkvlan.1.rst @@ -147,65 +147,65 @@ The following is an example of the switches table 1. - + To make a private vlan for node1, node2 and node3 - - + + .. code-block:: perl - + mkvlan -n node1,node2,node3 - - + + The vlan will be created on eth0 for the nodes. - + 2. - + To make a private vlan for node1, node2 and node3 on eth1, - - + + .. code-block:: perl - + mkvlan -n node1,node2,node3 -i eth1 - - + + 3. - + To make a private vlan for node1, node2 with given subnet and netmask. - - + + .. code-block:: perl - + mkvlan -n node1,node2,node3 -t 10.3.2.0 -m 255.255.255.0 - - + + 4. - + To make a private vlan for KVM guests node1 and node2 - - + + .. code-block:: perl - + chtab key=usexhrm site.vlaue=1 - + mkdef node1 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms - + mkdef node2 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms - - mkvlan -n node1,node2 - + + mkvlan -n node1,node2 + mkvm node1,node2 -s 20G - + rpower node1,node2 on - + rinstall node1,node2 - - + + From a952869df7676439b9bde9d40d3da1df5e1c84bd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0311/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mkvm.1.rst --- .../admin-guides/references/man1/mkvm.1.rst | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mkvm.1.rst b/docs/source/guides/admin-guides/references/man1/mkvm.1.rst index effaaa109..862686779 100644 --- a/docs/source/guides/admin-guides/references/man1/mkvm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkvm.1.rst @@ -32,11 +32,11 @@ For PPC (with HMC) specific: ============================ -\ **mkvm**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ \ **-i**\ \ *id*\ \ **-l**\ \ *singlenode*\ +\ **mkvm**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ \ **-i**\ \ *id*\ \ **-l**\ \ *singlenode*\ -\ **mkvm**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ \ **-c**\ \ *destcec*\ \ **-p**\ \ *profile*\ +\ **mkvm**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ \ **-c**\ \ *destcec*\ \ **-p**\ \ *profile*\ -\ **mkvm**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ \ **-**\ **-full**\ +\ **mkvm**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ \ **-**\ **-full**\ For PPC (using Direct FSP Management) specific: @@ -122,84 +122,84 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-c**\ - + +\ **-c**\ + The cec (fsp) name for the destination. - -\ **-**\ **-cpus**\ - + +\ **-**\ **-cpus**\ + The cpu count which will be created for the kvm/vmware virtual machine. - -\ **-**\ **-full**\ - + +\ **-**\ **-full**\ + Request to create a new full system partition for each CEC. - + \ **vmcpus=**\ \ *value*\ \ **vmmemory=**\ \ *value*\ \ **vmphyslots=**\ \ *value*\ \ **vmothersetting=**\ \ *value*\ \ **vmnics=**\ \ *value*\ \ **vmstorage=**\ \ *value*\ [\ **-**\ **-vios**\ ] - + To specify the parameters which are used to create a partition. The \ *vmcpus*\ , \ *vmmemory*\ are necessary, and the value specified with this command have a more high priority. If the value of any of the three options is not specified, the corresponding value specified for the node object will be used. If any of the three attributes is neither specified with this command nor specified with the node object, error information will be returned. To reference to lsvm(1)|lsvm.1 for more information about 'drc_index' for \ *vmphyslots*\ . - + The option \ *vios*\ is used to specify the partition that will be created is a VIOS partition. If specified, the value for \ *vmstorage*\ shall be number which indicate the number of vSCSI server adapter will be created, and if no value specified for \ *vmphyslots*\ , all the physical slot of the power machine will be asigned to VIOS partition. If not specified, it shall be in form of \ *vios_name:server_slotid*\ to specify the vios and the virtual slot id of the vSCSI server adapter that will be connected from the Logical partition. - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + If the storage already exists, remove it before creating a new virtual machine. - -\ **-i**\ - + +\ **-i**\ + Starting numeric id of the newly created partitions. - -\ **-l**\ - + +\ **-l**\ + The partition name of the source. - -\ **-**\ **-mem**\ - + +\ **-**\ **-mem**\ + The memory size which will be used for the new created kvm/vmware virtual machine. Unit is Megabyte. - -\ **-p**\ - + +\ **-p**\ + The file that contains the profiles for the source partitions. - -\ **-s|-**\ **-size**\ - + +\ **-s|-**\ **-size**\ + The size of storage which will be created for the kvm/vmware virtual machine. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose output. - + From 47fac6b0147af8917ade0cdb5059ee655d94ba80 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0312/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mkzone.1.rst --- .../admin-guides/references/man1/mkzone.1.rst | 140 +++++++++--------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mkzone.1.rst b/docs/source/guides/admin-guides/references/man1/mkzone.1.rst index 3e8b8f5f4..fa7ce76c9 100644 --- a/docs/source/guides/admin-guides/references/man1/mkzone.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkzone.1.rst @@ -7,7 +7,7 @@ mkzone.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,7 +15,7 @@ mkzone.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** @@ -25,162 +25,162 @@ mkzone.1 ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* The \ **mkzone**\ command is designed to divide the xCAT cluster into multiple zones. The nodes in each zone will share common root ssh keys. This allows the nodes in a zone to be able to as root ssh to each other without password, but cannot do the same to any node in another zone. All zones share a common xCAT Management Node and database including the site table, which defines the attributes of the entire cluster. The mkzone command is only supported on Linux ( No AIX support). -The nodes are not updated with the new root ssh keys by mkzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. +The nodes are not updated with the new root ssh keys by mkzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. *************** -\ **OPTIONS**\ +\ **OPTIONS**\ *************** -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Displays usage information. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Displays command version and build date. - -\ **-k | -**\ **-sshkeypath**\ \ *full path to the ssh RSA private key*\ - + +\ **-k | -**\ **-sshkeypath**\ \ *full path to the ssh RSA private key*\ + This is the path to the id_rsa key that will be used to build root's ssh keys for the zone. If -k is used, it will generate the ssh public key from the input ssh RSA private key and store both in /etc/xcat/sshkeys//.ssh directory. If -f is not used, then it will generate a set of root ssh keys for the zone and store them in /etc/xcat/sshkeys//.ssh. - -\ **-**\ **-default**\ - + +\ **-**\ **-default**\ + if --defaultzone is input, then it will set the zone defaultzone attribute to yes; otherwise it will set to no. if --defaultzone is input and another zone is currently the default, then the -f flag must be used to force a change to the new defaultzone. - If -f flag is not use an error will be returned and no change made. + If -f flag is not use an error will be returned and no change made. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. - -\ **-a | -**\ **-addnoderange**\ \ *noderange*\ - + +\ **-a | -**\ **-addnoderange**\ \ *noderange*\ + For each node in the noderange, it will set the zonename attribute for that node to the input zonename. If the -g flag is also on the command, then it will add the group name "zonename" to each node in the noderange. - -\ **-s| -**\ **-sshbetweennodes**\ \ **yes|no**\ - + +\ **-s| -**\ **-sshbetweennodes**\ \ **yes|no**\ + If -s entered, the zone sshbetweennodes attribute will be set to yes or no. It defaults to yes. When this is set to yes, then ssh will be setup to allow passwordless root access between nodes. If no, then root will be prompted for a password when running ssh between the nodes in the zone. - -\ **-f | -**\ **-force**\ - + +\ **-f | -**\ **-force**\ + Used with the (--defaultzone) flag to override the current default zone. - -\ **-g | -**\ **-assigngroup**\ - + +\ **-g | -**\ **-assigngroup**\ + Used with the (-a) flag to create the group zonename for all nodes in the input noderange. - -\ **-V | -**\ **-Verbose**\ - + +\ **-V | -**\ **-Verbose**\ + Verbose mode. - + **************** -\ **EXAMPLES**\ +\ **EXAMPLES**\ **************** 1. To make a new zone1 using defaults, enter: - - + + .. code-block:: perl - + mkzone zone1 - - + + Note: with the first \ **mkzone**\ , you will automatically get the xcatdefault zone created as the default zone. This zone uses ssh keys from /.ssh directory. - + 2. To make a new zone2 using defaults and make it the default zone enter: - - + + .. code-block:: perl - + mkzone> zone2 --defaultzone -f - - + + 3. - + To make a new zone2A using the ssh id_rsa private key in /root/.ssh: - - + + .. code-block:: perl - + mkzone zone2A -k /root/.ssh - - + + 4. - + To make a new zone3 and assign the noderange compute3 to the zone enter: - - + + .. code-block:: perl - + mkzone zone3 -a compute3 - - + + 5. To make a new zone4 and assign the noderange compute4 to the zone and add zone4 as a group to each node enter: - - + + .. code-block:: perl - + mkzone zone4 -a compute4 -g - - + + 6. - + To make a new zone5 and assign the noderange compute5 to the zone and add zone5 as a group to each node but not allow passwordless ssh between the nodes enter: - - + + .. code-block:: perl - + mkzone zone5 -a compute5 -g -s no - - + + ************* -\ **Files**\ +\ **Files**\ ************* @@ -190,7 +190,7 @@ Location of the mkzone command. **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From 92bc29fd86831d081b5ee3d36929242b41d291de Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0313/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/monadd.1.rst --- .../admin-guides/references/man1/monadd.1.rst | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/monadd.1.rst b/docs/source/guides/admin-guides/references/man1/monadd.1.rst index bb8f629e8..5e9f0f5cd 100644 --- a/docs/source/guides/admin-guides/references/man1/monadd.1.rst +++ b/docs/source/guides/admin-guides/references/man1/monadd.1.rst @@ -19,11 +19,11 @@ SYNOPSIS ******** -\ **monadd [-h| -**\ **-help]**\ +\ **monadd [-h| -**\ **-help]**\ -\ **monadd [-v| -**\ **-version]**\ +\ **monadd [-v| -**\ **-version]**\ -\ **monadd name [-n|-**\ **-nodestatmon] [-s|-**\ **-settings**\ \ *settings]*\ +\ **monadd name [-n|-**\ **-nodestatmon] [-s|-**\ **-settings**\ \ *settings]*\ *********** @@ -50,28 +50,28 @@ OPTIONS -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Display usage message. - -\ **-n | -**\ **-nodestatmon**\ - + +\ **-n | -**\ **-nodestatmon**\ + Indicate that this monitoring plug-in will be used for feeding the node liveness status to the xCAT \ *nodelist*\ table. - -\ **-s | -**\ **-settings**\ - + +\ **-s | -**\ **-settings**\ + Specifies the plug-in specific settings. These settings will be used by the plug-in to customize certain entities for the plug-in or the third party monitoring software. e.g. -s mon_interval=10 -s toggle=1. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Command Version. - + @@ -92,52 +92,52 @@ EXAMPLES 1. - + To register gangliamon plug-in module (which interacts with Ganglia monitoring software) to monitor the xCAT cluster, enter: - - + + .. code-block:: perl - + monadd gangliamon - - + + 2. - + To register rmcmon plug-in module (which interacts with IBM's RSCT monitoring software) to monitor the xCAT cluster and have it feed the node liveness status to xCAT's \ *nodelist*\ table, enter: - - + + .. code-block:: perl - + monadd rmcmon -n - - + + This will also add the \ *configrmcnode*\ to the \ *postscripts*\ table. To view the content of the \ *postscripts*\ table, enter: - - + + .. code-block:: perl - + tabdump postscritps #node,postscripts,comments,disable "service","servicenode",, "xcatdefaults","syslog,remoteshell,configrmcnode",, - - + + 3. - + To register xcatmon plug-in module to feed the node liveness status to xCAT's \ *nodelist*\ table, enter: - - + + .. code-block:: perl - + monadd xcatmon -n -s ping-interval=2 - - + + where 2 is the number of minutes between the pings. - + From a2493c9e74b42d3c5d4f8120d47fd3e599b3bb27 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0314/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/moncfg.1.rst --- .../source/guides/admin-guides/references/man1/moncfg.1.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/moncfg.1.rst b/docs/source/guides/admin-guides/references/man1/moncfg.1.rst index a7ac99ccd..047d2aa6e 100644 --- a/docs/source/guides/admin-guides/references/man1/moncfg.1.rst +++ b/docs/source/guides/admin-guides/references/man1/moncfg.1.rst @@ -19,11 +19,11 @@ SYNOPSIS ******** -\ **moncfg [-h| -**\ **-help]**\ +\ **moncfg [-h| -**\ **-help]**\ -\ **moncfg [-v| -**\ **-version]**\ +\ **moncfg [-v| -**\ **-version]**\ -\ **moncfg**\ \ *name*\ \ *[noderange]*\ \ **[-r|-**\ **-remote]**\ +\ **moncfg**\ \ *name*\ \ *[noderange]*\ \ **[-r|-**\ **-remote]**\ *********** From dca6be23f790cf0fdc7fe4d30f9087a2063ae24a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0315/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mondecfg.1.rst --- .../guides/admin-guides/references/man1/mondecfg.1.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mondecfg.1.rst b/docs/source/guides/admin-guides/references/man1/mondecfg.1.rst index eeb0dc747..c06c5b8a2 100644 --- a/docs/source/guides/admin-guides/references/man1/mondecfg.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mondecfg.1.rst @@ -19,11 +19,11 @@ SYNOPSIS ******** -\ **mondecfg [-h| -**\ **-help]**\ +\ **mondecfg [-h| -**\ **-help]**\ -\ **mondecfg [-v| -**\ **-version]**\ +\ **mondecfg [-v| -**\ **-version]**\ -\ **mondecfg**\ \ *name*\ \ *[noderange]*\ \ **[-r|-**\ **-remote]**\ +\ **mondecfg**\ \ *name*\ \ *[noderange]*\ \ **[-r|-**\ **-remote]**\ *********** From dfb11a017d73af248415085d3e7db837412817e7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0316/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/monls.1.rst --- .../guides/admin-guides/references/man1/monls.1.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/monls.1.rst b/docs/source/guides/admin-guides/references/man1/monls.1.rst index f5241006d..15eda4174 100644 --- a/docs/source/guides/admin-guides/references/man1/monls.1.rst +++ b/docs/source/guides/admin-guides/references/man1/monls.1.rst @@ -19,13 +19,13 @@ SYNOPSIS ******** -\ **monls [-h| -**\ **-help]**\ +\ **monls [-h| -**\ **-help]**\ -\ **monls [-v| -**\ **-version]**\ +\ **monls [-v| -**\ **-version]**\ -\ **monls**\ \ *name*\ \ **[-d|-**\ **-description]**\ +\ **monls**\ \ *name*\ \ **[-d|-**\ **-description]**\ -\ **monls [-a|-**\ **-all] [-d|-**\ **-description]**\ +\ **monls [-a|-**\ **-all] [-d|-**\ **-description]**\ *********** From 9bda07879cbf2e5052f01f97571819325393cb18 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0317/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/monrm.1.rst --- docs/source/guides/admin-guides/references/man1/monrm.1.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/monrm.1.rst b/docs/source/guides/admin-guides/references/man1/monrm.1.rst index 27d4563b9..8d2edc16a 100644 --- a/docs/source/guides/admin-guides/references/man1/monrm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/monrm.1.rst @@ -19,11 +19,11 @@ SYNOPSIS ******** -\ **monrm [-h| -**\ **-help]**\ +\ **monrm [-h| -**\ **-help]**\ -\ **monrm [-v| -**\ **-version]**\ +\ **monrm [-v| -**\ **-version]**\ -\ **monrm**\ \ *name*\ +\ **monrm**\ \ *name*\ *********** From 4af9e3c1c56e28758f85c103ac49b49380e9f25f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0318/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/monshow.1.rst --- docs/source/guides/admin-guides/references/man1/monshow.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/monshow.1.rst b/docs/source/guides/admin-guides/references/man1/monshow.1.rst index 2c8ff130c..07b343994 100644 --- a/docs/source/guides/admin-guides/references/man1/monshow.1.rst +++ b/docs/source/guides/admin-guides/references/man1/monshow.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **monshow [-h| -**\ **-help]**\ +\ **monshow [-h| -**\ **-help]**\ -\ **monshow [-v| -**\ **-version]**\ +\ **monshow [-v| -**\ **-version]**\ \ **monshow**\ \ *name*\ \ *[noderange]*\ [\ **-s**\ ] [\ **-t**\ \ *time*\ ] [\ **-a**\ \ *attributes*\ ] [\ **-w**\ \ *attr*\ < \ *operator*\ > \ *val*\ [\ **-w**\ \ *attr*\ < \ *operator*\ > \ *val*\ ] ... ][\ **-o {p|e}**\ ] From 82f5e1b5ea8a9ff6c9c3ec5a5bbecfceb07ee934 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0319/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/monstart.1.rst --- .../source/guides/admin-guides/references/man1/monstart.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/monstart.1.rst b/docs/source/guides/admin-guides/references/man1/monstart.1.rst index 1595b28b8..3c1c3a557 100644 --- a/docs/source/guides/admin-guides/references/man1/monstart.1.rst +++ b/docs/source/guides/admin-guides/references/man1/monstart.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **monstart [-h| -**\ **-help]**\ +\ **monstart [-h| -**\ **-help]**\ -\ **monstart [-v| -**\ **-version]**\ +\ **monstart [-v| -**\ **-version]**\ \ **monstart**\ \ *name*\ \ *[noderange]*\ [\ **-r|-**\ **-remote**\ ] From b6086ca951cc4ebffd7633064c1b1bfebf60702a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0320/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/monstop.1.rst --- docs/source/guides/admin-guides/references/man1/monstop.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/monstop.1.rst b/docs/source/guides/admin-guides/references/man1/monstop.1.rst index 4a0502ba4..d776f408b 100644 --- a/docs/source/guides/admin-guides/references/man1/monstop.1.rst +++ b/docs/source/guides/admin-guides/references/man1/monstop.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **monstop [-h| -**\ **-help]**\ +\ **monstop [-h| -**\ **-help]**\ -\ **monstop [-v| -**\ **-version]**\ +\ **monstop [-v| -**\ **-version]**\ \ **monstop**\ \ *name*\ [\ *noderange*\ ] [\ **-r|-**\ **-remote**\ ] From 4dd8e5e117ccccf1c7ef9692ffbb75c8b5fb2907 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0321/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst --- .../references/man1/mysqlsetup.1.rst | 112 +++++++++--------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst b/docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst index 8df8455b4..d604f9551 100644 --- a/docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst @@ -39,7 +39,7 @@ DESCRIPTION \ **mysqlsetup**\ - Sets up the MySQL or MariaDB database (linux only for MariaDB) for xCAT to use. The mysqlsetup script is run on the Management Node as root after the MySQL code or MariaDB code has been installed. Before running the init option, the MySQL server should be stopped, if it is running. The xCAT daemon, xcatd, must be running, do not stop it. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to MySQL or MariaDB and restarting the xcatd daemon as well as the MySQL daemon. For full information on all the steps that will be done, read the "Configure MySQL and Migrate xCAT Data to MySQL" sections in -\ **Setting_Up_MySQL_as_the_xCAT_DB**\ +\ **Setting_Up_MySQL_as_the_xCAT_DB**\ Two passwords must be supplied for the setup, a password for the xcatadmin id and a password for the root id in the MySQL database. These will be prompted for interactively, unless the environment variables XCATMYSQLADMIN_PW and XCATMYSQLROOT_PW are set to the passwords for the xcatadmin id and root id in the database,resp. @@ -52,57 +52,57 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Displays the usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Displays the release version of the code. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Displays verbose messages. - -\ **-i|-**\ **-init**\ - - The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed. This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server. It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database. + +\ **-i|-**\ **-init**\ + + The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed. This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server. It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database. On AIX, it additionally setup the mysql id and group and corrects the permissions in the MySQL install directories. For AIX, you should be using the MySQL rpms available from the xCAT website. For Linux, you should use the MySQL or MariaDB rpms shipped with the OS. You can chose the -f and/or the -o option, to run after the init. - -\ **-u|-**\ **-update**\ - + +\ **-u|-**\ **-update**\ + To run the update option, you must first have run the -i option and have xcat successfully running on the MySQL database. You can chose the -f and/or the -o option, to update. - -\ **-f|-**\ **-hostfile**\ - + +\ **-f|-**\ **-hostfile**\ + This option runs during update, it will take all the host from the input file (provide a full path) and give them database access to the xcatdb in MySQL for the xcatadmin id. Wildcards and ipaddresses may be used. xCAT must have been previously successfully setup to use MySQL. xcatadmin and MySQL root password are required. - -\ **-o|-**\ **-odbc**\ - + +\ **-o|-**\ **-odbc**\ + This option sets up the ODBC /etc/../odbcinst.ini, /etc/../odbc.ini and the .odbc.ini file in roots home directory will be created and initialized to run off the xcatdb MySQL database. See "Add ODBC Support" in Setting_Up_MySQL_as_the_xCAT_DB - -\ **-L|-**\ **-LL**\ - - Additional database configuration specifically for the LoadLeveler product. + +\ **-L|-**\ **-LL**\ + + Additional database configuration specifically for the LoadLeveler product. See "Add ODBC Support" in Setting_Up_MySQL_as_the_xCAT_DB - + @@ -128,61 +128,61 @@ EXAMPLES 1. - + To setup MySQL for xCAT to run on the MySQL xcatdb database : - - + + .. code-block:: perl - + mysqlsetup -i - - + + 2. - + Add hosts from /tmp/xcat/hostlist that can access the xcatdb database in MySQL: - - + + .. code-block:: perl - + mysqlsetup -u -f /tmp/xcat/hostlist - - + + Where the file contains a host per line, for example: - - + + .. code-block:: perl - + node1 1.115.85.2 10.%.%.% nodex.cluster.net - - + + 3. - + To setup the ODBC for MySQL xcatdb database access : - - + + .. code-block:: perl - + mysqlsetup -o - - + + 4. - + To setup MySQL for xCAT and add hosts from /tmp/xcat/hostlist and setup the ODBC in Verbose mode: - - + + .. code-block:: perl - + mysqlsetup -i -f /tmp/xcat/hostlist -o -V - - + + From 0766bbe65a23ac877ffd7d361f950fb6b5594a27 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0322/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst --- .../references/man1/nimnodecust.1.rst | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst b/docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst index 1fd244764..0beb84a00 100644 --- a/docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **nimnodecust [-h|-**\ **-help ]**\ +\ **nimnodecust [-h|-**\ **-help ]**\ -\ **nimnodecust [-V] -s**\ \ *lpp_source_name*\ [\ **-p**\ \ *packages*\ ] [\ **-b**\ \ *installp_bundles*\ ] \ *noderange [attr=val [attr=val ...]]*\ +\ **nimnodecust [-V] -s**\ \ *lpp_source_name*\ [\ **-p**\ \ *packages*\ ] [\ **-b**\ \ *installp_bundles*\ ] \ *noderange [attr=val [attr=val ...]]*\ *********** @@ -43,7 +43,7 @@ A bundle file contains a list of package names. The RPMs must have a prefix of # RPM R:expect-5.42.1-3.aix5.1.ppc.rpm R:ping-2.4b2_to-1.aix5.3.ppc.rpm - + #installp I:openssh.base I:openssh.license @@ -68,41 +68,41 @@ OPTIONS -\ *attr=val [attr=val ...]*\ - +\ *attr=val [attr=val ...]*\ + Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. These are used to specify additional values that can be passed to the underlying NIM commands, ("nim -o cust..."). See the NIM documentation for valid "nim" command line options. - -\ **-b**\ \ *installp_bundle_names*\ - + +\ **-b**\ \ *installp_bundle_names*\ + A comma separated list of NIM installp_bundle names. - -\ **-h |-**\ **-help**\ - + +\ **-h |-**\ **-help**\ + Display usage message. - -\ **-p**\ \ *package_names*\ - + +\ **-p**\ \ *package_names*\ + A comma-separated list of software packages to install. Packages may be RPM or installp. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats. - -\ **-V |-**\ **-verbose**\ - + +\ **-V |-**\ **-verbose**\ + Verbose mode. - + From 8b7656a42ac55f3117ba1bbe95f5bececbcd80c5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0323/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst --- .../references/man1/nimnodeset.1.rst | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst b/docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst index 5f3511342..2370ec466 100644 --- a/docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **nimnodeset [-h|-**\ **-help ]**\ +\ **nimnodeset [-h|-**\ **-help ]**\ -\ **nimnodeset [-V|-**\ **-verbose] [-f|-**\ **-force] [-i**\ \ *osimage_name*\ ] [\ **-l**\ \ *location*\ ] [\ **-p|-**\ **-primarySN**\ ] [\ **-b | -**\ **-backupSN**\ ] \ *noderange [attr=val [attr=val ...]]*\ +\ **nimnodeset [-V|-**\ **-verbose] [-f|-**\ **-force] [-i**\ \ *osimage_name*\ ] [\ **-l**\ \ *location*\ ] [\ **-p|-**\ **-primarySN**\ ] [\ **-b | -**\ **-backupSN**\ ] \ *noderange [attr=val [attr=val ...]]*\ *********** @@ -73,59 +73,59 @@ OPTIONS -\ *attr=val [attr=val ...]*\ - +\ *attr=val [attr=val ...]*\ + Specifies one or more "attribute equals value" pairs, separated by spaces. Attr= val pairs must be specified last on the command line. These are used to specify additional values that can be passed to the underlying NIM commands, ("nim -o bos_inst ..."). See the NIM documentation for valid "nim" command line options. Note that you may specify multiple "script" and "installp_bundle" values by using a comma separated list. (ex. "script=ascript,bscript"). - -\ **-b|-**\ **-backupSN**\ - + +\ **-b|-**\ **-backupSN**\ + When using backup service nodes only update the backup. The default is to update both the primary and backup service nodes - -\ **-f |-**\ **-force**\ - + +\ **-f |-**\ **-force**\ + Use the force option to reinitialize the NIM machines. - -\ **-h |-**\ **-help**\ - + +\ **-h |-**\ **-help**\ + Display usage message. - -\ **-i**\ \ *image_name*\ - + +\ **-i**\ \ *image_name*\ + The name of an existing xCAT osimage definition. - -\ **-l|-**\ **-location**\ - + +\ **-l|-**\ **-location**\ + The directory location to use when creating new NIM resolv_conf resources. The default location is /install/nim. - -\ **-p|-**\ **-primarySN**\ - + +\ **-p|-**\ **-primarySN**\ + When using backup service nodes only update the primary. The default is to update both the primary and backup service nodes. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats. - -\ **-V |-**\ **-verbose**\ - + +\ **-V |-**\ **-verbose**\ + Verbose mode. - + From d7eefd71f0de842dec4e6a5ff72980263bfae998 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0324/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst --- .../admin-guides/references/man1/nodeaddunmged.1.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst b/docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst index 2ce52c742..0578103ef 100644 --- a/docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **nodeaddunmged**\ [\ **-h**\ | \ **-**\ **-help**\ | \ **-v**\ | \ **-**\ **-version**\ ] -\ **nodeaddunmged hostname=**\ \ *node-name*\ \ **ip=**\ \ *ip-address*\ +\ **nodeaddunmged hostname=**\ \ *node-name*\ \ **ip=**\ \ *ip-address*\ *********** @@ -37,19 +37,19 @@ OPTIONS ******* -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version. -\ **hostname=**\ \ *node-name*\ +\ **hostname=**\ \ *node-name*\ Sets the name of the new unmanaged node, where is the name of the node. -\ **ip=**\ \ *ip-address*\ +\ **ip=**\ \ *ip-address*\ Sets the IP address of the unmanaged node, where \ *ip-address*\ is the IP address of the new node in the form xxx.xxx.xxx.xxx From 13a8d4fee8a03c36ad6b94a5aa92077e4bbd06dc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0325/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodech.1.rst --- .../admin-guides/references/man1/nodech.1.rst | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodech.1.rst b/docs/source/guides/admin-guides/references/man1/nodech.1.rst index c336df750..5d4c89f86 100644 --- a/docs/source/guides/admin-guides/references/man1/nodech.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodech.1.rst @@ -40,7 +40,7 @@ there. If "^=" is used, the specified value will be removed from the attribute' if it is there. You can also use "^=" and ",=" in the same command to essentially replace one item in the list with another. (See the Examples section.) -Additionally, as in nodels, boolean expressions can be used to further limit the scope of nodech from +Additionally, as in nodels, boolean expressions can be used to further limit the scope of nodech from the given noderange. The operators supported are the same as nodels (=~, !~, ==, and !=). With these operators in mind, the unambiguous assignment operator is '=@'. If you need, for example, to set @@ -58,22 +58,22 @@ OPTIONS -\ **-d|-**\ **-delete**\ - +\ **-d|-**\ **-delete**\ + Delete the nodes' row in the specified tables. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -99,53 +99,53 @@ EXAMPLES 1. To update nodes in noderange node1-node4 to be in only group all: - - + + .. code-block:: perl - + nodech node1-node4 groups=all - - + + 2. To put all nodes with nodepos.rack value of 2 into a group called rack2: - - + + .. code-block:: perl - + nodech all nodepos.rack==2 groups,=rack2 - - + + 3. To add nodes in noderange node1-node4 to the nodetype table with os=rhel5: - - + + .. code-block:: perl - + nodech node1-node4 groups=all,rhel5 nodetype.os=rhel5 - - + + 4. To add node1-node4 to group1 in addition to the groups they are already in: - - + + .. code-block:: perl - + nodech node1-node4 groups,=group1 - - + + 5. To put node1-node4 in group2, instead of group1: - - + + .. code-block:: perl - + nodech node1-node4 groups^=group1 groups,=group2 - - + + From d6c0a0122e43f456f6d615cfb8f2fc10c8429cb9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0326/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodechmac.1.rst --- .../admin-guides/references/man1/nodechmac.1.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodechmac.1.rst b/docs/source/guides/admin-guides/references/man1/nodechmac.1.rst index 84a1dce0c..18a44c46e 100644 --- a/docs/source/guides/admin-guides/references/man1/nodechmac.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodechmac.1.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **nodechmac**\ [\ **-h**\ | \ **-**\ **-help**\ | \ **-v**\ | \ **-**\ **-version**\ ] -\ **nodechmac**\ \ *node-name*\ \ **mac=**\ \ *mac-address*\ +\ **nodechmac**\ \ *node-name*\ \ **mac=**\ \ *mac-address*\ *********** @@ -39,19 +39,19 @@ OPTIONS ******* -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version. -\ *node-name*\ +\ *node-name*\ Specifies the name of the node you want to update, where is the node that is updated. -\ **mac=**\ \ *mac-address*\ +\ **mac=**\ \ *mac-address*\ Sets the new MAC address for the NIC used by the provisioning node, where is the NICs new MAC address. From 50694d3244317a0429a7ba5bf257527cbc439311 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0327/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst --- .../references/man1/nodechprofile.1.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst b/docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst index be6b5300e..77bff5084 100644 --- a/docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **nodechprofile**\ \ **[-h| -**\ **-help | -v | -**\ **-version]**\ +\ **nodechprofile**\ \ **[-h| -**\ **-help | -v | -**\ **-version]**\ \ **nodechprofile**\ \ *noderange*\ [\ **imageprofile=**\ \ *image-profile*\ ] [\ **networkprofile=**\ \ *network-profile*\ ] [\ **hardwareprofile=**\ \ *hardware-profile*\ ] @@ -47,27 +47,27 @@ OPTIONS ******* -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version. -\ *noderange*\ +\ *noderange*\ The nodes to be removed. -\ **imageprofile=**\ \ *image-profile*\ +\ **imageprofile=**\ \ *image-profile*\ Sets the new image profile name used by the node, where is the new image profile. An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name. -\ **networkprofile=**\ \ *network-profile*\ +\ **networkprofile=**\ \ *network-profile*\ Sets the new network profile name used by the node, where is the new network profile. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name. -\ **hardwareprofile=**\ \ *hardware-profile*\ +\ **hardwareprofile=**\ \ *hardware-profile*\ Sets the new hardware profile name used by the node, where is the new hardware management profile used by the node. If a "__HardwareProfile_hwprofile" group exists, then "hwprofile" is the hardware profile name. A hardware profile defines hardware management related information for imported nodes, including: IPMI, HMC, CEC, CMM. @@ -89,23 +89,23 @@ EXAMPLES 1. To change the image profile to rhels6.3_packaged for compute nodes compute-000 and compute-001, use the following command: - - + + .. code-block:: perl - + nodechprofile compute-000,compute-001 imageprofile=rhels6.3_packaged - - + + 2. To change all of the profiles for compute node compute-000, enter the following command: - - + + .. code-block:: perl - + nodechprofile compute-000 imageprofile=rhels6.3_packaged networkprofile=default_cn hardwareprofile=default_ipmi - - + + From f670d8a69e8f760f4eb3a12ec9ecefe26077b7bf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0328/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst --- .../references/man1/nodediscoverdef.1.rst | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst index e1d145eea..da7d60081 100644 --- a/docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst @@ -11,8 +11,8 @@ NAME **** -\ **nodediscoverdef**\ - Define the undefined discovery request to a predefined xCAT node, -or clean up the discovery entries from the discoverydata table +\ **nodediscoverdef**\ - Define the undefined discovery request to a predefined xCAT node, +or clean up the discovery entries from the discoverydata table (which can be displayed by nodediscoverls command) @@ -21,9 +21,9 @@ SYNOPSIS ******** -\ **nodediscoverdef**\ \ **-u**\ \ *uuid*\ \ **-n**\ \ *node*\ +\ **nodediscoverdef**\ \ **-u**\ \ *uuid*\ \ **-n**\ \ *node*\ -\ **nodediscoverdef**\ \ **-r**\ \ **-u**\ \ *uuid*\ +\ **nodediscoverdef**\ \ **-r**\ \ **-u**\ \ *uuid*\ \ **nodediscoverdef**\ \ **-r**\ \ **-t**\ {\ **seq | profile | switch | blade | manual | undef | all**\ } @@ -40,7 +40,7 @@ xCAT node. The discovery entry can be displayed by \ **nodediscoverls**\ comman The options \ **-u**\ and \ **-n**\ have to be used together to define a discovery request to a node. -The \ **nodediscoverdef**\ command also can be used to clean up the discovery entries from the +The \ **nodediscoverdef**\ command also can be used to clean up the discovery entries from the discoverydata table. The option \ **-r**\ is used to remove discovery entries. If working with \ **-u**\ , the specific entry @@ -56,69 +56,69 @@ OPTIONS -\ **-t seq|profile|switch|blade|manual|undef|all**\ - +\ **-t seq|profile|switch|blade|manual|undef|all**\ + Specify the nodes that have been discovered by the specified discovery method: - - + + \* \ **seq**\ - Sequential discovery (started via nodediscoverstart noderange= ...). - - - + + + \* \ **profile**\ - Profile discovery (started via nodediscoverstart networkprofile= ...). - - - + + + \* \ **switch**\ - Switch-based discovery (used when the switch and switches tables are filled in). - - - + + + \* \ **blade**\ - Blade discovery (used for IBM Flex blades). - - - + + + \* \ **manual**\ - Manually discovery (used when defining node by nodediscoverdef command). - - - + + + \* \ **undef**\ - Display the nodes that were in the discovery pool, but for which xCAT has not yet received a discovery request. - - - + + + \* \ **all**\ - All discovered nodes. - - - -\ **-n**\ \ *node*\ - + + + +\ **-n**\ \ *node*\ + The xCAT node that the discovery entry will be defined to. - -\ **-r**\ - + +\ **-r**\ + Remove the discovery entries from discoverydata table. - -\ **-u**\ \ *uuid*\ - + +\ **-u**\ \ *uuid*\ + The uuid of the discovered entry. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command version. - + @@ -139,57 +139,57 @@ EXAMPLES 1. Define the discovery entry which uuid is 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4 to node node1 - - + + .. code-block:: perl - + nodediscoverdef -u 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4 -n node1 - - + + Output is similar to: - - + + .. code-block:: perl - + Defined [51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4] to node node1. - - + + 2. Remove the discovery entry which uuid is 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4 from the discoverydata table - - + + .. code-block:: perl - + nodediscoverdef -r -u 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4 - - + + Output is similar to: - - + + .. code-block:: perl - + Removing discovery entries finished. - - + + 3. Remove the discovery entries which discover type is \ **seq**\ from the discoverydata table - - + + .. code-block:: perl - + nodediscoverdef -r -t seq - - + + Output is similar to: - - + + .. code-block:: perl - + Removing discovery entries finished. - - + + From 11b95343a391f121ed3a902647bab0e496bc5f45 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0329/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst --- .../references/man1/nodediscoverls.1.rst | 154 +++++++++--------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst index 8d1458b64..beda1bb93 100644 --- a/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst @@ -47,63 +47,63 @@ OPTIONS -\ **-t seq|profile|switch|blade|manual|undef|all**\ - +\ **-t seq|profile|switch|blade|manual|undef|all**\ + Display the nodes that have been discovered by the specified discovery method: - - + + \* \ **seq**\ - Sequential discovery (started via nodediscoverstart noderange= ...). - - - + + + \* \ **profile**\ - Profile discovery (started via nodediscoverstart networkprofile= ...). - - - + + + \* \ **switch**\ - Switch-based discovery (used when the switch and switches tables are filled in). - - - + + + \* \ **blade**\ - Blade discovery (used for IBM Flex blades). - - - + + + \* \ **manual**\ - Manually discovery (used when defining node by nodediscoverdef command). - - - + + + \* \ **undef**\ - Display the nodes that were in the discovery pool, but for which xCAT has not yet received a discovery request. - - - + + + \* \ **all**\ - All discovered nodes. - - - -\ **-l**\ - + + + +\ **-l**\ + Display more detailed information about the discovered nodes. - -\ **-u**\ \ *uuid*\ - + +\ **-u**\ \ *uuid*\ + Display the discovered node that has this uuid. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command version. - + @@ -124,80 +124,80 @@ EXAMPLES 1. Display the discovered nodes when sequential discovery is running: - - + + .. code-block:: perl - + nodediscoverls - - + + Output is similar to: - - + + .. code-block:: perl - + UUID NODE METHOD MTM SERIAL 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2 distest1 sequential 786310X 1052EF2 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB3 distest2 sequential 786310X 1052EF3 - - + + 2. Display the nodes that were in the discovery pool, but for which xCAT has not yet received a discovery request: - - + + .. code-block:: perl - + nodediscoverls -t undef - - + + Output is similar to: - - + + .. code-block:: perl - + UUID NODE METHOD MTM SERIAL 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB0 undef undef 786310X 1052EF0 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB1 undef undef 786310X 1052EF1 - - + + 3. Display all the discovered nodes: - - + + .. code-block:: perl - + nodediscoverls -t all - - + + Output is similar to: - - + + .. code-block:: perl - + UUID NODE METHOD MTM SERIAL 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB0 undef undef 786310X 1052EF0 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB1 undef undef 786310X 1052EF1 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2 distest1 sequential 786310X 1052EF2 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB3 distest2 sequential 786310X 1052EF3 - - + + 4. Display the discovered node whose uuid is \ **51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2**\ , with detailed information: - - + + .. code-block:: perl - + nodediscoverls -u 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2 -l - - + + Output is similar to: - - + + .. code-block:: perl - + Object uuid: 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2 node=distest1 method=sequential @@ -219,8 +219,8 @@ EXAMPLES switchaddr=eth0!192.168.70.120 switchdesc=eth0!IBM Flex System Fabric EN4093 10Gb Scalable Switch, flash image: version 7.2.6, boot image: version 7.2.6 switchport=eth0!INTA2 - - + + From 52a184b596fe46c2aae1d58e29b65e0cd7001947 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0330/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst --- .../references/man1/nodediscoverstart.1.rst | 154 +++++++++--------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst index 2171f8da9..87a280799 100644 --- a/docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst @@ -21,12 +21,12 @@ SYNOPSIS \ **nodediscoverstart**\ [\ **-h | -**\ **-help | -v | -**\ **-version**\ ] -\ **Sequential Discovery Specific:**\ +\ **Sequential Discovery Specific:**\ \ **nodediscoverstart**\ \ **noderange=**\ \ *noderange*\ [\ **hostiprange=**\ \ *imageprofile*\ ] [\ **bmciprange=**\ \ *bmciprange*\ ] [\ **groups=**\ \ *groups*\ ] [\ **rack=**\ \ *rack*\ ] [\ **chassis=**\ \ *chassis*\ ] [\ **height=**\ \ *height*\ ] [\ **unit=**\ \ *unit*\ ] [\ **osimage=**\ \ *osimagename*\ >] [\ **-n | -**\ **-dns**\ ] [\ **-s | -**\ **-skipbmcsetup**\ ] [\ **-V|-**\ **-verbose**\ ] -\ **Profile Discovery Specific:**\ +\ **Profile Discovery Specific:**\ \ **nodediscoverstart**\ \ **networkprofile=**\ \ *network-profile*\ \ **imageprofile=**\ \ *image-profile*\ \ **hostnameformat=**\ \ *nost-name-format*\ [\ **hardwareprofile=**\ \ *hardware-profile*\ ] [\ **groups=**\ \ *node-groups*\ ] [\ **rack=**\ \ *rack-name*\ ] [\ **chassis=**\ \ *chassis-name*\ ] [\ **height=**\ \ *rack-server-height*\ ] [\ **unit=**\ \ *rack-server-unit-location*\ ] [\ **rank=**\ \ *rank-num*\ ] @@ -40,7 +40,7 @@ DESCRIPTION The \ **nodediscoverstart**\ command starts either the \ **Sequential Discovery**\ or \ **Profile Discovery**\ process. They can not both be running at the same time. -\ **Sequential Discovery Specific:**\ +\ **Sequential Discovery Specific:**\ This is the simplest discovery approach. You only need to specify the \ **noderange**\ , \ **hostiprange**\ and \ **bmciprange**\ that should be @@ -49,7 +49,7 @@ then you only need to specify the \ **noderange**\ to the \ **nodediscoverstart physically power on the nodes in the sequence that you want them to receive the node names and IPs, waiting a short time (e.g. 30 seconds) between each node. -\ **Profile Discovery Specific:**\ +\ **Profile Discovery Specific:**\ This is the PCM discovery approach. \ *networkprofile*\ , \ *imageprofile*\ , \ *hostnameformat*\ arguments must be specified to start the \ **Profile Discovery**\ . @@ -68,124 +68,124 @@ OPTIONS -\ **noderange=**\ \ *noderange*\ - +\ **noderange=**\ \ *noderange*\ + The set of node names that should be given to nodes that are discovered via the \ **Sequential Discovery**\ method. This argument is required to \ **Sequential Discovery**\ . Any valid xCAT \ **noderange**\ is allowed, e.g. node[01-10]. - -\ **hostiprange=**\ \ *ip range*\ - + +\ **hostiprange=**\ \ *ip range*\ + The ip range which will be assigned to the host of new discovered nodes in the \ **Sequential Discovery**\ method. The format can be: \ *start_ip*\ \ **-**\ \ *end_ip*\ or \ *noderange*\ , e.g. 192.168.0.1-192.168.0.10 or 192.168.0.[1-10]. - -\ **bmciprange=**\ \ *ip range*\ - + +\ **bmciprange=**\ \ *ip range*\ + The ip range which will be assigned to the bmc of new discovered nodes in the \ **Sequential Discovery**\ method. The format can be: \ *start_ip*\ \ **-**\ \ *end_ip*\ or \ *noderange*\ , e.g. 192.168.1.1-192.168.1.10 or 192.168.1.[1-10]. - -\ **imageprofile=**\ \ *image-profile*\ - + +\ **imageprofile=**\ \ *image-profile*\ + Sets the new image profile name used by the discovered nodes in the \ **Profile Discovery**\ method. An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name. - -\ **networkprofile=**\ \ *network-profile*\ - + +\ **networkprofile=**\ \ *network-profile*\ + Sets the new network profile name used by the discovered nodes in the \ **Profile Discovery**\ method. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name. - -\ **hardwareprofile=**\ \ *hardware-profile*\ - + +\ **hardwareprofile=**\ \ *hardware-profile*\ + Sets the new hardware profile name used by the discovered nodes in the \ **Profile Discovery**\ method. If a "__HardwareProfile_hwprofile" group exists, then "hwprofile" is the hardware profile name. A hardware profile defines hardware management related information for imported nodes, including: IPMI, HMC, CEC, CMM. - -\ **hostnameformat=**\ \ *nost-name-format*\ - + +\ **hostnameformat=**\ \ *nost-name-format*\ + Sets the node name format for all discovered nodes in the \ **Profile Discovery**\ method. The two types of formats supported are prefix#NNNappendix and prefix#RRand#NNappendix, where wildcard #NNN and #NN are replaced by a system generated number that is based on the provisioning order. Wildcard #RR represents the rack number and stays constant. - + For example, if the node name format is compute-#NN, the node name is generated as: compute-00, compute-01, ..., compute-99. If the node name format is blade#NNN-x64, the node name is generated as: blade001-x64, blade002-x64, ..., blade999-x64 - + For example, if the node name format is compute-#RR-#NN and the rack number is 2, the node name is generated as: compute-02-00, compute-02-01, ..., compute-02-99. If node name format is node-#NN-in-#RR and rack number is 1, the node name is generated as: node-00-in-01, node-01-in-01, ..., node-99-in-01 - -\ **groups=**\ \ *node-groups*\ - + +\ **groups=**\ \ *node-groups*\ + Sets the node groups that the discovered nodes should be put in for either the Sequential Discovery or Profile Discovery methods, where \ *node-group*\ is a comma-separated list of node groups. - + \ **rack=**\ \ *rack-name*\ > - + Sets the rack name where the node is located for either the Sequential Discovery or Profile Discovery methods. - -\ **chassis=**\ \ *chassis-name*\ - + +\ **chassis=**\ \ *chassis-name*\ + Sets the chassis name that the Blade server or PureFlex blade is located in, for either the Sequential Discovery or Profile Discovery methods. This option is used for the Blade server and PureFlex system only. You cannot specify this option with the rack option. - -\ **height=**\ \ *rack-server-height*\ - + +\ **height=**\ \ *rack-server-height*\ + Sets the height of a rack-mounted server in U units for either the Sequential Discovery or Profile Discovery methods. If the rack option is not specified, the default value is 1. - -\ **unit=**\ \ *rack-server-unit-location*\ - + +\ **unit=**\ \ *rack-server-unit-location*\ + Sets the start unit value for the node in the rack, for either the Sequential Discovery or Profile Discovery methods. This option is for a rack server only. If the unit option is not specified, the default value is 1 - -\ **rank=**\ \ *rank-num*\ - + +\ **rank=**\ \ *rank-num*\ + Specifies the starting rank number that is used in the node name format, for the Profile Discovery method. The rank number must be a valid integer between 0 and 254. This option must be specified with nodenameformat option. For example, if your node name format is compute-#RR-#NN. The rack's number is 2 and rank is specified as 5, the node name is generated as follows: compute-02-05, compute-02-06, ..., compute-02-99. - -\ **osimage=**\ \ *osimagename*\ - + +\ **osimage=**\ \ *osimagename*\ + Specifies the osimage name that will be associated with the new discovered node, the os provisioning will be started automatically at the end of the discovery process. - -\ **-n|-**\ **-dns**\ - + +\ **-n|-**\ **-dns**\ + Specifies to run makedns for any new discovered node. This is useful mainly for non-predefined configuration, before running the "nodediscoverstart -n", the user needs to run makedns -n to initialize the named setup on the management node. - -\ **-s|-**\ **-skipbmcsetup**\ - + +\ **-s|-**\ **-skipbmcsetup**\ + Specifies to skip the bmcsetup during the sequential discovery process, if the bmciprange is specified with nodediscoverstart command, the BMC will be setup automatically during the discovery process, if the user does not want to run bmcsetup, could specify the "-s|--skipbmcsetup" with nodediscoverstart command to skip the bmcsetup. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Enumerates the free node names and host/bmc ips that are being specified in the ranges given. Use this option with Sequential Discovery to ensure that you are specifying the ranges you intend. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - + @@ -206,18 +206,18 @@ EXAMPLES 1. \ **Sequential Discovery**\ : To discover nodes with noderange and host/bmc ip range: - - + + .. code-block:: perl - + nodediscoverstart noderange=n[1-10] hostiprange='172.20.101.1-172.20.101.10' bmciprange='172.20.102.1-172.20.102.10' -V - - + + Output is similar to: - - + + .. code-block:: perl - + Sequential Discovery: Started: Number of free node names: 10 Number of free host ips: 10 @@ -227,18 +227,18 @@ EXAMPLES n01 172.20.101.1 172.20.102.1 n02 172.20.101.2 172.20.102.2 ... ... ... - - + + 2. \ **Profile Discovery**\ : To discover nodes using the default_cn network profile and the rhels6.3_packaged image profile, use the following command: - - + + .. code-block:: perl - + nodediscoverstart networkprofile=default_cn imageprofile=rhels6.3_packaged hostnameformat=compute#NNN - - + + From 2f0fb75c02896fc22baf75e67b74c96fdfa53951 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0331/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst --- .../admin-guides/references/man1/nodediscoverstatus.1.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst index 182800616..610e8bef0 100644 --- a/docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst @@ -27,7 +27,7 @@ DESCRIPTION *********** -The \ **nodediscoverstatus**\ command detects if the sequential or profile node discovery process is currently running, i.e. \ **nodediscoverstart**\ +The \ **nodediscoverstatus**\ command detects if the sequential or profile node discovery process is currently running, i.e. \ **nodediscoverstart**\ has been run, but \ **nodediscoverstop**\ has not. @@ -36,11 +36,11 @@ OPTIONS ******* -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version. From a19a31462bb1909de5fe5a116f234c5a0ac9e40e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0332/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst --- .../admin-guides/references/man1/nodediscoverstop.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst index f95b1b43f..4f4046b0a 100644 --- a/docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst @@ -37,11 +37,11 @@ OPTIONS ******* -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version. From dff9667b8a163aadb4a217131a5a90302ebfe5a3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0333/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst --- .../references/man1/nodegrpch.1.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst b/docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst index 0b19fac79..522d4a769 100644 --- a/docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst @@ -32,11 +32,11 @@ DESCRIPTION The nodegrpch command is similar to the nodech command, but ensures that the parameters are -declared at the group level rather than the node specific level, and clears conflicting node -specific overrides of the specified groups. Using table.column=value will do a -verbatim assignment. If ",=" is used instead of "=", the specified value will be prepended to the -attribute's comma separated list, if it is not already there. If "^=" is used, the specified -value will be removed from the attribute's comma separated list, if it is there. You can also +declared at the group level rather than the node specific level, and clears conflicting node +specific overrides of the specified groups. Using table.column=value will do a +verbatim assignment. If ",=" is used instead of "=", the specified value will be prepended to the +attribute's comma separated list, if it is not already there. If "^=" is used, the specified +value will be removed from the attribute's comma separated list, if it is there. You can also use "^=" and ",=" in the same command to essentially replace one item in the list with another. (See the Examples section.) @@ -55,16 +55,16 @@ OPTIONS -\ **-v|-**\ **-version**\ - +\ **-v|-**\ **-version**\ + Command Version. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -90,15 +90,15 @@ EXAMPLES 1. - + To declare all members of ipmi group to have nodehm.mgt be ipmi - - + + .. code-block:: perl - + nodegrpch ipmi nodehm.mgt=ipmi - - + + From 98ecdbc4d4b77abdedbba606df85fe315ed9fbf4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0334/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodeimport.1.rst --- .../references/man1/nodeimport.1.rst | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodeimport.1.rst b/docs/source/guides/admin-guides/references/man1/nodeimport.1.rst index ccd2a8ab9..bd3a82f54 100644 --- a/docs/source/guides/admin-guides/references/man1/nodeimport.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodeimport.1.rst @@ -39,31 +39,31 @@ OPTIONS ******* -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version. -\ **file=**\ \ *nodeinfo-filename*\ +\ **file=**\ \ *nodeinfo-filename*\ Specifies the node information file, where is the full path and file name of the node information file. -\ **imageprofile=**\ \ *image-profile*\ +\ **imageprofile=**\ \ *image-profile*\ Sets the new image profile name used by the node, where is the new image profile. An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name. -\ **networkprofile=**\ \ *network-profile*\ +\ **networkprofile=**\ \ *network-profile*\ Sets the new network profile name used by the node, where is the new network profile. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name. -\ **hardwareprofile=**\ \ *hardware-profile*\ +\ **hardwareprofile=**\ \ *hardware-profile*\ Sets the new hardware profile name used by the node, where is the new hardware management profile used by the node. If a "__HardwareProfile_hwprofile" group exists, then "hwprofile" is the hardware profile name. A hardware profile defines hardware management related information for imported nodes, including: IPMI, HMC, CEC, CMM. -\ **hostnameformat=**\ \ *host-name-format*\ +\ **hostnameformat=**\ \ *host-name-format*\ Sets the node name format for all nodes discovered, where is a supported format. The two types of formats supported are prefix#NNNappendix and prefix#RRand#NNappendix, where wildcard #NNN and #NN are replaced by a system generated number that is based on the provisioning order. Wildcard #RR represents the rack number and stays constant. @@ -71,7 +71,7 @@ For example, if the node name format is compute-#NN, the node name is generated For example, if the node name format is compute-#RR-#NN and the rack number is 2, the node name is generated as: compute-02-00, compute-02-01, ..., compute-02-99. If node name format is node-#NN-in-#RR and rack number is 1, the node name is generated as: node-00-in-01, node-01-in-01, ... , node-99-in-01 -\ **groups=**\ \ *node-groups*\ +\ **groups=**\ \ *node-groups*\ Sets the node groups that the imported node belongs to, where is a comma-separated list of node groups. @@ -107,7 +107,7 @@ To import nodes using a profile, follow the following steps: "__NetworkProfile_default_mn","static","static",,,, "__NetworkProfile_default_cn","static",,,,, "__ImageProfile_rhels6.2-x86_64-install-compute","static","static",,,, - + # lsdef -t group __NetworkProfile_default_cn Object name: __NetworkProfile_default_cn grouptype=static @@ -125,14 +125,14 @@ To import nodes using a profile, follow the following steps: .. code-block:: perl - Example of a node information file, a blade and a rack server defined: + Example of a node information file, a blade and a rack server defined: # hostinfo begin # This entry defines a blade. __hostname__: mac=b8:ac:6f:37:59:24 ip=192.168.1.20 chassis=chassis01 - + # This entry defines a rack server. __hostname__: mac=b8:ac:6f:37:59:25 @@ -140,9 +140,9 @@ To import nodes using a profile, follow the following steps: rack=rack01 height=1 unit=2 - + # hostinfo end. - + Another example of a node information file, a PureFlex X/P node defined: # hostinfo begin # To define a PureFlex P/X node, chassis and slot id must be specified. @@ -152,28 +152,28 @@ To import nodes using a profile, follow the following steps: chassis=cmm01 slotid=1 # hostinfo end. - - Example of a node information file, a switch auto discovery node defined: + + Example of a node information file, a switch auto discovery node defined: # hostinfo begin # This entry defines a blade. __hostname__: switches=eth0!switch1!1,eth0!switch2!1!eth1 - + Example of a node information file that specifies a CEC-based rack-mounted Power node that uses direct FSP management: # Node information file begins # This entry defines a Power rack-mount node. __hostname__: mac=b8:ac:6f:37:59:28 cec=mycec - + __hostname__: mac=b8:ac:6f:37:59:28 cec=mycec lparid=2 # Node information file ends. - + Example of a node information file that specifies a PowerKVM Guest node that uses KVM management: - + # Node information file begins # This entry defines a PowerKVM Guest node. # Make sure the node 'vm01' is already created on Hypervisor From 1c74761bc6a25074a1de0248cd13ccc984a6809a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0335/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodels.1.rst --- .../admin-guides/references/man1/nodels.1.rst | 282 +++++++++--------- 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodels.1.rst b/docs/source/guides/admin-guides/references/man1/nodels.1.rst index 395c72848..2843e2bfa 100644 --- a/docs/source/guides/admin-guides/references/man1/nodels.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodels.1.rst @@ -38,49 +38,49 @@ are specified after the noderange in the form: \ *table.column*\ . A few shor also be used as aliases to common attributes: -\ **groups**\ - +\ **groups**\ + nodelist.groups - -\ **tags**\ - + +\ **tags**\ + nodelist.groups - -\ **mgt**\ - + +\ **mgt**\ + nodehm.mgt - + nodels can also select based on table value criteria. The following operators are available: -\ **==**\ - +\ **==**\ + Select nodes where the table.column value is exactly a certain value. - -\ **!=**\ - + +\ **!=**\ + Select nodes where the table.column value is not a given specific value. - -\ **=~**\ - + +\ **=~**\ + Select nodes where the table.column value matches a given regular expression. - -\ **!~**\ - + +\ **!~**\ + Select nodes where the table.column value does not match a given regular expression. - + The \ **nodels**\ command with a specific node and one or more table.attribute parameters is a good substitute @@ -95,34 +95,34 @@ OPTIONS -\ **-v|-**\ **-version**\ - +\ **-v|-**\ **-version**\ + Command Version. - -\ **-H|-**\ **-with-fieldname**\ - + +\ **-H|-**\ **-with-fieldname**\ + Force display of table name and column name context for each result - -\ **-b|-**\ **-blame**\ - + +\ **-b|-**\ **-blame**\ + For values inherited from groups, display which groups provided the inheritance - -\ **-S**\ - + +\ **-S**\ + List all the hidden nodes (FSP/BPA nodes) with other ones. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -143,153 +143,153 @@ EXAMPLES 1. - + To list all defined nodes, enter: - - + + .. code-block:: perl - + nodels - - + + Output is similar to: - - + + .. code-block:: perl - + node1 node2 node3 - - + + 2. - + To list all defined attributes in a table for a node or noderange, enter: - - + + .. code-block:: perl - + nodels rra001a noderes - - + + Output is similar to: - - + + .. code-block:: perl - + rra001a: noderes.primarynic: eth0 rra001a: noderes.xcatmaster: rra000 rra001a: noderes.installnic: eth0 rra001a: noderes.netboot: pxe rra001a: noderes.servicenode: rra000 rra001a: noderes.node: rra001a - - + + 3. - + To list nodes in node group ppc, enter: - - + + .. code-block:: perl - + nodels ppc - - + + Output is similar to: - - + + .. code-block:: perl - + ppcnode1 ppcnode2 ppcnode3 - - + + 4. - + To list the groups each node is part of: - - + + .. code-block:: perl - + nodels all groups - - + + Output is similar to: - - + + .. code-block:: perl - + node1: groups: all node2: groups: all,storage node3: groups: all,blade - - + + 5. - + To list the groups each node is part of: - - + + .. code-block:: perl - + nodels all nodehm.power - - + + Output is similar to: - - + + .. code-block:: perl - + node1: nodehm.power: blade node2: nodehm.power: ipmi node3: nodehm.power: ipmi - - + + 6. - + To list the out-of-band mgt method for blade1: - - + + .. code-block:: perl - + nodels blade1 nodehm.mgt - - + + Output is similar to: - - + + .. code-block:: perl - + blade1: blade - - + + 7. - + Listing blades managed through an AMM named 'amm1' - - + + .. code-block:: perl - + nodels all mp.mpa==amm1 - - + + Output is similar to: - - + + .. code-block:: perl - + blade1 blade10 blade11 @@ -303,25 +303,25 @@ EXAMPLES blade7 blade8 blade9 - - + + 8. - + Listing the switch.switch value for nodes in the second rack: - - + + .. code-block:: perl - + nodels all nodepos.rack==2 switch.switch - - + + Output is similar to: - - + + .. code-block:: perl - + n41: switch.switch: switch2 n42: switch.switch: switch2 n43: switch.switch: switch2 @@ -335,25 +335,25 @@ EXAMPLES n58: switch.switch: switch2 n59: switch.switch: switch2 n60: switch.switch: switch2 - - + + 9. - + Listing the blade slot number for anything managed through a device with a name beginning with amm: - - + + .. code-block:: perl - + nodels all mp.mpa=~/^amm.*/ mp.id - - + + Output looks like: - - + + .. code-block:: perl - + blade1: mp.id: 1 blade10: mp.id: 10 blade11: mp.id: 11 @@ -367,21 +367,21 @@ EXAMPLES blade7: mp.id: 7 blade8: mp.id: 8 blade9: mp.id: 9 - - + + 10. - + To list the hidden nodes that can't be seen with other flags. The hidden nodes are FSP/BPAs. - - + + .. code-block:: perl - + lsdef -S - - + + From ebf3275aac9688fb80cbb8e328c9ddd2bbb4776b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0336/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodepurge.1.rst --- .../admin-guides/references/man1/nodepurge.1.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodepurge.1.rst b/docs/source/guides/admin-guides/references/man1/nodepurge.1.rst index 847eb6c7b..50f18ad0d 100644 --- a/docs/source/guides/admin-guides/references/man1/nodepurge.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodepurge.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **nodepurge [-h| -**\ **-help | -v | -**\ **-version]**\ +\ **nodepurge [-h| -**\ **-help | -v | -**\ **-version]**\ -\ **nodepurge**\ \ *noderange*\ +\ **nodepurge**\ \ *noderange*\ *********** @@ -39,15 +39,15 @@ OPTIONS ******* -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version -\ *noderange*\ +\ *noderange*\ The nodes to be removed. From f1187e7faea93f32ae8e369f9315ea139e252d08 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0337/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/noderefresh.1.rst --- .../admin-guides/references/man1/noderefresh.1.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/noderefresh.1.rst b/docs/source/guides/admin-guides/references/man1/noderefresh.1.rst index 7f110d908..d7919f311 100644 --- a/docs/source/guides/admin-guides/references/man1/noderefresh.1.rst +++ b/docs/source/guides/admin-guides/references/man1/noderefresh.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **noderefresh [-h| -**\ **-help | -v | -**\ **-version]**\ +\ **noderefresh [-h| -**\ **-help | -v | -**\ **-version]**\ -\ **noderefresh**\ \ *noderange*\ +\ **noderefresh**\ \ *noderange*\ *********** @@ -37,15 +37,15 @@ OPTIONS ******* -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version. -\ *noderange*\ +\ *noderange*\ The nodes to be updated. From 3ef06c3d97092b8b13365f0e8d6688a3686fd24e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0338/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/noderm.1.rst --- docs/source/guides/admin-guides/references/man1/noderm.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/noderm.1.rst b/docs/source/guides/admin-guides/references/man1/noderm.1.rst index 4f5eac74a..222e558b0 100644 --- a/docs/source/guides/admin-guides/references/man1/noderm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/noderm.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **noderm [-h| -**\ **-help]**\ +\ **noderm [-h| -**\ **-help]**\ -\ **noderm noderange**\ +\ **noderm noderange**\ *********** From f4e2378e390aed566079e68b25b36b76838bb577 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0339/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/nodestat.1.rst --- .../references/man1/nodestat.1.rst | 128 +++++++++--------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/nodestat.1.rst b/docs/source/guides/admin-guides/references/man1/nodestat.1.rst index 9264a0232..2c8944375 100644 --- a/docs/source/guides/admin-guides/references/man1/nodestat.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodestat.1.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -25,7 +25,7 @@ Name ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -60,10 +60,10 @@ Keywords to use: .. code-block:: perl apps -- a list of comma separated application names whose status will be queried. For how to get the status of each app, look for app name in the key field in a different row. - port -- the application daemon port number, if not specified, use internal list, then /etc/services. + port -- the application daemon port number, if not specified, use internal list, then /etc/services. group -- the name of a node group that needs to get the application status from. If not specified, assume all the nodes in the nodelist table. To specify more than one groups, use group=a,group=b format. cmd -- the command that will be run locally on mn or sn. - lcmd -- the command that will be run the mn only. + lcmd -- the command that will be run the mn only. dcmd -- the command that will be run distributed on the nodes using xdsh .... @@ -81,144 +81,144 @@ For the command specified by 'dcmd', no input is needed, the output can be a str *************** -\ **Options**\ +\ **Options**\ *************** \ **-f | -**\ **-usefping**\ - + Uses fping instead of nmap even if nmap is available. If you seem to be having a problem with false negatives, fping can be more forgiving, but slower. - -\ **-m | -**\ **-usemon**\ - + +\ **-m | -**\ **-usemon**\ + Uses the settings from the \ **monsetting**\ table to determine a list of applications that need to get status for. - -\ **-p | -**\ **-powerstat**\ - + +\ **-p | -**\ **-powerstat**\ + Gets the power status for the nodes that are 'noping'. - -\ **-u | -**\ **-updatedb**\ - + +\ **-u | -**\ **-updatedb**\ + Updates the status and appstatus columns of the nodelist table with the returned running status from the given nodes. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. - - + + .. code-block:: perl - + nodestat compute - - + + Output is similar to: - - + + .. code-block:: perl - + node1 sshd node2 sshd node3 ping node4 pbs node5 noping - - + + 2. - - + + .. code-block:: perl - + nodestat compute -p - - + + Output is similar to: - - + + .. code-block:: perl - + node1 sshd node2 sshd node3 ping node4 pbs node5 noping(Shutting down) - - + + 3. - - + + .. code-block:: perl - + nodestat compute -u - - + + Output is similar to: - - + + .. code-block:: perl - + node1 sshd node2 sshd node3 ping node4 netboot node5 noping - - + + 4. - - + + .. code-block:: perl - + nodestat compute -m - - + + Output is similar to: - - + + .. code-block:: perl - + node1 ping,sshd,ll,gpfs=ok node2 ping,sshd,ll,gpfs=not ok,someapp=something is wrong node3 netboot node4 noping - - + + ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From 261b55759bb418647dbdd4e57a12fe6cbcd48d48 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0340/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/packimage.1.rst --- .../guides/admin-guides/references/man1/packimage.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/packimage.1.rst b/docs/source/guides/admin-guides/references/man1/packimage.1.rst index 7105513fd..d02606404 100644 --- a/docs/source/guides/admin-guides/references/man1/packimage.1.rst +++ b/docs/source/guides/admin-guides/references/man1/packimage.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **packimage [-h| -**\ **-help]**\ +\ **packimage [-h| -**\ **-help]**\ -\ **packimage [-v| -**\ **-version]**\ +\ **packimage [-v| -**\ **-version]**\ \ **packimage**\ [\ **-m | -**\ **-method**\ \ *cpio|tar*\ ] [\ **-c | -**\ **-compress**\ \ *gzip|pigz|xz*\ ] [\ **--nosyncfiles**\ ] \ *imagename*\ From d2503d6dd361cfb7889cab2e8f8b26ab34a9102c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0341/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/pasu.1.rst --- .../admin-guides/references/man1/pasu.1.rst | 186 +++++++++--------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/pasu.1.rst b/docs/source/guides/admin-guides/references/man1/pasu.1.rst index e7af74980..519043875 100644 --- a/docs/source/guides/admin-guides/references/man1/pasu.1.rst +++ b/docs/source/guides/admin-guides/references/man1/pasu.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **pasu**\ [\ **-V**\ ] [\ **-d**\ ] [\ **-l**\ \ *user*\ ] [\ **-p**\ \ *passwd*\ ] [\ **-f**\ \ *fanout*\ ] [\ **-i**\ \ *hostname-suffix*\ ] \ *noderange*\ \ *command*\ +\ **pasu**\ [\ **-V**\ ] [\ **-d**\ ] [\ **-l**\ \ *user*\ ] [\ **-p**\ \ *passwd*\ ] [\ **-f**\ \ *fanout*\ ] [\ **-i**\ \ *hostname-suffix*\ ] \ *noderange*\ \ *command*\ -\ **pasu**\ [\ **-V**\ ] [\ **-d**\ ] [\ **-l**\ \ *user*\ ] [\ **-p**\ \ *passwd*\ ] [\ **-f**\ \ *fanout*\ ] [\ **-i**\ \ *hostname-suffix*\ ] \ **-b**\ \ *batchfile*\ \ *noderange*\ +\ **pasu**\ [\ **-V**\ ] [\ **-d**\ ] [\ **-l**\ \ *user*\ ] [\ **-p**\ \ *passwd*\ ] [\ **-f**\ \ *fanout*\ ] [\ **-i**\ \ *hostname-suffix*\ ] \ **-b**\ \ *batchfile*\ \ *noderange*\ \ **pasu**\ [\ **-h**\ | \ **-**\ **-help**\ ] @@ -47,66 +47,66 @@ OPTIONS -\ **-l|-**\ **-loginname**\ \ *username*\ - +\ **-l|-**\ **-loginname**\ \ *username*\ + The username to use to connect to the IMMs. If not specified, the row in the xCAT \ **passwd**\ table with key "ipmi" will be used to get the username. - -\ **-p|-**\ **-passwd**\ \ *passwd*\ - + +\ **-p|-**\ **-passwd**\ \ *passwd*\ + The password to use to connect to the IMMs. If not specified, the row in the xCAT passwd table with key "ipmi" will be used to get the password. - -\ **-f|-**\ **-fanout**\ - + +\ **-f|-**\ **-fanout**\ + How many processes to run in parallel simultaneously. The default is 64. You can also set the XCATPSHFANOUT environment variable. - -\ **-b|-**\ **-batch**\ -\ *batchfile*\ - + +\ **-b|-**\ **-batch**\ -\ *batchfile*\ + A simple text file that contains multiple ASU commands, each on its own line. - -\ **-d|-**\ **-donotfilter**\ - + +\ **-d|-**\ **-donotfilter**\ + By default, pasu filters out (i.e. does not display) the standard initial output from ASU: - - + + .. code-block:: perl - + IBM Advanced Settings Utility version 9.30.79N Licensed Materials - Property of IBM (C) Copyright IBM Corp. 2007-2012 All Rights Reserved Connected to IMM at IP address node2-imm - - + + If you want this output to be displayed, use this flag. - -\ **-i|-**\ **-interface**\ \ *hostname-suffix*\ - + +\ **-i|-**\ **-interface**\ \ *hostname-suffix*\ + The hostname suffix to be appended to the node names. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Display verbose messages. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - + @@ -127,147 +127,147 @@ EXAMPLES 1. - + To display the Com1ActiveAfterBoot setting on 2 nodes: - - + + .. code-block:: perl - + pasu node1,node2 show DevicesandIOPorts.Com1ActiveAfterBoot - - + + Output is similar to: - - + + .. code-block:: perl - + node1: DevicesandIOPorts.Com1ActiveAfterBoot=Enable node2: DevicesandIOPorts.Com1ActiveAfterBoot=Enable - - + + 2. - + To display the Com1ActiveAfterBoot setting on all compute nodes: - - + + .. code-block:: perl - + pasu compute show DevicesandIOPorts.Com1ActiveAfterBoot | xcoll - - + + Output is similar to: - - + + .. code-block:: perl - + ==================================== compute ==================================== DevicesandIOPorts.Com1ActiveAfterBoot=Enable - - + + 3. - + To set several settings on all compute nodes, create a batch file called (for example) asu-settings with contents: - - + + .. code-block:: perl - + set DevicesandIOPorts.Com1ActiveAfterBoot Enable set DevicesandIOPorts.SerialPortSharing Enable set DevicesandIOPorts.SerialPortAccessMode Dedicated set DevicesandIOPorts.RemoteConsole Enable - - + + Then run: - - + + .. code-block:: perl - + pasu -b asu-settings compute | xcoll - - + + Output is similar to: - - + + .. code-block:: perl - + ==================================== compute ==================================== Batch mode start. [set DevicesandIOPorts.Com1ActiveAfterBoot Enable] DevicesandIOPorts.Com1ActiveAfterBoot=Enable - + [set DevicesandIOPorts.SerialPortSharing Enable] DevicesandIOPorts.SerialPortSharing=Enable - + [set DevicesandIOPorts.SerialPortAccessMode Dedicated] DevicesandIOPorts.SerialPortAccessMode=Dedicated - + [set DevicesandIOPorts.RemoteConsole Enable] DevicesandIOPorts.RemoteConsole=Enable - + Beginning intermediate batch update. Waiting for command completion status. Command completed successfully. Completed intermediate batch update. Batch mode competed successfully. - - + + 4. - + To confirm that all the settings were made on all compute nodes, create a batch file called (for example) asu-show with contents: - - + + .. code-block:: perl - + show DevicesandIOPorts.Com1ActiveAfterBoot show DevicesandIOPorts.SerialPortSharing show DevicesandIOPorts.SerialPortAccessMode show DevicesandIOPorts.RemoteConsole - - + + Then run: - - + + .. code-block:: perl - + pasu -b asu-show compute | xcoll - - + + Output is similar to: - - + + .. code-block:: perl - + ==================================== compute ==================================== Batch mode start. [show DevicesandIOPorts.Com1ActiveAfterBoot] DevicesandIOPorts.Com1ActiveAfterBoot=Enable - + [show DevicesandIOPorts.SerialPortSharing] DevicesandIOPorts.SerialPortSharing=Enable - + [show DevicesandIOPorts.SerialPortAccessMode] DevicesandIOPorts.SerialPortAccessMode=Dedicated - + [show DevicesandIOPorts.RemoteConsole] DevicesandIOPorts.RemoteConsole=Enable - + Batch mode competed successfully. - - + + From 308648121f2ebc8b40eff080520d3a122a4c9ee2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0342/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/pcons.1.rst --- docs/source/guides/admin-guides/references/man1/pcons.1.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/pcons.1.rst b/docs/source/guides/admin-guides/references/man1/pcons.1.rst index 25cd3dce7..27cf7e628 100644 --- a/docs/source/guides/admin-guides/references/man1/pcons.1.rst +++ b/docs/source/guides/admin-guides/references/man1/pcons.1.rst @@ -11,12 +11,12 @@ SYNOPSIS ******** -\ **pcons**\ \ *noderange*\ \ *command*\ +\ **pcons**\ \ *noderange*\ \ *command*\ -\ **pcons**\ +\ **pcons**\ [\ **-h | -**\ **-help**\ ] -\ **pcons**\ +\ **pcons**\ [\ **-v | -**\ **-version**\ ] From 230dae66c2094d2fc3b1c2bd66e3bc0ec8e148f9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0343/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst --- .../references/man1/pgsqlsetup.1.rst | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst b/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst index 8e16004c7..e291a087b 100644 --- a/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst +++ b/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst @@ -33,7 +33,7 @@ DESCRIPTION *********** -\ **pgsqlsetup**\ - Sets up the PostgreSQL database for xCAT to use. The pgsqlsetup script is run on the Management Node as root after the PostgreSQL code has been installed. The xcatd daemon will be stopped during migration. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to PostgreSQL and restarting the xcatd daemon as well as the PostgreSQL daemon. For full information on all the steps that will be done reference +\ **pgsqlsetup**\ - Sets up the PostgreSQL database for xCAT to use. The pgsqlsetup script is run on the Management Node as root after the PostgreSQL code has been installed. The xcatd daemon will be stopped during migration. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to PostgreSQL and restarting the xcatd daemon as well as the PostgreSQL daemon. For full information on all the steps that will be done reference One password must be supplied for the setup, a password for the xcatadm unix id and the same password for the xcatadm database id. The password will be prompted for interactively or you can set the XCATPGPW environment variable to the password and then there will be no prompt. @@ -43,62 +43,62 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Displays the usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Displays the release version of the code. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Displays verbose messages. - -\ **-i|-**\ **-init**\ - - The init option is used to setup an installed PostgreSQL database so that xCAT can use the database. This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server. It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database. + +\ **-i|-**\ **-init**\ + + The init option is used to setup an installed PostgreSQL database so that xCAT can use the database. This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server. It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database. On AIX, it additionally setup the xcatadm unix id and the postgres id and group. For AIX, you should be using the PostgreSQL rpms available from the xCAT website. For Linux, you should use the PostgreSQL rpms shipped with the OS. You can chose the -o option, to run after the init. To add additional nodes to access the PostgreSQL server, setup on the Management Node, use the -a option. - + For more documentation see:Setting_Up_PostgreSQL_as_the_xCAT_DB - -\ **-N|-**\ **-nostart**\ - + +\ **-N|-**\ **-nostart**\ + This option with the -i flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database. This can be used to setup the xCAT PostgreSQL database during or before install. - -\ **-l|-**\ **-listen**\ \ *address*\ - + +\ **-l|-**\ **-listen**\ \ *address*\ + This option is used to specify additional IP addresses on which the PostgreSQL database will listen. Without it, only localhost (on Linux) and the management node's main IP (on Linux and AIX) will be configured. This option can be specified multiple times. - -\ **-a|-**\ **-access**\ \ *address*\ - + +\ **-a|-**\ **-access**\ \ *address*\ + This option is used to specify additional IP addresses from which the additional nodes will connect to the PostgreSQL database, for example, service nodes IP addresses or MN HA primary/standby nodes physical IP addresses. Without it, only the management node will be configured for database access. This option can be specified multiple times. - -\ **-P|-**\ **-PCM**\ - + +\ **-P|-**\ **-PCM**\ + This option sets up PostgreSQL database to be used with xCAT running with PCM. - -\ **-o|-**\ **-odbc**\ - + +\ **-o|-**\ **-odbc**\ + This option sets up the ODBC /etc/../odbcinst.ini, /etc/../odbc.ini and the .odbc.ini file in roots home directory will be created and initialized to run off the xcatdb PostgreSQL database. - + @@ -108,10 +108,10 @@ ENVIRONMENT VARIABLES -\ **XCATPGPW**\ - +\ **XCATPGPW**\ + The password to be used to setup the xCAT admin id for the database. - + @@ -122,22 +122,22 @@ EXAMPLES 1. To setup PostgreSQL for xCAT to run on the PostgreSQL xcatdb database : - - + + .. code-block:: perl - + pgsqlsetup -i - - + + 2. To setup the ODBC for PostgreSQL xcatdb database access : - - + + .. code-block:: perl - + pgsqlsetup -o - - + + From 696dc3d60709d131b781f679a2417fb3ef88b82a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0344/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/pping.1.rst --- .../admin-guides/references/man1/pping.1.rst | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/pping.1.rst b/docs/source/guides/admin-guides/references/man1/pping.1.rst index 92e680380..20bad2a90 100644 --- a/docs/source/guides/admin-guides/references/man1/pping.1.rst +++ b/docs/source/guides/admin-guides/references/man1/pping.1.rst @@ -11,7 +11,7 @@ SYNOPSIS ******** -\ **pping**\ [\ **-i | -**\ **-interface**\ \ *interfaces*\ ] [\ **-f | -**\ **-use_fping**\ ] \ *noderange*\ +\ **pping**\ [\ **-i | -**\ **-interface**\ \ *interfaces*\ ] [\ **-f | -**\ **-use_fping**\ ] \ *noderange*\ \ **pping**\ [\ **-h | -**\ **-help**\ ] @@ -36,32 +36,32 @@ OPTIONS -\ **-i | -**\ **-interface**\ \ *interfaces*\ - +\ **-i | -**\ **-interface**\ \ *interfaces*\ + A comma separated list of network interface names that should be pinged instead of the interface represented by the nodename/hostname. The following name resolution convention is assumed: an interface is reachable by the hostname -. For example, the ib2 interface on node3 has a hostname of node3-ib2. - + If more than one interface is specified, each interface will be combined with the nodenames as described above and will be pinged in turn. - -\ **-f | -**\ **-use_fping**\ - - Use \ **fping**\ instead of \ **nmap**\ - + +\ **-f | -**\ **-use_fping**\ + + Use \ **fping**\ instead of \ **nmap**\ -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Show usage information. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display the installed version of xCAT. - + @@ -72,46 +72,46 @@ EXAMPLES 1. - - + + .. code-block:: perl - + pping all - - + + Output is similar to: - - + + .. code-block:: perl - + node1: ping node2: ping node3: noping - - + + 2. - - + + .. code-block:: perl - + pping all -i ib0,ib1 - - + + Output is similar to: - - + + .. code-block:: perl - + node1-ib0: ping node2-ib0: ping node3-ib0: noping node1-ib1: ping node2-ib1: ping node3-ib1: noping - - + + From 2d91f4b92d2b240a5cc2ba3621ada21af8d15e88 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0345/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/ppping.1.rst --- .../admin-guides/references/man1/ppping.1.rst | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/ppping.1.rst b/docs/source/guides/admin-guides/references/man1/ppping.1.rst index c957e330d..2dd33df35 100644 --- a/docs/source/guides/admin-guides/references/man1/ppping.1.rst +++ b/docs/source/guides/admin-guides/references/man1/ppping.1.rst @@ -11,7 +11,7 @@ SYNOPSIS ******** -\ **ppping**\ [\ **-i | -**\ **-interface**\ \ *interfaces*\ ] [\ **-d | -**\ **-debug**\ ] [\ **-V | -**\ **-verbose**\ ] [\ **-q | -**\ **-quiet**\ ] [\ **-s | -**\ **-serial**\ ] \ *noderange*\ +\ **ppping**\ [\ **-i | -**\ **-interface**\ \ *interfaces*\ ] [\ **-d | -**\ **-debug**\ ] [\ **-V | -**\ **-verbose**\ ] [\ **-q | -**\ **-quiet**\ ] [\ **-s | -**\ **-serial**\ ] \ *noderange*\ \ **ppping**\ [\ **-h | -**\ **-help**\ ] @@ -35,52 +35,52 @@ OPTIONS -\ **-s**\ - +\ **-s**\ + Ping serially instead of in parallel. - -\ **-i | -**\ **-interface**\ \ *interfaces*\ - + +\ **-i | -**\ **-interface**\ \ *interfaces*\ + A comma separated list of network interface names that should be pinged instead of the interface represented by the nodename/hostname. The following name resolution convention is assumed: an interface is reachable by the hostname -. For example, the ib2 interface on node3 has a hostname of node3-ib2. - + If more than one interface is specified, each interface will be combined with the nodenames as described above and will be pinged in turn. - -\ **-V | -**\ **-verbose**\ - + +\ **-V | -**\ **-verbose**\ + Display verbose output. The result of every ping attempt from every node will be displayed. Without this option, just a summary of the successful pings are displayed, along with all of the unsuccessful pings. - -\ **-q | -**\ **-quiet**\ - + +\ **-q | -**\ **-quiet**\ + Display minimum output: just the unsuccessful pings. This option has the effect that if all pings are successful, nothing is displayed. But it also has the performance benefit that each node does not have to send successful ping info back to the management node. - -\ **-d | -**\ **-debug**\ - + +\ **-d | -**\ **-debug**\ + Print debug information. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Show usage information. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display the installed version of xCAT. - + @@ -91,40 +91,40 @@ EXAMPLES 1. - - + + .. code-block:: perl - + ppping all -q - - + + Output is similar to: - - + + .. code-block:: perl - + blade7: node2: noping blade8: node2: noping blade9: node2: noping devmaster: node2: noping node2: noping - - + + 2. - - + + .. code-block:: perl - + ppping node1,node2 -i ib0,ib1,ib2,ib3 - - + + Output is similar to: - - + + .. code-block:: perl - + node1: pinged all nodes successfully on interface ib0 node1: pinged all nodes successfully on interface ib1 node1: pinged all nodes successfully on interface ib2 @@ -133,8 +133,8 @@ EXAMPLES node2: pinged all nodes successfully on interface ib1 node2: pinged all nodes successfully on interface ib2 node2: pinged all nodes successfully on interface ib3 - - + + From c586614d63b2c255e62289d97153dd68bba676eb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0346/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/prsync.1.rst --- .../admin-guides/references/man1/prsync.1.rst | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/prsync.1.rst b/docs/source/guides/admin-guides/references/man1/prsync.1.rst index 7bee4871f..55e447be7 100644 --- a/docs/source/guides/admin-guides/references/man1/prsync.1.rst +++ b/docs/source/guides/admin-guides/references/man1/prsync.1.rst @@ -15,20 +15,20 @@ prsync - parallel rsync **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** -\ **prsync**\ \ *filename*\ [\ *filename*\ \ *...*\ ] \ *noderange:destinationdirectory*\ +\ **prsync**\ \ *filename*\ [\ *filename*\ \ *...*\ ] \ *noderange:destinationdirectory*\ \ **prsync**\ [\ **-o**\ \ *rsyncopts*\ ] [\ **-f**\ \ *fanout*\ ] [\ *filename*\ \ *filename*\ \ *...*\ ] [\ *directory*\ \ *directory*\ \ *...*\ ] -\ *noderange:destinationdirectory*\ +\ *noderange:destinationdirectory*\ \ **prsync**\ {\ **-h | -**\ **-help | -v | -**\ **-version**\ } ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -40,91 +40,91 @@ Note: this command does not support the xcatd client/server communication and t *************** -\ **Options**\ +\ **Options**\ *************** -\ **-o**\ \ *rsyncopts*\ - +\ **-o**\ \ *rsyncopts*\ + rsync options. See \ **rsync(1)**\ . - -\ **-f**\ \ *fanout*\ - + +\ **-f**\ \ *fanout*\ + Specifies a fanout value for the maximum number of concurrently executing remote shell processes. - -\ *filename*\ - + +\ *filename*\ + A space delimited list of files to rsync. - -\ *directory*\ - + +\ *directory*\ + A space delimited list of directories to rsync. - -\ *noderange:destination*\ - + +\ *noderange:destination*\ + A noderange(3)|noderange.3 and destination directory. The : is required. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - -\ **XCATPSHFANOUT**\ - + +\ **XCATPSHFANOUT**\ + Specifies the fanout value. This variable is overridden by the \ **-f**\ flag. Default is 64. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. - - + + .. code-block:: perl - + cd /install; prsync -o "crz" post stage:/install - - + + 2. - - + + .. code-block:: perl - + prsync passwd group rack01:/etc - - + + ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From 644124889efd3d6f9a93f0eebeafc895d5d3d750 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0347/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/pscp.1.rst --- .../admin-guides/references/man1/pscp.1.rst | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/pscp.1.rst b/docs/source/guides/admin-guides/references/man1/pscp.1.rst index 48d9a2af9..0a98b5f2d 100644 --- a/docs/source/guides/admin-guides/references/man1/pscp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/pscp.1.rst @@ -15,17 +15,17 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** -\ **pscp**\ [\ **-i**\ \ *suffix*\ ] [\ *scp options*\ \ *...*\ ] [\ **-f**\ \ *fanout*\ ] \ *filename*\ [\ *filename*\ \ *...*\ ] \ *noderange:destinationdirectory*\ +\ **pscp**\ [\ **-i**\ \ *suffix*\ ] [\ *scp options*\ \ *...*\ ] [\ **-f**\ \ *fanout*\ ] \ *filename*\ [\ *filename*\ \ *...*\ ] \ *noderange:destinationdirectory*\ \ **pscp**\ {\ **-h | -**\ **-help | -v | -**\ **-version**\ } ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -41,92 +41,92 @@ management node to the compute node via a service node. *************** -\ **Options**\ +\ **Options**\ *************** -\ **-f**\ \ *fanout*\ - +\ **-f**\ \ *fanout*\ + Specifies a fanout value for the maximum number of concur- rently executing remote shell processes. - -\ **-i**\ \ *suffix*\ - + +\ **-i**\ \ *suffix*\ + Interfaces to be used. - -\ *scp options*\ - - See \ **scp(1)**\ - + +\ *scp options*\ + + See \ **scp(1)**\ -\ *filename*\ - + +\ *filename*\ + A space delimited list of files to copy. If \ **-r**\ is passed as an scp option, directories may be specified as well. - -\ *noderange:destination*\ - + +\ *noderange:destination*\ + A noderange(3)|noderange.3 and destination directory. The : is required. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - -\ **XCATPSHFANOUT**\ - + +\ **XCATPSHFANOUT**\ + Specifies the fanout value. This variable is overridden by the \ **-f**\ flag. Default is 64. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. - - + + .. code-block:: perl - + pscp -r /usr/local node1,node3:/usr/local - - + + 2. - - + + .. code-block:: perl - + pscp passwd group rack01:/etc - - + + ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From 85bed71c81586ba3ca0525f18500492cf322c27c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0348/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/psh.1.rst --- .../admin-guides/references/man1/psh.1.rst | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/psh.1.rst b/docs/source/guides/admin-guides/references/man1/psh.1.rst index e264a9e75..dc847a489 100644 --- a/docs/source/guides/admin-guides/references/man1/psh.1.rst +++ b/docs/source/guides/admin-guides/references/man1/psh.1.rst @@ -15,17 +15,17 @@ psh - parallel remote shell **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** -\ **psh**\ [\ **-i**\ \ *interface*\ ] [\ **-f**\ \ *fanout*\ ] [\ **-l**\ \ *user*\ ] \ *noderange*\ \ *command*\ +\ **psh**\ [\ **-i**\ \ *interface*\ ] [\ **-f**\ \ *fanout*\ ] [\ **-l**\ \ *user*\ ] \ *noderange*\ \ *command*\ \ **psh**\ {\ **-h | -**\ **-help | -v | -**\ **-version**\ } ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -44,129 +44,129 @@ management node to the compute node via a service node. *************** -\ **Options**\ +\ **Options**\ *************** -\ **-i**\ \ *interface*\ - +\ **-i**\ \ *interface*\ + The NIC on the node that psh should communicate with. For example, if \ *interface*\ is \ **eth1**\ , then psh will concatenate \ **-eth1**\ to the end of every node name before ssh'ing to it. This assumes those host names have been set up to resolve to the IP address of each of the eth1 NICs. - -\ **-f**\ \ *fanout*\ - + +\ **-f**\ \ *fanout*\ + Specifies a fanout value for the maximum number of concur- rently executing remote shell processes. - -\ **-l**\ \ *user*\ - + +\ **-l**\ \ *user*\ + Log into the nodes as the specified username. The default is to use the same username as you are running the psh command as. - -\ **-n|-**\ **-nonodecheck**\ - + +\ **-n|-**\ **-nonodecheck**\ + Do not send the noderange to xcatd to expand it into a list of nodes. Instead, use the noderange exactly as it is specified. In this case, the noderange must be a simple list of comma-separated hostnames of the nodes. This allows you to run \ **psh**\ even when xcatd is not running. - -\ *noderange*\ - + +\ *noderange*\ + See noderange(3)|noderange.3. - -\ *command*\ - - Command to be run in parallel. If no command is give then \ **psh**\ + +\ *command*\ + + Command to be run in parallel. If no command is give then \ **psh**\ enters interactive mode. In interactive mode a ">" prompt is displayed. Any command entered is executed in parallel to the nodes in the noderange. Use "exit" or "Ctrl-D" to end the interactive session. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - + ************************************* -\ **Environment**\ \ **Variables**\ +\ **Environment**\ \ **Variables**\ ************************************* -\ **XCATPSHFANOUT**\ - +\ **XCATPSHFANOUT**\ + Specifies the fanout value. This variable is overridden by the \ **-f**\ flag. Default is 64. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. Run uptime on 3 nodes: - - + + .. code-block:: perl - + psh node4-node6 uptime - - + + Output is similar to: - - + + .. code-block:: perl - + node4: Sun Aug 5 17:42:06 MDT 2001 node5: Sun Aug 5 17:42:06 MDT 2001 node6: Sun Aug 5 17:42:06 MDT 2001 - - + + 2. Run a command on some BladeCenter management modules: - - + + .. code-block:: perl - + psh amm1-amm5 'info -T mm[1]' - - + + 3. Remove the tmp files on the nodes in the 1st frame: - - + + .. code-block:: perl - + psh rack01 'rm -f /tmp/*' - - + + Notice the use of '' to forward shell expansion. This is not necessary in interactive mode. - + ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From ba9df903e966fcece3721e1c59182cf9563b0bf0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0349/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst --- .../references/man1/pushinitrd.1.rst | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst b/docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst index 7b1ea8919..42e359602 100644 --- a/docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst +++ b/docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst @@ -49,24 +49,24 @@ OPTIONS -\ **-w**\ \ *waittime*\ - +\ **-w**\ \ *waittime*\ + The number of seconds the initrd should wait before trying to communicate over the network. The default is 75. This translates into the netwait kernel parameter and is usually needed in a SoftLayer environment because it can take a while for a NIC to be active after changing state. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - + @@ -87,15 +87,15 @@ EXAMPLES 1. - + Configure nodes for net installing in a SoftLayer environment: - - + + .. code-block:: perl - + pushinitrd - - + + From 1846431a1fb6afeb26793ada22a8b86da1bd7e94 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0350/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rbootseq.1.rst --- .../references/man1/rbootseq.1.rst | 112 +++++++++--------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rbootseq.1.rst b/docs/source/guides/admin-guides/references/man1/rbootseq.1.rst index fece3a79f..6075619ea 100644 --- a/docs/source/guides/admin-guides/references/man1/rbootseq.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rbootseq.1.rst @@ -17,21 +17,21 @@ Blade specific: =============== -\ **rbootseq**\ \ *noderange*\ {\ **hd0 | hd1 | hd2 | hd3 | net | iscsi | iscsicrit | cdrom | usbflash | floppy | none | list | stat**\ }\ **,**\ \ *...*\ +\ **rbootseq**\ \ *noderange*\ {\ **hd0 | hd1 | hd2 | hd3 | net | iscsi | iscsicrit | cdrom | usbflash | floppy | none | list | stat**\ }\ **,**\ \ *...*\ HP Blade specific: ================== -\ **rbootseq**\ \ *noderange*\ {\ **hd | net1 | net2 | net3 | net4 | cdrom | usbflash | floppy | none**\ }\ **,**\ \ *...*\ +\ **rbootseq**\ \ *noderange*\ {\ **hd | net1 | net2 | net3 | net4 | cdrom | usbflash | floppy | none**\ }\ **,**\ \ *...*\ PPC (using Direct FSP Management) specific: =========================================== -\ **rbootseq**\ \ *noderange*\ \ **[hfi|net]**\ +\ **rbootseq**\ \ *noderange*\ \ **[hfi|net]**\ @@ -58,106 +58,106 @@ OPTIONS -\ **hd0 | harddisk0 | hd | harddisk**\ - +\ **hd0 | harddisk0 | hd | harddisk**\ + The first hard disk. - -\ **hd1 | harddisk1**\ - + +\ **hd1 | harddisk1**\ + The second hard disk. - -\ **hd2 | harddisk2**\ - + +\ **hd2 | harddisk2**\ + The third hard disk. - -\ **hd3 | harddisk3**\ - + +\ **hd3 | harddisk3**\ + The fourth hard disk. - -\ **n | net | network**\ - + +\ **n | net | network**\ + Boot over the ethernet network, using a PXE or BOOTP broadcast. - + \ **n | net | network | net1 | nic1**\ (HP Blade Only) - + Boot over the first ethernet network, using a PXE or BOOTP broadcast. - + \ **net2 | nic2**\ (HP Blade Only) - + Boot over the second ethernet network, using a PXE or BOOTP broadcast. - + \ **net3 | nic3**\ (HP Blade Only) - + Boot over the third ethernet network, using a PXE or BOOTP broadcast. - + \ **net3 | nic3**\ (HP Blade Only) - + Boot over the fourth ethernet network, using a PXE or BOOTP broadcast. - -\ **hfi**\ - + +\ **hfi**\ + Boot p775 nodes over the HFI network, using BOOTP broadcast. - -\ **iscsi**\ - + +\ **iscsi**\ + Boot to an iSCSI disk over the network. - -\ **iscsicrit**\ - + +\ **iscsicrit**\ + ?? - -\ **cd | cdrom**\ - + +\ **cd | cdrom**\ + The CD or DVD drive. - -\ **usbflash | usb | flash**\ - + +\ **usbflash | usb | flash**\ + A USB flash drive. - -\ **floppy**\ - + +\ **floppy**\ + The floppy drive. - -\ **none**\ - + +\ **none**\ + If it gets to this part of the sequence, do not boot. Can not be specified 1st, or before any real boot devices. - -\ **list | stat**\ - + +\ **list | stat**\ + Display the current boot sequence. - + @@ -168,16 +168,16 @@ EXAMPLES 1. - + Set blades 14-56 and 70-203 to try to boot first from the CD drive, then the floppy drive, then the network, and finally from the 1st hard disk: - - + + .. code-block:: perl - + rbootseq blade[14-56],blade[70-203] c,f,n,hd0 - - + + From 912359ff5b288de83a7e4d18aec7ffd5ef02f54b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0351/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rcons.1.rst --- .../admin-guides/references/man1/rcons.1.rst | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rcons.1.rst b/docs/source/guides/admin-guides/references/man1/rcons.1.rst index 394edb226..0a9ddc63a 100644 --- a/docs/source/guides/admin-guides/references/man1/rcons.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rcons.1.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -25,7 +25,7 @@ Name ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -39,41 +39,41 @@ To exit the console session, enter: 'ctrl-e c .' (3 characters: ctrl-e, 'c' and *************** -\ **Options**\ +\ **Options**\ *************** -\ **-f**\ - +\ **-f**\ + If another console for this node is already open in read-write mode, force that console into read-only (spy) mode, and open this console in read-write mode. If -f is not specified, this console will be put in spy mode if another console is already open in read-write mode. The -f flag can not be used with the -s flag. - -\ **-s**\ - - Open the console in read-only (spy) mode, in this mode all the escape sequences work, but all other keyboard input is + +\ **-s**\ + + Open the console in read-only (spy) mode, in this mode all the escape sequences work, but all other keyboard input is discarded. The -s flag can not be used with the -f flag. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - + ************* -\ **Files**\ +\ **Files**\ ************* @@ -84,7 +84,7 @@ method. **************** -\ **Examples**\ +\ **Examples**\ **************** @@ -96,7 +96,7 @@ method. ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From 15453e2c41969859cc40287e006d1f9384b9bfe2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0352/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/regnotif.1.rst --- .../source/guides/admin-guides/references/man1/regnotif.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/regnotif.1.rst b/docs/source/guides/admin-guides/references/man1/regnotif.1.rst index 2460784b2..17d38a4c5 100644 --- a/docs/source/guides/admin-guides/references/man1/regnotif.1.rst +++ b/docs/source/guides/admin-guides/references/man1/regnotif.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **regnotif [-h| -**\ **-help]**\ +\ **regnotif [-h| -**\ **-help]**\ -\ **regnotif [-v| -**\ **-version]**\ +\ **regnotif [-v| -**\ **-version]**\ \ **regnotif**\ \ *filename tablename[,tablename]...*\ [\ **-o | -**\ **-operation**\ \ *actions*\ ] From dee7199dc2cdbeef2a38d5206fae525012bb5ee8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0353/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/renergy.1.rst --- .../references/man1/renergy.1.rst | 840 +++++++++--------- 1 file changed, 420 insertions(+), 420 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/renergy.1.rst b/docs/source/guides/admin-guides/references/man1/renergy.1.rst index 59a787916..d9e5a5be4 100644 --- a/docs/source/guides/admin-guides/references/man1/renergy.1.rst +++ b/docs/source/guides/admin-guides/references/man1/renergy.1.rst @@ -7,7 +7,7 @@ renergy.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,7 +15,7 @@ renergy.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** @@ -23,102 +23,102 @@ renergy.1 \ **renergy**\ [\ **-v**\ | \ **-**\ **-version**\ ] -\ **Power 6 server specific :**\ +\ **Power 6 server specific :**\ \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **all | [savingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime]**\ } \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **savingstatus={on | off} | cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage**\ } -\ **Power 7 server specific :**\ +\ **Power 7 server specific :**\ \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **all | [savingstatus] [dsavingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue]**\ } \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ | cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage**\ } -\ **Power 8 server specific :**\ +\ **Power 8 server specific :**\ \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **all | [savingstatus] [dsavingstatus] [averageAC] [averageAChistory] [averageDC] [averageDChistory] [ambienttemp] [ambienttemphistory] [exhausttemp] [exhausttemphistory] [fanspeed] [fanspeedhistory] [CPUspeed] [CPUspeedhistory] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue]**\ } -\ **renergy**\ \ *noderange*\ \ **[-V] {savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ }**\ +\ **renergy**\ \ *noderange*\ \ **[-V] {savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ }**\ -\ *NOTE:*\ The setting operation for \ **Power 8**\ server is only supported -for the server which is running in PowerVM mode. Do NOT run the setting +\ *NOTE:*\ The setting operation for \ **Power 8**\ server is only supported +for the server which is running in PowerVM mode. Do NOT run the setting for the server which is running in OPAL mode. -\ **BladeCenter specific :**\ +\ **BladeCenter specific :**\ -\ **For Management Modules:**\ +\ **For Management Modules:**\ \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **all | pd1all | pd2all | [pd1status] [pd2status] [pd1policy] [pd2policy] [pd1powermodule1] [pd1powermodule2] [pd2powermodule1] [pd2powermodule2] [pd1avaiablepower] [pd2avaiablepower] [pd1reservedpower] [pd2reservedpower] [pd1remainpower] [pd2remainpower] [pd1inusedpower] [pd2inusedpower] [availableDC] [averageAC] [thermaloutput] [ambienttemp] [mmtemp]**\ } -\ **For a blade server nodes:**\ +\ **For a blade server nodes:**\ \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **all | [averageDC] [capability] [cappingvalue] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus]**\ } \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off}**\ } -\ **Flex specific :**\ +\ **Flex specific :**\ -\ **For Flex Management Modules:**\ +\ **For Flex Management Modules:**\ \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **all | [powerstatus] [powerpolicy] [powermodule] [avaiablepower] [reservedpower] [remainpower] [inusedpower] [availableDC] [averageAC] [thermaloutput] [ambienttemp] [mmtemp]**\ } -\ **For Flex node (power and x86):**\ +\ **For Flex node (power and x86):**\ \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **all | [averageDC] [capability] [cappingvalue] [cappingmaxmin] [cappingmax] [cappingmin] [cappingGmin] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus]**\ } \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage | savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off}**\ } -\ **iDataPlex specific :**\ +\ **iDataPlex specific :**\ \ **renergy**\ \ *noderange*\ [\ **-V**\ ] [{\ **cappingmaxmin | cappingmax | cappingmin}] [cappingstatus] [cappingvalue] [relhistogram]**\ } \ **renergy**\ \ *noderange*\ [\ **-V**\ ] {\ **cappingstatus={on | enable | off | disable} | {cappingwatt|cappingvalue}=watt**\ } -\ **OpenPOWER server specific :**\ +\ **OpenPOWER server specific :**\ \ **renergy**\ \ *noderange*\ {\ **powerusage | temperature**\ } ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* This \ **renergy**\ command can be used to manage the energy consumption of -IBM servers which support IBM EnergyScale technology. Through this command, -user can query and set the power saving and power capping status, and also can -query the average consumed energy, the ambient and exhaust temperature, +IBM servers which support IBM EnergyScale technology. Through this command, +user can query and set the power saving and power capping status, and also can +query the average consumed energy, the ambient and exhaust temperature, the processor frequency for a server. \ **renergy**\ command supports IBM POWER6, POWER7 and POWER8 rack-mounted servers, -BladeCenter management modules, blade servers, and iDataPlex servers. +BladeCenter management modules, blade servers, and iDataPlex servers. For \ *Power6*\ and \ *Power7*\ rack-mounted servers, the following specific hardware types are supported: \ *8203-E4A*\ , \ *8204-E8A*\ , \ *9125-F2A*\ , \ *8233-E8B*\ , \ *8236-E8C*\ . For \ *Power8*\ server, there's no hardware type restriction. -The parameter \ *noderange*\ needs to be specified for the \ **renergy**\ command to -get the target servers. The \ *noderange*\ should be a list of CEC node names, blade +The parameter \ *noderange*\ needs to be specified for the \ **renergy**\ command to +get the target servers. The \ *noderange*\ should be a list of CEC node names, blade management module node names or blade server node names. Lpar name is not acceptable here. -\ **renergy**\ command can accept multiple of energy attributes to query or one of energy -attribute to set. If only the attribute name is specified, without the '=', \ **renergy**\ -gets and displays the current value. Otherwise, if specifying the attribute with '=' like +\ **renergy**\ command can accept multiple of energy attributes to query or one of energy +attribute to set. If only the attribute name is specified, without the '=', \ **renergy**\ +gets and displays the current value. Otherwise, if specifying the attribute with '=' like 'savingstatus=on', \ **renergy**\ will set the attribute savingstatus to value 'on'. -The attributes listed in the \ **SYNOPSIS**\ section are which ones can be handled by +The attributes listed in the \ **SYNOPSIS**\ section are which ones can be handled by \ **renergy**\ command. But for each specific type of server, there are some attributes that are not supported. If user specifies an attribute which is not supported by a specific server, the return value of this attribute will be 'na'. @@ -128,7 +128,7 @@ server, the return value of this attribute will be 'na'. The supported attributes for each specific system p hardware type is listed as follows: -\ **8203-E4A**\ , \ **8204-E8A**\ +\ **8203-E4A**\ , \ **8204-E8A**\ Supported attributes: @@ -139,7 +139,7 @@ exhausttemp,CPUspeed,syssbpower,sysIPLtime \ **Set**\ : savingstatus,cappingstatus,cappingwatt,cappingperc -\ **9125-F2A**\ +\ **9125-F2A**\ Supported attributes: @@ -149,7 +149,7 @@ CPUspeed \ **Set**\ : savingstatus -\ **8233-E8B**\ , \ **8236-E8C**\ +\ **8233-E8B**\ , \ **8236-E8C**\ Supported attributes: @@ -161,7 +161,7 @@ ambienttemp,exhausttemp,CPUspeed,syssbpower,sysIPLtime \ **Set**\ : savingstatus,dsavingstatus,cappingstatus,cappingwatt, cappingperc -\ **9125-F2C**\ , \ **9119-FHB**\ +\ **9125-F2C**\ , \ **9119-FHB**\ Supported attributes: @@ -174,10 +174,10 @@ fsavingstatus,ffoMin,ffoVmin,ffoTurbo,ffoNorm,ffovalue \ **Set**\ : savingstatus,dsavingstatus,cappingstatus,cappingwatt, cappingperc,fsavingstatus,ffovalue -\ **Non of Above**\ +\ **Non of Above**\ -For the machine type which is not in the above list, the following +For the machine type which is not in the above list, the following attributes can be tried but not guaranteed: \ **Query**\ : savingstatus,dsavingstatus,cappingstatus,cappingmin, @@ -188,25 +188,25 @@ ambienttemp,exhausttemp,CPUspeed,syssbpower,sysIPLtime cappingperc Note: -For system P CEC nodes, each query operation for attribute CPUspeed, averageAC +For system P CEC nodes, each query operation for attribute CPUspeed, averageAC or averageDC needs about 30 seconds to complete. The query for others attributes will get response immediately. ********************* -\ **PREREQUISITES**\ +\ **PREREQUISITES**\ ********************* -For the \ *Power6*\ and \ *Power7*\ nodes, the \ **renergy**\ command depends -on the Energy Management Plugin \ **xCAT-pEnergy**\ to -communicate with server. \ **xCAT-pEnergy**\ can be downloaded from the IBM web site: +For the \ *Power6*\ and \ *Power7*\ nodes, the \ **renergy**\ command depends +on the Energy Management Plugin \ **xCAT-pEnergy**\ to +communicate with server. \ **xCAT-pEnergy**\ can be downloaded from the IBM web site: http://www.ibm.com/support/fixcentral/. (Other Software -> EM) NOTE: \ *Power8*\ nodes don't need this specific energy management package. -For iDataPlex nodes, the \ **renergy**\ command depends -on the Energy Management Plugin \ **xCAT-xEnergy**\ to +For iDataPlex nodes, the \ **renergy**\ command depends +on the Energy Management Plugin \ **xCAT-xEnergy**\ to communicate with server. This plugin must be requested from IBM. (The support for BladeCenter energy management is built into base xCAT, @@ -214,519 +214,519 @@ so no additional plugins are needed for BladeCenter.) *************** -\ **OPTIONS**\ +\ **OPTIONS**\ *************** -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Display the usage message. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display the version information. - -\ **-V**\ - + +\ **-V**\ + Verbose output. - -\ **all**\ - - Query all energy attributes which supported by the specific + +\ **all**\ + + Query all energy attributes which supported by the specific type of hardware. - + For \ *Power8*\ machines, will not display the attributes for historical records. - -\ **pd1all**\ - + +\ **pd1all**\ + Query all energy attributes of the power domain 1 for blade management module node. - -\ **pd2all**\ - + +\ **pd2all**\ + Query all energy attributes of the power domain 2 for blade management module node. - -\ **ambienttemp**\ - + +\ **ambienttemp**\ + Query the current ambient temperature. (Unit is centigrade) - -\ **ambienttemphistory**\ - + +\ **ambienttemphistory**\ + Query the historical records which were generated in last one hour for \ **ambienttemp**\ . - -\ **availableDC**\ - + +\ **availableDC**\ + Query the total DC power available for the entire blade center chassis. - -\ **averageAC**\ - + +\ **averageAC**\ + Query the average power consumed (Input). (Unit is watt) - - Note: For 9125-F2A,9125-F2C server, the value of attribute + + Note: For 9125-F2A,9125-F2C server, the value of attribute averageAC is the aggregate for all of the servers in a rack. - - Note: For Blade Center, the value of attribute + + Note: For Blade Center, the value of attribute averageAC is the total AC power being consumed by all modules - in the chassis. It also includes power consumed by the Chassis + in the chassis. It also includes power consumed by the Chassis Cooling Devices for BCH chassis. - -\ **averageAChistory**\ - + +\ **averageAChistory**\ + Query the historical records which were generated in last one hour for \ **averageAC**\ . - -\ **averageDC**\ - + +\ **averageDC**\ + Query the average power consumed (Output). (Unit is watt) - -\ **averageDChistory**\ - + +\ **averageDChistory**\ + Query the historical records which were generated in last one hour for \ **averageDC**\ . - -\ **capability**\ - + +\ **capability**\ + Query the Power Capabilities of the blade server. - + staticPowerManagement: the module with the static worst case power values. - - fixedPowermanagement: the module with the static power values but ability + + fixedPowermanagement: the module with the static power values but ability to throttle. - - dynamicPowerManagement: the module with power meter capability, measurement + + dynamicPowerManagement: the module with power meter capability, measurement enabled, but capping disabled. - - dynamicPowerMeasurement1: the module with power meter capability, measurement + + dynamicPowerMeasurement1: the module with power meter capability, measurement enabled, phase 1 only - - dynamicPowerMeasurement2: the module with power meter capability, measurement + + dynamicPowerMeasurement2: the module with power meter capability, measurement enabled, phase 2 or higher - - dynamicPowerMeasurementWithPowerCapping: the module with power meter capability, + + dynamicPowerMeasurementWithPowerCapping: the module with power meter capability, both measurement and capping enabled, phase 2 or higher - -\ **cappingGmin**\ - + +\ **cappingGmin**\ + Query the Guaranteed Minimum power capping value in watts. - -\ **cappingmax**\ - + +\ **cappingmax**\ + Query the Maximum of power capping value in watts. - -\ **cappingmaxmin**\ - + +\ **cappingmaxmin**\ + Query the Maximum and Minimum of power capping value in watts. - -\ **cappingmin**\ - + +\ **cappingmin**\ + Query the Minimum of power capping value in watts. - -\ **cappingperc**\ =\ **percentage**\ - - Set the power capping value base on the percentage of - the max-min of capping value which getting from - \ *cappingmaxmim*\ attribute. The valid value must be + +\ **cappingperc**\ =\ **percentage**\ + + Set the power capping value base on the percentage of + the max-min of capping value which getting from + \ *cappingmaxmim*\ attribute. The valid value must be from 0 to 100. - -\ **cappingsoftmin**\ - - Query the minimum value that can be assigned to power + +\ **cappingsoftmin**\ + + Query the minimum value that can be assigned to power capping without guaranteed enforceability. (Unit is watt) - -\ **cappingstatus**\ - - Query the power capping status. The result should be 'on' + +\ **cappingstatus**\ + + Query the power capping status. The result should be 'on' or 'off'. - + \ **cappingstatus**\ ={\ **on**\ | \ **off**\ } - - Set the power capping status. The value must be 'on' - or 'off'. This is the switch to turn on or turn off the + + Set the power capping status. The value must be 'on' + or 'off'. This is the switch to turn on or turn off the power capping function. - -\ **cappingvalue**\ - + +\ **cappingvalue**\ + Query the current power capping value. (Unit is watt) - -\ **cappingwatt**\ =\ **watt**\ - + +\ **cappingwatt**\ =\ **watt**\ + Set the power capping value base on the watt unit. - - If the 'watt' > maximum of \ *cappingmaxmin*\ or 'watt' - < \ *cappingsoftmin*\ , the setting operation - will be failed. If the 'watt' > \ *cappingsoftmin*\ and - 'watt' < minimum of \ *cappingmaxmin*\ , the value can NOT be + + If the 'watt' > maximum of \ *cappingmaxmin*\ or 'watt' + < \ *cappingsoftmin*\ , the setting operation + will be failed. If the 'watt' > \ *cappingsoftmin*\ and + 'watt' < minimum of \ *cappingmaxmin*\ , the value can NOT be guaranteed. - -\ **CPUspeed**\ - + +\ **CPUspeed**\ + Query the effective processor frequency. (Unit is MHz) - -\ **CPUspeedhistory**\ - - Query the historical records which were generated in last one hour for \ **CPUspeed**\ - + +\ **CPUspeedhistory**\ + + Query the historical records which were generated in last one hour for \ **CPUspeed**\ -\ **dsavingstatus**\ - - Query the dynamic power saving status. The result should + +\ **dsavingstatus**\ + + Query the dynamic power saving status. The result should be 'on-norm', 'on-maxp' or 'off'. - - If turning on the dynamic power saving, the processor - frequency and voltage will be dropped dynamically based on + + If turning on the dynamic power saving, the processor + frequency and voltage will be dropped dynamically based on the core utilization. It supports two modes for turn on state: - - \ *on-norm*\ - means normal, the processor frequency cannot + + \ *on-norm*\ - means normal, the processor frequency cannot exceed the nominal value; - - \ *on-maxp*\ - means maximum performance, the processor + + \ *on-maxp*\ - means maximum performance, the processor frequency can exceed the nominal value. - + \ **dsavingstatus**\ ={\ **on-norm**\ | \ **on-maxp**\ | \ **off**\ } - - Set the dynamic power saving. The value must be 'on-norm', + + Set the dynamic power saving. The value must be 'on-norm', 'on-maxp' or 'off'. - - The dsavingstatus setting operation needs about 2 minutes + + The dsavingstatus setting operation needs about 2 minutes to take effect. (The used time depends on the hardware type) - - The \ **dsavingstatus**\ only can be turned on when the + + The \ **dsavingstatus**\ only can be turned on when the \ **savingstatus**\ is in turn off status. - -\ **exhausttemp**\ - + +\ **exhausttemp**\ + Query the current exhaust temperature. (Unit is centigrade) - -\ **exhausttemphistory**\ - - Query the historical records which were generated in last one hour for \ **exhausttemp**\ - + +\ **exhausttemphistory**\ + + Query the historical records which were generated in last one hour for \ **exhausttemp**\ -\ **fanspeed**\ - + +\ **fanspeed**\ + Query the fan speed for all the fans which installed in this node. (Unit is RPM - Rotations Per Minute)) - - If there are multiple fans for a node, multiple lines will be output. And a fan name in bracket will be + + If there are multiple fans for a node, multiple lines will be output. And a fan name in bracket will be appended after \ **fanspped**\ attribute name. - -\ **fanspeedhistory**\ - + +\ **fanspeedhistory**\ + Query the historical records which were generated in last one hour for \ **fanspeed**\ . - -\ **ffoMin**\ - - Query the minimum cpu frequency which can be set for FFO. (Fixed + +\ **ffoMin**\ + + Query the minimum cpu frequency which can be set for FFO. (Fixed Frequency Override) - -\ **ffoNorm**\ - + +\ **ffoNorm**\ + Query the maximum cpu frequency which can be set for FFO. - -\ **ffoTurbo**\ - + +\ **ffoTurbo**\ + Query the advertised maximum cpu frequency (selling point). - -\ **ffoVmin**\ - - Query the minimum cpu frequency which can be set for dropping down - the voltage to save power. That means when you drop the cpu - frequency from the ffoVmin to ffoVmin, the voltage won't change, + +\ **ffoVmin**\ + + Query the minimum cpu frequency which can be set for dropping down + the voltage to save power. That means when you drop the cpu + frequency from the ffoVmin to ffoVmin, the voltage won't change, then there's no obvious power to be saved. - -\ **ffovalue**\ - + +\ **ffovalue**\ + Query the current value of FFO. - -\ **ffovalue**\ =\ **MHZ**\ - - Set the current value of FFO. The valid value of ffovalue should + +\ **ffovalue**\ =\ **MHZ**\ + + Set the current value of FFO. The valid value of ffovalue should be between the ffoMin and ffoNorm. - - Note1: Due to the limitation of firmware, the frequency in the range - 3501 MHz - 3807 MHz can NOT be set to ffovalue. This range may be + + Note1: Due to the limitation of firmware, the frequency in the range + 3501 MHz - 3807 MHz can NOT be set to ffovalue. This range may be changed in future. - - Note2: The setting will take effect only when the fsavingstatus is in - 'on' status. But you need to set the ffovalue to a valid value before - enabling the fsavingstatus. (It's a limitation of the initial firmware + + Note2: The setting will take effect only when the fsavingstatus is in + 'on' status. But you need to set the ffovalue to a valid value before + enabling the fsavingstatus. (It's a limitation of the initial firmware and will be fixed in future.) - + The ffovalue setting operation needs about 1 minute to take effect. - -\ **fsavingstatus**\ - - Query the status of FFO. The result should be 'on' or 'off'. + +\ **fsavingstatus**\ + + Query the status of FFO. The result should be 'on' or 'off'. 'on' - enable; 'off' - disable. - + \ **fsavingstatus**\ ={\ **on**\ | \ **off**\ } - + Set the status of FFO. The value must be 'on' or 'off'. - - 'on' - enable. It will take effect only when the \ **ffovalue**\ + + 'on' - enable. It will take effect only when the \ **ffovalue**\ has been set to a valid value. - + 'off' -disable. It will take effect immediately. - + Note: See the Note2 of ffovalue=MHZ. - -\ **maxCPUspeed**\ - + +\ **maxCPUspeed**\ + Query the maximum processor frequency. (Unit is MHz) - -\ **mmtemp**\ - - Query the current temperature of management module. + +\ **mmtemp**\ + + Query the current temperature of management module. (Unit is centigrade) - -\ **pd1status | powerstatus**\ - - Query the status of power domain 1 for blade management + +\ **pd1status | powerstatus**\ + + Query the status of power domain 1 for blade management module node. - - Note: for the attribute without the leading 'pd1' which + + Note: for the attribute without the leading 'pd1' which means there's only one power doamin in the chassis. - -\ **pd1policy | powerpolicy**\ - + +\ **pd1policy | powerpolicy**\ + Query the power management policy of power domain 1. - -\ **pd1powermodule1 | powermodule**\ - + +\ **pd1powermodule1 | powermodule**\ + Query the First Power Module capacity in power domain 1. - -\ **pd1powermodule2 | powermodule**\ - + +\ **pd1powermodule2 | powermodule**\ + Query the Second Power Module capacity in power domain 1. - -\ **pd1avaiablepower | avaiablepower**\ - + +\ **pd1avaiablepower | avaiablepower**\ + Query the total available power in power domain 1. - -\ **pd1reservedpower | reservedpower**\ - + +\ **pd1reservedpower | reservedpower**\ + Query the power that has been reserved for power domain 1. - -\ **pd1remainpower | remainpower**\ - + +\ **pd1remainpower | remainpower**\ + Query the remaining power available in power domain 1. - -\ **pd1inusedpower | inusedpower**\ - + +\ **pd1inusedpower | inusedpower**\ + Query the total power being used in power domain 1. - -\ **pd2status**\ - - Query the status of power domain 2 for blade management + +\ **pd2status**\ + + Query the status of power domain 2 for blade management module node. - -\ **pd2policy**\ - + +\ **pd2policy**\ + Query the power management policy of power domain 2. - -\ **pd2powermodule1**\ - + +\ **pd2powermodule1**\ + Query the First Power Module capacity in power domain 2. - -\ **pd2powermodule2**\ - + +\ **pd2powermodule2**\ + Query the Second Power Module capacity in power domain 2. - -\ **pd2avaiablepower**\ - + +\ **pd2avaiablepower**\ + Query the total available power in power domain 2. - -\ **pd2reservedpower**\ - + +\ **pd2reservedpower**\ + Query the power that has been reserved for power domain 2. - -\ **pd2remainpower**\ - + +\ **pd2remainpower**\ + Query the remaining power available in power domain 2. - -\ **pd2inusedpower**\ - + +\ **pd2inusedpower**\ + Query the total power being used in power domain 2. - -\ **relhistogram**\ - + +\ **relhistogram**\ + Query histogram data for wattage information - -\ **savingstatus**\ - - Query the static power saving status. The result should be + +\ **savingstatus**\ + + Query the static power saving status. The result should be 'on' or 'off'. 'on' - enable; 'off' - disable. - + \ **savingstatus**\ ={\ **on**\ | \ **off**\ } - + Set the static power saving. The value must be 'on' or 'off'. - - If turning on the static power saving, the processor frequency + + If turning on the static power saving, the processor frequency and voltage will be dropped to a fixed value to save energy. - - The savingstatus setting operation needs about 2 minutes to + + The savingstatus setting operation needs about 2 minutes to take effect. (The used time depends on the hardware type) - - The \ **savingstatus**\ only can be turned on when the + + The \ **savingstatus**\ only can be turned on when the \ **dsavingstatus**\ is in turn off status. - -\ **sysIPLtime**\ - - Query the time used from FSP standby to OS standby. + +\ **sysIPLtime**\ + + Query the time used from FSP standby to OS standby. (Unit is Second) - -\ **syssbpower**\ - - Query the system power consumed prior to power on. + +\ **syssbpower**\ + + Query the system power consumed prior to power on. (Unit is Watt) - -\ **thermaloutput**\ - - Query the thermal output (load) in BTUs per hour for the blade + +\ **thermaloutput**\ + + Query the thermal output (load) in BTUs per hour for the blade center chassis. - -\ **powerusage**\ - + +\ **powerusage**\ + Query System Power Statistics with DCMI (Data Center Manageability Interface). - -\ **temperature**\ - - Query the temperature from DCMI (Data Center Manageability Interface) Temperature sensor. + +\ **temperature**\ + + Query the temperature from DCMI (Data Center Manageability Interface) Temperature sensor. Currently, only CPU temperature and baseboard temperature sensor available for OpenPOWER servers. - + ******************** -\ **RETURN VALUE**\ +\ **RETURN VALUE**\ ******************** @@ -736,24 +736,24 @@ so no additional plugins are needed for BladeCenter.) **************** -\ **EXAMPLES**\ +\ **EXAMPLES**\ **************** 1. Query all attributes which CEC1,CEC2 supported. - - + + .. code-block:: perl - + renergy CEC1,CEC2 all - - + + The output of the query operation: - - + + .. code-block:: perl - + CEC1: savingstatus: off CEC1: dsavingstatus: off CEC1: cappingstatus: off @@ -779,23 +779,23 @@ so no additional plugins are needed for BladeCenter.) CEC2: ambienttemp: 25 C CEC2: exhausttemp: 40 C CEC2: CPUspeed: 4695 MHz - - + + 2. Query the \ **fanspeed**\ attribute for Power8 CEC. - - + + .. code-block:: perl - + renergy CEC1 fanspeed - - + + The output of the query operation: - - + + .. code-block:: perl - + CEC1: fanspeed (Fan U78CB.001.WZS00MA-A1 00002101): 5947 RPM CEC1: fanspeed (Fan U78CB.001.WZS00MA-A2 00002103): 6081 RPM CEC1: fanspeed (Fan U78CB.001.WZS00MA-A3 00002105): 6108 RPM @@ -804,19 +804,19 @@ so no additional plugins are needed for BladeCenter.) CEC1: fanspeed (Fan U78CB.001.WZS00MA-A6 0000210B): 6013 RPM CEC1: fanspeed (Fan U78CB.001.WZS00MA-E1 0000210C): 4992 RPM CEC1: fanspeed (Fan U78CB.001.WZS00MA-E2 0000210D): 5016 RPM - - + + 3. Query the historical records for the \ **CPUspeed**\ attribute. (Power8 CEC) - + \ **renergy**\ CEC1 CPUspeedhistory - + The output of the query operation: - - + + .. code-block:: perl - + CEC1: CPUspeedhistory: 2027 MHZ: 20141226042900 CEC1: CPUspeedhistory: 2027 MHZ: 20141226042930 CEC1: CPUspeedhistory: 2244 MHZ: 20141226043000 @@ -828,25 +828,25 @@ so no additional plugins are needed for BladeCenter.) CEC1: CPUspeedhistory: 2393 MHZ: 20141226043300 CEC1: CPUspeedhistory: 2393 MHZ: 20141226043330 ... - - + + 4 - + Query all the attirbutes for management module node MM1. (For chassis) - - + + .. code-block:: perl - + renergy MM1 all - - + + The output of the query operation: - - + + .. code-block:: perl - + mm1: availableDC: 5880W mm1: frontpaneltmp: 18.00 Centigrade mm1: inusedAC: 2848W @@ -868,23 +868,23 @@ so no additional plugins are needed for BladeCenter.) mm1: pd2reservedpower: 2889W mm1: pd2status: 2 - Warning: Power redundancy does not exist in this power domain. mm1: thermaloutput: 9717.376000 BTU/hour - - + + 5. Query all the attirbutes for blade server node blade1. - - + + .. code-block:: perl - + renergy blade1 all - - + + The output of the query operation: - - + + .. code-block:: perl - + blade1: CPUspeed: 4204MHZ blade1: averageDC: 227W blade1: capability: dynamicPowerMeasurement2 @@ -892,87 +892,87 @@ so no additional plugins are needed for BladeCenter.) blade1: dsavingstatus: off blade1: maxCPUspeed: 4204MHZ blade1: savingstatus: off - - -6. Query the attributes savingstatus, cappingstatus + + +6. Query the attributes savingstatus, cappingstatus and CPUspeed for server CEC1. - - + + .. code-block:: perl - + renergy CEC1 savingstatus cappingstatus CPUspeed - - + + The output of the query operation: - - + + .. code-block:: perl - + CEC1: savingstatus: off CEC1: cappingstatus: on CEC1: CPUspeed: 3621 MHz - - + + 7. Turn on the power saving function of CEC1. - - + + .. code-block:: perl - + renergy CEC1 savingstatus=on - - + + The output of the setting operation: - - + + .. code-block:: perl - - CEC1: Set savingstatus succeeded. + + CEC1: Set savingstatus succeeded. CEC1: This setting may need some minutes to take effect. - - -8. Set the power capping value base on the percentage of the + + +8. Set the power capping value base on the percentage of the max-min capping value. Here, set it to 50%. - - + + .. code-block:: perl - + renergy CEC1 cappingperc=50 - - - If the maximum capping value of the CEC1 is 850w, and the - minimum capping value of the CEC1 is 782w, the Power Capping + + + If the maximum capping value of the CEC1 is 850w, and the + minimum capping value of the CEC1 is 782w, the Power Capping value will be set as ((850-782)\*50% + 782) = 816w. - + The output of the setting operation: - - + + .. code-block:: perl - + CEC1: Set cappingperc succeeded. CEC1: cappingvalue: 816 - - + + 9. Query powerusage and temperature for OpenPOWER servers. - - + + .. code-block:: perl - + renergy ops01 powerusage temperature - - + + The output will be like this: - - + + .. code-block:: perl - + ops01: Current Power : 591W ops01: Minimum Power over sampling duration : 558W ops01: Maximum Power over sampling duration : 607W @@ -982,38 +982,38 @@ max-min capping value. Here, set it to 50%. ops01: Power Measurement : Active ops01: CPU Temperature Instance 0 : +39 Centigrade ops01: Baseboard temperature Instance 0 : +28 Centigrade - - + + ****************** -\ **REFERENCES**\ +\ **REFERENCES**\ ****************** 1. For more information on 'Power System Energy Management': - + http://www-03.ibm.com/systems/power/software/energy/index.html - + 2. EnergyScale white paper for Power6: - + http://www-03.ibm.com/systems/power/hardware/whitepapers/energyscale.html - + 3. EnergyScale white paper for Power7: - + http://www-03.ibm.com/systems/power/hardware/whitepapers/energyscale7.html - + ************* -\ **FILES**\ +\ **FILES**\ ************* From cd3f88280aae60ae8a22ba35de3a3b33209c1229 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0354/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/replaycons.1.rst --- .../references/man1/replaycons.1.rst | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/replaycons.1.rst b/docs/source/guides/admin-guides/references/man1/replaycons.1.rst index c4b1929b3..aee76d34d 100644 --- a/docs/source/guides/admin-guides/references/man1/replaycons.1.rst +++ b/docs/source/guides/admin-guides/references/man1/replaycons.1.rst @@ -43,28 +43,28 @@ OPTIONS -\ *bps*\ - +\ *bps*\ + The display rate to use to play back the console output. Default is 19200. - -\ *tail_amount*\ - + +\ *tail_amount*\ + The place in the console log file to start play back, specified as the # of lines from the end. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - + @@ -90,15 +90,15 @@ EXAMPLES 1. - + To replay the console for node1 at the default rate, starting 2000 lines from the end: - - + + .. code-block:: perl - + replaycons 19200 2000 - - + + From 89bf735f6e17c90f1817b77433c196f3c9cb5b8b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0355/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst --- .../guides/admin-guides/references/man1/restartxcatd.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst b/docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst index a4348f73f..57c6e4fb4 100644 --- a/docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst +++ b/docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst @@ -29,7 +29,7 @@ DESCRIPTION The \ **restartxcatd**\ command restarts the xCAT daemon (xcatd). -\ **Linux Specific**\ +\ **Linux Specific**\ It will perform the xcatd \ *fast restart*\ . The xcatd \ *fast restart*\ is a specific restart which has two advantages compares to the \ *stop*\ and then \ *start*\ . @@ -40,7 +40,7 @@ It does the same thing as 'service xcatd restart' on NON-systemd enabled Operati It's recommended to use \ **restartxcatd**\ command to restart xcatd on systemd enable system like rh7 and sles12 instead of 'service xcatd restart' or 'systemctl restart xcatd'. -\ **AIX Specific**\ +\ **AIX Specific**\ It runs 'stopsrc -s xcatd' to stop xcatd first if xcatd is active, then runs 'startsrc -s xcatd' to start xcatd. From dabab7d362c16afdd4e3f1f241a2799d57bac29f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0356/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/reventlog.1.rst --- .../references/man1/reventlog.1.rst | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/reventlog.1.rst b/docs/source/guides/admin-guides/references/man1/reventlog.1.rst index 108ccbe9d..76a0d9a20 100644 --- a/docs/source/guides/admin-guides/references/man1/reventlog.1.rst +++ b/docs/source/guides/admin-guides/references/man1/reventlog.1.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -32,7 +32,7 @@ OpenPOWER OpenBMC specific : ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -42,73 +42,73 @@ logs are stored on each servers service processor. *************** -\ **Options**\ +\ **Options**\ *************** -\ *number-of-entries*\ - +\ *number-of-entries*\ + Retrieve the specified number of entries from the nodes' service processors. - -\ **all**\ - + +\ **all**\ + Retrieve all entries. - -\ **-s**\ - + +\ **-s**\ + To sort the entries from latest (always the last entry in event DB) to oldest (always the first entry in event DB). If \ **number-of-entries**\ specified, the latest \ **number-of-entries**\ events will be output in the order of latest to oldest. - -\ **clear**\ - + +\ **clear**\ + Clear event logs. - + \ **resolved=**\ {\ *id-list*\ |\ **LED**\ } - + Mark event log entries as resolved. Use comma separated list of entry ids to specify individual entries. Use \ **LED**\ to mark as resolved all event log entries that contribute to LED fault. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. List last 5 event log entries from node4 and node5 - - + + .. code-block:: perl - + reventlog node4,node5 5 - - + + Output is similar to: - - + + .. code-block:: perl - + node4: SERVPROC I 09/06/00 15:23:33 Remote Login Successful User ID = USERID[00] node4: SERVPROC I 09/06/00 15:23:32 System spn1 started a RS485 connection with us[00] node4: SERVPROC I 09/06/00 15:22:35 RS485 connection to system spn1 has ended[00] @@ -119,48 +119,48 @@ logs are stored on each servers service processor. node5: SERVPROC I 09/06/00 15:21:34 RS485 connection to system spn1 has ended[00] node5: SERVPROC I 09/06/00 15:21:30 Remote Login Successful User ID = USERID[00] node5: SERVPROC I 09/06/00 15:21:29 System spn1 started a RS485 connection with us[00] - - + + 2. Clear all event log entries from node4 and node5 - - + + .. code-block:: perl - + reventlog node4,node5 clear - - + + Output is similar to: - - + + .. code-block:: perl - + node4: clear node5: clear - - + + 3. Mark as resolved all event log entries from node4 that contribute to LED fault - - + + .. code-block:: perl - + reventlog node4 resolved=LED - - + + Output is similar to: - - + + .. code-block:: perl - + Attempting to resolve the following log entries: LED... node4: Resolved 51. node4: Resolved 52. node4: Resolved 58. - - + + From b5b2d33e2368f8db65a45991505e4b9f4f9bf099 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0357/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rflash.1.rst --- .../admin-guides/references/man1/rflash.1.rst | 192 +++++++++--------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rflash.1.rst b/docs/source/guides/admin-guides/references/man1/rflash.1.rst index 90c3ed721..4c494b23d 100644 --- a/docs/source/guides/admin-guides/references/man1/rflash.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rflash.1.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -43,7 +43,7 @@ NeXtScale FPC specific: ======================= -\ **rflash**\ \ *noderange*\ \ *http_directory*\ +\ **rflash**\ \ *noderange*\ \ *http_directory*\ OpenPOWER BMC specific (using IPMI): @@ -52,7 +52,7 @@ OpenPOWER BMC specific (using IPMI): \ **rflash**\ \ *noderange*\ [\ *hpm_file_path*\ | \ **-d**\ \ *data_directory*\ ] [\ **-c | -**\ **-check**\ ] [\ **-**\ **-retry=**\ \ *count*\ ] -\ **rflash**\ \ *noderange*\ \ **-**\ **-recover**\ \ *bmc_file_path*\ +\ **rflash**\ \ *noderange*\ \ **-**\ **-recover**\ \ *bmc_file_path*\ OpenPOWER OpenBMC specific : @@ -70,7 +70,7 @@ OpenPOWER OpenBMC specific : ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -181,110 +181,110 @@ This delete option will delete update image from BMC. It expects an ID as the in *************** -\ **Options**\ +\ **Options**\ *************** -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Writes the command's usage statement to standard output. - -\ **-c|-**\ **-check**\ - + +\ **-c|-**\ **-check**\ + Check the firmware version of BMC and an update file. - -\ **-p**\ \ *directory*\ - + +\ **-p**\ \ *directory*\ + Specifies the directory where the packages are located. - -\ **-d**\ \ *data_directory*\ - + +\ **-d**\ \ *data_directory*\ + PPC (without HMC, using Direct FSP Management) specific: - + Specifies the directory where the raw data from rpm packages for each CEC/Frame are located. The default directory is /tmp. The option is only used in Direct FSP/BPA Management. - + OpenPOWER BMC specific (using IPMI): - + Used for IBM Power S822LC for Big Data systems only. Specifies the directory where the \ **pUpdate**\ utility and at least one of BMC or Host update files are located. The utility and update files can be downloaded from FixCentral. - + \ **-**\ **-activate**\ {\ **concurrent**\ | \ **disruptive**\ } - + Must be specified to activate the new Licensed Internal Code. The "disruptive" option will cause the target systems to be recycled. Without this flag, LIC updates will be installed only, not activated. - -\ **-**\ **-commit**\ - + +\ **-**\ **-commit**\ + Used to commit the flash image in the temporary side of the chip to the permanent side for both managed systems and power subsystems. - -\ **-**\ **-recover**\ - + +\ **-**\ **-recover**\ + PPC (with HMC) and PPC (without HMC, using Direct FSP Management) specific: - + Used to recover the flash image in the permanent side of the chip to the temporary side for both managed systems and power subsystems. - + OpenPOWER BMC specific (using IPMI): - + Used for IBM Power S822LC for Big Data systems only. Used to recover the BMC with a BMC image downloaded from FixCentral. This option will only work if BMC is in "Brick protection" state. - -\ **-**\ **-retry=**\ \ *count*\ - + +\ **-**\ **-retry=**\ \ *count*\ + Specify number of times to retry the update if failure is detected. Default value is 2. Value of 0 can be used to indicate no retries. - -\ **-a|-**\ **-activate**\ - + +\ **-a|-**\ **-activate**\ + Activate update image. Image id or update file must be specified. - -\ **-l|-**\ **-list**\ - + +\ **-l|-**\ **-list**\ + List currently uploaded update images. "(\*)" indicates currently active image. - -\ **-u|-**\ **-upload**\ - + +\ **-u|-**\ **-upload**\ + Upload update image. Specified file must be in .tar format. - -\ **-**\ **-delete**\ - + +\ **-**\ **-delete**\ + Delete update image from BMC - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Displays the command's version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose output. - + ******************* -\ **Exit Status**\ +\ **Exit Status**\ ******************* @@ -294,96 +294,96 @@ This delete option will delete update image from BMC. It expects an ID as the in **************** -\ **Examples**\ +\ **Examples**\ **************** 1. To update only the power subsystem attached to a single HMC-attached pSeries CEC(cec_name), and recycle the power subsystem and all attached managed systems when the update is complete, and the Microcode update package and associated XML file are in /tmp/fw, enter: - - + + .. code-block:: perl - + rflash cec_name -p /tmp/fw --activate disruptive - - + + 2. To update only the power subsystem attached to a single HMC-attached pSeries node, and recycle the power subsystem and all attached managed systems when the update is complete, and the Microcode update package and associated XML file are in /tmp/fw, enter: - - + + .. code-block:: perl - + rflash bpa_name -p /tmp/fw --activate disruptive - - + + 3. To commit a firmware update to permanent flash for both managed system and the related power subsystems, enter: - - + + .. code-block:: perl - + rflash cec_name --commit - - + + 4. To update the firmware on a NeXtScale FPC specify the FPC node name and the HTTP location of the file including the xCAT MN IP address and the directory on the xCAT MN containing the firmware as follows: - - + + .. code-block:: perl - + rflash fpc01 http://10.1.147.169/install/firmware/fhet17a/ibm_fw_fpc_fhet17a-2.02_anyos_noarch.rom - - + + 5. To update the firmware on OpenPOWER machine specify the node name and the file path of the HPM firmware file as follows: - - + + .. code-block:: perl - + rflash fs3 /firmware/8335_810.1543.20151021b_update.hpm - - + + Print verbose message to rflash log file (/var/log/xcat/rflash/fs3.log) when updading firmware: - - + + .. code-block:: perl - + rflash fs3 /firmware/8335_810.1543.20151021b_update.hpm -V - - + + 6. To update the firmware on IBM Power S822LC for Big Data machine specify the node name and the file path of the data directory containing pUpdate utility, both BMC and Host update files: - - + + .. code-block:: perl - + rflash briggs01 -d /root/supermicro/OP825 - - + + 7. To update the firmware on the OpenBMC machine, specify the firmare update file to upload and activate: - - + + .. code-block:: perl - + rflash p9euh02 -a /tmp/witherspoon.pnor.squashfs.tar - - + + **************** -\ **Location**\ +\ **Location**\ **************** -\ **/opt/xcat/bin/rflash**\ +\ **/opt/xcat/bin/rflash**\ ***** From 0bc61d04b2d81d76c57d19026eb0cc7f5c038755 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0358/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rinv.1.rst --- .../admin-guides/references/man1/rinv.1.rst | 418 +++++++++--------- 1 file changed, 209 insertions(+), 209 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rinv.1.rst b/docs/source/guides/admin-guides/references/man1/rinv.1.rst index 4f28900ab..128ee6fbe 100644 --- a/docs/source/guides/admin-guides/references/man1/rinv.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rinv.1.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -76,7 +76,7 @@ pdu specific: ============= -\ **rinv**\ \ *noderange*\ +\ **rinv**\ \ *noderange*\ zVM specific: @@ -110,7 +110,7 @@ zVM specific: ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -121,220 +121,220 @@ Calling \ **rinv**\ for VMware will display the UUID/GUID, number of CPUs, amou *************** -\ **Options**\ +\ **Options**\ *************** -\ **bus**\ - +\ **bus**\ + List all buses for each I/O slot. - -\ **config**\ - + +\ **config**\ + Retrieves number of processors, speed, total memory, and DIMM locations. - -\ **model**\ - + +\ **model**\ + Retrieves model number. - -\ **serial**\ - + +\ **serial**\ + Retrieves serial number. - -\ **firm**\ - + +\ **firm**\ + Retrieves firmware versions. - -\ **deconfig**\ - + +\ **deconfig**\ + Retrieves deconfigured resources. Deconfigured resources are hw components (cpus, memory, etc.) that have failed so the firmware has automatically turned those components off. This option is only capable of listing some of the deconfigured resources and should not be the only method used to check the hardware status. - -\ **-x**\ - + +\ **-x**\ + To output the raw information of deconfigured resources for CEC. - -\ **asset**\ - + +\ **asset**\ + Retrieves asset tag. Usually it's the MAC address of eth0. - -\ **vpd**\ - + +\ **vpd**\ + Same as specifying model, serial, deviceid, and mprom. - -\ **diag**\ - + +\ **diag**\ + Diagnostics information of firmware. - -\ **mprom**\ - + +\ **mprom**\ + Retrieves mprom firmware level. - -\ **dimm**\ - + +\ **dimm**\ + Retrieves dual in-line memory module information. - -\ **deviceid**\ - + +\ **deviceid**\ + Retrieves device identification. Usually device, manufacturing and product IDs. - -\ **uuid**\ - + +\ **uuid**\ + Retrieves the universally unique identifier. - -\ **guid**\ - + +\ **guid**\ + Retrieves the global unique identifier . - -\ **all**\ - + +\ **all**\ + All of the above. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - -\ **-V | -**\ **-verbose**\ - + +\ **-V | -**\ **-verbose**\ + Prints verbose output, if available. - -\ **-t**\ - + +\ **-t**\ + Set the values in the vm table to what vCenter has for the indicated nodes. - -\ **zVM specific :**\ + +\ **zVM specific :**\ -\ **-**\ **-diskpoolspace**\ - +\ **-**\ **-diskpoolspace**\ + Calculates the total size of every known storage pool. - -\ **-**\ **-diskpool**\ \ *pool*\ \ *space*\ - + +\ **-**\ **-diskpool**\ \ *pool*\ \ *space*\ + Lists the storage devices (ECKD and FBA) contained in a disk pool. Space can be: all, free, or used. - -\ **-**\ **-fcpdevices**\ \ *state*\ \ *details*\ - + +\ **-**\ **-fcpdevices**\ \ *state*\ \ *details*\ + Lists the FCP device channels that are active, free, or offline. State can be: active, free, or offline. - -\ **-**\ **-diskpoolnames**\ - + +\ **-**\ **-diskpoolnames**\ + Lists the known disk pool names. - -\ **-**\ **-networknames**\ - + +\ **-**\ **-networknames**\ + Lists the known network names. - -\ **-**\ **-network**\ \ *name*\ - + +\ **-**\ **-network**\ \ *name*\ + Shows the configuration of a given network device. - -\ **-**\ **-ssi**\ - + +\ **-**\ **-ssi**\ + Obtain the SSI and system status. - -\ **-**\ **-smapilevel**\ - + +\ **-**\ **-smapilevel**\ + Obtain the SMAPI level installed on the z/VM system. - -\ **-**\ **-wwpns**\ \ *fcp_channel*\ - + +\ **-**\ **-wwpns**\ \ *fcp_channel*\ + Query a given FCP device channel on a z/VM system and return a list of WWPNs. - -\ **-**\ **-zfcppool**\ \ *pool*\ \ *space*\ - + +\ **-**\ **-zfcppool**\ \ *pool*\ \ *space*\ + List the SCSI/FCP devices contained in a zFCP pool. Space can be: free or used. - -\ **-**\ **-zfcppoolnames**\ - + +\ **-**\ **-zfcppoolnames**\ + List the known zFCP pool names. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. To retrieve all information available from blade node4, enter: - - + + .. code-block:: perl - + rinv node5 all - - + + Output is similar to: - - + + .. code-block:: perl - + node5: Machine Type/Model 865431Z node5: Serial Number 23C5030 node5: Asset Tag 00:06:29:1F:01:1A @@ -355,23 +355,23 @@ Calling \ **rinv**\ for VMware will display the UUID/GUID, number of CPUs, amou node5: Processor Speed: 866 MHz node5: Total Memory: 512 MB node5: Memory DIMM locations: Slot(s) 3 4 - - + + 2. To output the raw information of deconfigured resources for CEC cec01, enter: - - + + .. code-block:: perl - + rinv cec01 deconfig -x - - + + Output is similar to: - - + + .. code-block:: perl - + cec01: IH @@ -380,74 +380,74 @@ Calling \ **rinv**\ for VMware will display the UUID/GUID, number of CPUs, amou 800 - - + + 3. - + To retrieve 'config' information from the HMC-managed LPAR node3, enter: - - + + .. code-block:: perl - + rinv node3 config - - + + Output is similar to: - - + + .. code-block:: perl - + node5: Machine Configuration Info node5: Number of Processors: 1 node5: Total Memory (MB): 1024 - - + + 4. - + To retrieve information about a VMware node vm1, enter: - - + + .. code-block:: perl - + rinv vm1 - - + + Output is similar to: - - + + .. code-block:: perl - + vm1: UUID/GUID: 42198f65-d579-fb26-8de7-3ae49e1790a7 vm1: CPUs: 1 vm1: Memory: 1536 MB vm1: Network adapter 1: 36:1b:c2:6e:04:02 vm1: Hard disk 1 (d0): 9000 MB @ [nfs_192.168.68.21_vol_rc1storage_vmware] vm1_3/vm1.vmdk vm1: Hard disk 2 (d4): 64000 MB @ [nfs_192.168.68.21_vol_rc1storage_vmware] vm1_3/vm1_5.vmdk - - - \ **zVM specific :**\ - + + + \ **zVM specific :**\ + 5. - + To list the defined network names available for a given node: - - + + .. code-block:: perl - + rinv pokdev61 --getnetworknames - - + + Output is similar to: - - + + .. code-block:: perl - + pokdev61: LAN:QDIO SYSTEM GLAN1 pokdev61: LAN:HIPERS SYSTEM GLAN2 pokdev61: LAN:QDIO SYSTEM GLAN3 @@ -456,122 +456,122 @@ Calling \ **rinv**\ for VMware will display the UUID/GUID, number of CPUs, amou pokdev61: VSWITCH SYSTEM VSW1 pokdev61: VSWITCH SYSTEM VSW2 pokdev61: VSWITCH SYSTEM VSW3 - - + + 6. - + To list the configuration for a given network: - - + + .. code-block:: perl - + rinv pokdev61 --getnetwork GLAN1 - - + + Output is similar to: - - + + .. code-block:: perl - + pokdev61: LAN SYSTEM GLAN1 Type: QDIO Connected: 1 Maxconn: INFINITE pokdev61: PERSISTENT UNRESTRICTED IP Accounting: OFF pokdev61: IPTimeout: 5 MAC Protection: Unspecified pokdev61: Isolation Status: OFF - - + + 7. - + To list the disk pool names available: - - + + .. code-block:: perl - + rinv pokdev61 --diskpoolnames - - + + Output is similar to: - - + + .. code-block:: perl - + pokdev61: POOL1 pokdev61: POOL2 pokdev61: POOL3 - - + + 8. - + List the configuration for a given disk pool: - - + + .. code-block:: perl - + rinv pokdev61 --diskpool POOL1 free - - + + Output is similar to: - - + + .. code-block:: perl - + pokdev61: #VolID DevType StartAddr Size pokdev61: EMC2C4 3390-09 0001 10016 pokdev61: EMC2C5 3390-09 0001 10016 - - + + 9. - + List the known zFCP pool names. - - + + .. code-block:: perl - + rinv pokdev61 --zfcppoolnames - - + + Output is similar to: - - + + .. code-block:: perl - + pokdev61: zfcp1 pokdev61: zfcp2 pokdev61: zfcp3 - - + + 10. - + List the SCSI/FCP devices contained in a given zFCP pool: - - + + .. code-block:: perl - + rinv pokdev61 --zfcppool zfcp1 - - + + Output is similar to: - - + + .. code-block:: perl - + pokdev61: #status,wwpn,lun,size,range,owner,channel,tag pokdev61: used,500512345678c411,4014412100000000,2g,3B40-3B7F,ihost13,3b77, pokdev61: used,500512345678c411,4014412200000000,8192M,3B40-3B7F,ihost13,3b77,replace_root_device pokdev61: free,500512345678c411,4014412300000000,8g,3B40-3B7F,,, pokdev61: free,5005123456789411,4014412400000000,2g,3B40-3B7F,,, pokdev61: free,5005123456789411;5005123456789411,4014412600000000,2G,3B40-3B7F,,, - - + + From 714794c4cc860a4f42f0cb19b53dc90caa45bb87 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0359/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmdef.1.rst --- .../admin-guides/references/man1/rmdef.1.rst | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmdef.1.rst b/docs/source/guides/admin-guides/references/man1/rmdef.1.rst index c7913da80..2b3ea96cf 100644 --- a/docs/source/guides/admin-guides/references/man1/rmdef.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmdef.1.rst @@ -39,65 +39,65 @@ OPTIONS -\ **-a|-**\ **-all**\ - +\ **-a|-**\ **-all**\ + Clear the whole xCAT database. A backup of the xCAT definitions should be saved before using this option as the xCAT daemons will no longer work once cleared. - + To restore: - - + + 1. \ **export XCATBYPASS=1**\ and run the \ **restorexCATdb**\ command. - + or - - - + + + 2. Run \ **xcatconfig -d**\ which initializes the database the same as when xCAT was installed. - - - -\ **-f|-**\ **-force**\ - + + + +\ **-f|-**\ **-force**\ + Use this with the \ **-**\ **-all**\ option as an extra indicator that ALL definitions are to be removed. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display a usage message. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on supported formats. - -\ **-o**\ \ *object-names*\ - + +\ **-o**\ \ *object-names*\ + A set of comma delimited object names. - -\ **-t**\ \ *object-types*\ - + +\ **-t**\ \ *object-types*\ + A set of comma delimited object types. - -\ **-C|-**\ **-cleanup**\ - + +\ **-C|-**\ **-cleanup**\ + Perform additional cleanup by running \ **nodeset offline**\ , \ **makeconservercf -d**\ and \ **makegocons -**\ **-cleanup**\ on the objects specified in the \ *noderange*\ . - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - + @@ -118,35 +118,35 @@ EXAMPLES 1. To remove a range of node definitions. - - + + .. code-block:: perl - + rmdef -t node node1-node4 - - + + 2. To remove all node definitions for the nodes contained in the group bpcnodes. - - + + .. code-block:: perl - + rmdef -t node -o bpcnodes - - + + 3. To remove the group called bpcnodes. - - + + .. code-block:: perl - + rmdef -t group -o bpcnodes - - + + (This will also update the values of the "groups" attribute of the member nodes.) - + From 059afe81ff856411a1f4abb03dcc9882eda3c6d0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0360/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmdocker.1.rst --- docs/source/guides/admin-guides/references/man1/rmdocker.1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmdocker.1.rst b/docs/source/guides/admin-guides/references/man1/rmdocker.1.rst index db021f2a9..b1d7849e3 100644 --- a/docs/source/guides/admin-guides/references/man1/rmdocker.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmdocker.1.rst @@ -32,7 +32,7 @@ OPTIONS -\ **-f|-**\ **-force**\ +\ **-f|-**\ **-force**\ From 4c9d03e17eb45bc9fe211077a95d8ffb63d8d221 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0361/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst --- .../references/man1/rmdsklsnode.1.rst | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst b/docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst index b9dd2625d..4fa5ccde5 100644 --- a/docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **rmdsklsnode [-h | -**\ **-help ]**\ +\ **rmdsklsnode [-h | -**\ **-help ]**\ -\ **rmdsklsnode [-V|-**\ **-verbose] [-f|-**\ **-force] [-r|-**\ **-remdef] [-i**\ \ *image_name*\ ] \ **[-p|-**\ **-primarySN] [-b|-**\ **-backupSN]**\ \ *noderange*\ +\ **rmdsklsnode [-V|-**\ **-verbose] [-f|-**\ **-force] [-r|-**\ **-remdef] [-i**\ \ *image_name*\ ] \ **[-p|-**\ **-primarySN] [-b|-**\ **-backupSN]**\ \ *noderange*\ *********** @@ -37,7 +37,7 @@ If you are using xCAT service nodes the \ **rmdsklsnode**\ command will automat If the node you are trying to remove is currently running the \ **rmdsklsnode**\ command will not remove the definitions. You can use the "-f" option to shut down the node and remove the definition. -\ **Removing alternate NIM client definitions**\ +\ **Removing alternate NIM client definitions**\ If you used the "-n" option when you created the NIM client definitions with the \ **mkdsklsnode**\ command then the NIM client machine names would be a combination of the xCAT node name and the osimage name used to initialize the NIM machine. To remove these definitions, you must provide the name of the osimage that was used using the "-i" option. @@ -52,52 +52,52 @@ OPTIONS -\ **-f |-**\ **-force**\ - +\ **-f |-**\ **-force**\ + Use the force option to stop and remove running nodes. This handles the situation where a NIM machine definition indicates that a node is still running even though it is not. - -\ **-b |-**\ **-backupSN**\ - + +\ **-b |-**\ **-backupSN**\ + When using backup service nodes only update the backup. The default is to update both the primary and backup service nodes. - -\ **-h |-**\ **-help**\ - + +\ **-h |-**\ **-help**\ + Display usage message. - -\ **-i**\ \ *image_name*\ - + +\ **-i**\ \ *image_name*\ + The name of an xCAT image definition. - -\ *noderange*\ - + +\ *noderange*\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats. - -\ **-p|-**\ **-primarySN**\ - + +\ **-p|-**\ **-primarySN**\ + When using backup service nodes only update the primary. The default is to update both the primary and backup service nodes. - -\ **-r|-**\ **-remdef**\ - + +\ **-r|-**\ **-remdef**\ + Use this option to reset, deallocate, and remove NIM client definitions. This option will not attempt to shut down running nodes. This option should be used when remove alternate NIM client definitions that were created using \ **mkdsklsnode -n**\ . - -\ **-V |-**\ **-verbose**\ - + +\ **-V |-**\ **-verbose**\ + Verbose mode. - + From d457294488cc9aba52dbdec50e91e6b4ca2fe636 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0362/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst --- .../references/man1/rmflexnode.1.rst | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst b/docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst index 4aebb1f7a..5859588de 100644 --- a/docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst @@ -23,7 +23,7 @@ SYNOPSIS \ **rmflexnode**\ [\ **-v**\ | \ **-**\ **-version**\ ] -\ **rmflexnode**\ \ *noderange*\ +\ **rmflexnode**\ \ *noderange*\ *********** @@ -48,16 +48,16 @@ OPTIONS -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Display the usage message. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display the version information. - + @@ -68,15 +68,15 @@ EXAMPLES 1 Delete a flexible node base on the xCAT node blade1. - + The blade1 should belong to a complex, the \ *id*\ attribute should be set correctly and all the slots should be in \ **power off**\ state. - - + + .. code-block:: perl - + rmflexnode blade1 - - + + From 2d743984e399cc79ca6ee036fae5ed8efcb12b79 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0363/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst --- .../references/man1/rmhwconn.1.rst | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst b/docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst index 225bb4627..0229cf313 100644 --- a/docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst @@ -27,21 +27,21 @@ PPC (with HMC) specific: ======================== -\ **rmhwconn**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ +\ **rmhwconn**\ [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ PPC (without HMC, using FSPAPI) specific: ========================================= -\ **rmhwconn**\ \ *noderange*\ \ **-T**\ \ *tooltype*\ +\ **rmhwconn**\ \ *noderange*\ \ **-T**\ \ *tooltype*\ PPC (use HMC as SFP) specific: ============================== -\ **rmhwconn**\ \ **-s**\ +\ **rmhwconn**\ \ **-s**\ @@ -71,22 +71,22 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose output. - -\ **-T**\ - + +\ **-T**\ + The tooltype is used to communicate to the CEC/Frame. The value could be \ **lpar**\ or \ **fnm**\ . The tooltype value \ **lpar**\ is for xCAT and \ **fnm**\ is for CNM. - + @@ -107,39 +107,39 @@ EXAMPLES 1. - + To disconnect all CEC nodes in node group cec from their HMC nodes: - - + + .. code-block:: perl - + rmhwconn cec - - + + 2. - + To remove the connection for Frame node frame1: - - + + .. code-block:: perl - + rmhwconn frame1 - - + + 3. - + To disconnect all CEC nodes in node group cec from their related hardware serveri, using lpar tooltype: - - + + .. code-block:: perl - + rmhwconn cec -T lpar - - + + From 0047235049e8dd059678a380f625f8f91bbda48a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0364/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst --- .../references/man1/rmhypervisor.1.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst b/docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst index 5ada8fcbb..222ccef1d 100644 --- a/docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **RHEV specific :**\ +\ **RHEV specific :**\ \ **rmhypervisor**\ \ *noderange*\ [\ **-f**\ ] @@ -39,10 +39,10 @@ OPTIONS -\ **-f**\ - +\ **-f**\ + If \ **-f**\ is specified, the host will be deactivated to maintenance before the removing. - + @@ -63,13 +63,13 @@ EXAMPLES 1. To remove the host 'host1', enter: - - + + .. code-block:: perl - + rmhypervisor host1 - - + + From 202471e2a73bfb52e434989e443c4b1261f36daf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0365/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmigrate.1.rst --- .../guides/admin-guides/references/man1/rmigrate.1.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmigrate.1.rst b/docs/source/guides/admin-guides/references/man1/rmigrate.1.rst index c76a6584e..dcb4a6a2e 100644 --- a/docs/source/guides/admin-guides/references/man1/rmigrate.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmigrate.1.rst @@ -15,11 +15,11 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** -\ **rmigrate**\ \ *noderange*\ \ *target_host*\ +\ **rmigrate**\ \ *noderange*\ \ *target_host*\ For zVM: ======== @@ -30,7 +30,7 @@ For zVM: ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -83,7 +83,7 @@ zVM specific: ************* -\ **Files**\ +\ **Files**\ ************* @@ -93,7 +93,7 @@ This is used to determine the current host to migrate from. **************** -\ **Examples**\ +\ **Examples**\ **************** From cd6804400852be08aa2184b7a2d7eab18a770bff Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0366/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmimage.1.rst --- .../guides/admin-guides/references/man1/rmimage.1.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmimage.1.rst b/docs/source/guides/admin-guides/references/man1/rmimage.1.rst index 4fa283448..637e0ade5 100644 --- a/docs/source/guides/admin-guides/references/man1/rmimage.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmimage.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **rmimage [-h | -**\ **-help]**\ +\ **rmimage [-h | -**\ **-help]**\ -\ **rmimage [-V | -**\ **-verbose]**\ \ *imagename*\ \ **[-**\ **-xcatdef]**\ +\ **rmimage [-V | -**\ **-verbose]**\ \ *imagename*\ \ **[-**\ **-xcatdef]**\ *********** @@ -32,7 +32,7 @@ DESCRIPTION Removes the Linux stateless or statelite image from the file system. The install dir is setup by using "installdir" attribute set in the site table. -If \ *imagename*\ is specified, this command uses the information in the \ *imagename*\ +If \ *imagename*\ is specified, this command uses the information in the \ *imagename*\ to calculate the image root directory; otherwise, this command uses the operating system name, architecture and profile name to calculate the image root directory. @@ -41,7 +41,7 @@ specifying the flag \ **-**\ **-xcatdef**\ will remove the osimage definition, or you can use rmdef -t osimage to remove the osimage definition. The statelite image files on the diskful service nodes will not be removed, -remove the image files on the service nodes manually if necessary, +remove the image files on the service nodes manually if necessary, for example, use command "rsync -az --delete /install :/" to remove the image files on the service nodes, where the is the hostname of the service node. From 1e73c398d308299f9fc1c1cb90c2a1279f226879 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0367/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmkit.1.rst --- .../admin-guides/references/man1/rmkit.1.rst | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmkit.1.rst b/docs/source/guides/admin-guides/references/man1/rmkit.1.rst index d83ca67ce..a4aec473b 100644 --- a/docs/source/guides/admin-guides/references/man1/rmkit.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmkit.1.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **rmkit**\ [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ] -\ **rmkit**\ [\ **-V | -**\ **-verbose**\ ] [\ **-f | -**\ **-force**\ ] [\ **-t | -**\ **-test**\ ] \ *kitlist*\ +\ **rmkit**\ [\ **-V | -**\ **-verbose**\ ] [\ **-f | -**\ **-force**\ ] [\ **-t | -**\ **-test**\ ] \ *kitlist*\ *********** @@ -40,40 +40,40 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command version. - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + Remove this kit even there is any component in this kit is listed by osimage.kitcomponents. If this option is not specified, this kit will not be removed if any kit components listed in an osimage.kitcomponents - -\ **-t|-**\ **-test**\ - + +\ **-t|-**\ **-test**\ + Test if kitcomponents in this kit are used by osimage - -\ *kitlist*\ - + +\ *kitlist*\ + A comma delimited list of kits that are to be removed from the xCAT cluster. Each entry can be a kitname or kit basename. For kit basename, rmkit command will remove all the kits that have that kit basename. - + From 1b383507a4c21151e50c9153e881db218f190e54 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0368/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst --- .../references/man1/rmkitcomp.1.rst | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst b/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst index 183372691..3dbd0bf13 100644 --- a/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **rmkitcomp**\ [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ] -\ **rmkitcomp**\ [\ **-V | -**\ **-verbose**\ ] [\ **-u | -**\ **-uninstall**\ ] [\ **-f | -**\ **-force**\ ] [\ **-**\ **-noscripts**\ ] \ **-i**\ \ *osimage*\ \ *kitcompname_list*\ +\ **rmkitcomp**\ [\ **-V | -**\ **-verbose**\ ] [\ **-u | -**\ **-uninstall**\ ] [\ **-f | -**\ **-force**\ ] [\ **-**\ **-noscripts**\ ] \ **-i**\ \ *osimage*\ \ *kitcompname_list*\ *********** @@ -40,52 +40,52 @@ OPTIONS -\ **-u|-**\ **-uninstall**\ - +\ **-u|-**\ **-uninstall**\ + All the kit component meta rpms and package rpms in otherpkglist will be uninstalled during genimage for stateless image and updatenode for stateful nodes. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command version. - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + Remove this kit component from osimage no matter it is a dependency of other kit components. - -\ **-**\ **-noscripts**\ - + +\ **-**\ **-noscripts**\ + Do not remove kitcomponent's postbootscripts from osimage - -\ **-i**\ \ *osimage*\ - + +\ **-i**\ \ *osimage*\ + osimage name that include this kit component. - -\ *kitcompname_list*\ - + +\ *kitcompname_list*\ + A comma-delimited list of valid full kit component names or kit component basenames that are to be removed from the osimage. If a basename is specified, all kitcomponents matching that basename will be removed from the osimage. - + From 23dd5cfdec832e2c904f5f977b6fd544bece8ce4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0369/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst --- .../references/man1/rmnimimage.1.rst | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst b/docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst index f6b6ffe7a..134b409af 100644 --- a/docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **rmnimimage [-h|-**\ **-help]**\ +\ **rmnimimage [-h|-**\ **-help]**\ -\ **rmnimimage [-V|-**\ **-verbose] [-f|-**\ **-force] [-d|-**\ **-delete] [-x|-**\ **-xcatdef] [-M|-**\ **-managementnode] [-s**\ \ *servicenoderange*\ ] \ *osimage_name*\ +\ **rmnimimage [-V|-**\ **-verbose] [-f|-**\ **-force] [-d|-**\ **-delete] [-x|-**\ **-xcatdef] [-M|-**\ **-managementnode] [-s**\ \ *servicenoderange*\ ] \ *osimage_name*\ *********** @@ -31,7 +31,7 @@ DESCRIPTION Use this xCAT command to remove the AIX resources specified in an xCAT osimage definition. -To list the contents of the xCAT osimage definition use the xCAT \ **lsdef**\ command ("lsdef -t osimage -l -o "). \ **Before running the rmnimimage command you should be absolutely certain that you really want to remove the NIM resources specified in the xCAT osimage definition!**\ +To list the contents of the xCAT osimage definition use the xCAT \ **lsdef**\ command ("lsdef -t osimage -l -o "). \ **Before running the rmnimimage command you should be absolutely certain that you really want to remove the NIM resources specified in the xCAT osimage definition!**\ The default behavior of this command is to remove all the NIM resources, except the lpp_source, on the xCAT management node in addition to the resources that were replicated on any xCAT service nodes. @@ -58,52 +58,52 @@ OPTIONS -\ **-h |-**\ **-help**\ - +\ **-h |-**\ **-help**\ + Display usage message. - -\ **-d|-**\ **-delete**\ - + +\ **-d|-**\ **-delete**\ + Delete any files or directories that were left after the "nim -o remove" command was run. This option will also remove the lpp_source resouce and all files contained in the lpp_source directories. When this command completes all definitions and files will be completely erased so use with caution! - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + Override the check for shared resources when removing an xCAT osimage. - -\ **-M|-**\ **-managementnode**\ - + +\ **-M|-**\ **-managementnode**\ + Remove NIM resources from the xCAT management node only. - -\ **-s**\ \ *servicenoderange*\ - + +\ **-s**\ \ *servicenoderange*\ + Remove the NIM resources on these xCAT service nodes only. Do not remove the NIM resources from the xCAT management node. - -\ *osimage_name*\ - + +\ *osimage_name*\ + The name of the xCAT osimage definition. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. This option will display the underlying NIM commands that are being called. - -\ **-x|-**\ **-xcatdef**\ - + +\ **-x|-**\ **-xcatdef**\ + Remove the xCAT osimage definition. - + From 52b8637626ac1bcd7c645152f90bee46685c05f8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0370/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmvlan.1.rst --- .../admin-guides/references/man1/rmvlan.1.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmvlan.1.rst b/docs/source/guides/admin-guides/references/man1/rmvlan.1.rst index 67b48992a..f5a8674c0 100644 --- a/docs/source/guides/admin-guides/references/man1/rmvlan.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmvlan.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **rmvlan**\ \ *vlanid*\ +\ **rmvlan**\ \ *vlanid*\ \ **rmvlan**\ [\ **-h | -**\ **-help**\ ] @@ -76,19 +76,19 @@ EXAMPLES 1. - + To remove vlan 3 - - + + .. code-block:: perl - + rmvlan 3 - - + + If the nodes are KVM guest then the do the following after the vlan is removed: rpower node1,node2 off rmvm node1,node2 - + From d69846bd8214df30e67ac6c72c569d55e011a8b1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0371/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmvm.1.rst --- .../guides/admin-guides/references/man1/rmvm.1.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmvm.1.rst b/docs/source/guides/admin-guides/references/man1/rmvm.1.rst index 39a083ec7..d1d7a5e5a 100644 --- a/docs/source/guides/admin-guides/references/man1/rmvm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmvm.1.rst @@ -19,24 +19,24 @@ SYNOPSIS ******** -\ **rmvm [-h| -**\ **-help]**\ +\ **rmvm [-h| -**\ **-help]**\ -\ **rmvm [-v| -**\ **-version]**\ +\ **rmvm [-v| -**\ **-version]**\ -\ **rmvm [-V| -**\ **-verbose]**\ \ *noderange*\ \ **[-r] [-**\ **-service]**\ +\ **rmvm [-V| -**\ **-verbose]**\ \ *noderange*\ \ **[-r] [-**\ **-service]**\ For KVM and VMware: =================== -\ **rmvm [-p] [-f]**\ \ *noderange*\ +\ **rmvm [-p] [-f]**\ \ *noderange*\ PPC (using Direct FSP Management) specific: =========================================== -\ **rmvm [-p]**\ \ *noderange*\ +\ **rmvm [-p]**\ \ *noderange*\ From f609d6530f0a2ca63718e94ef43f8f775b1acfff Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0372/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rmzone.1.rst --- .../admin-guides/references/man1/rmzone.1.rst | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rmzone.1.rst b/docs/source/guides/admin-guides/references/man1/rmzone.1.rst index 5b51983b6..0ce98ee7d 100644 --- a/docs/source/guides/admin-guides/references/man1/rmzone.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmzone.1.rst @@ -7,7 +7,7 @@ rmzone.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,7 +15,7 @@ rmzone.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** @@ -25,105 +25,105 @@ rmzone.1 ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* The \ **rmzone**\ command is designed to remove a previously defined zone from the cluster. -It will remove the zone entry in the zone table. It will remove the zone from the zonename attributes on the nodes that were assigned to the zone. Optionally, it will remove the zonename group from the nodes that were assigned to the zone. -It will also remove the root ssh keys that were created for that zone on the Management Node. +It will remove the zone entry in the zone table. It will remove the zone from the zonename attributes on the nodes that were assigned to the zone. Optionally, it will remove the zonename group from the nodes that were assigned to the zone. +It will also remove the root ssh keys that were created for that zone on the Management Node. The rmzone command is only supported on Linux ( No AIX support). -The nodes are not automatically updated with new root ssh keys by rmzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys. The nodes new ssh key will be assigned from the defaultzone in the zone table, or if no entries in the zone table, the keys will come from /root/.ssh. +The nodes are not automatically updated with new root ssh keys by rmzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys. The nodes new ssh key will be assigned from the defaultzone in the zone table, or if no entries in the zone table, the keys will come from /root/.ssh. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. *************** -\ **OPTIONS**\ +\ **OPTIONS**\ *************** -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Displays usage information. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Displays command version and build date. - -\ **-f | -**\ **-force**\ - + +\ **-f | -**\ **-force**\ + Used to remove a zone that is defined as current default zone. This should only be done if you are removing all zones, or you will adding a new zone or changing an existing zone to be the default zone. - -\ **-g | -**\ **-assigngroup**\ - + +\ **-g | -**\ **-assigngroup**\ + Remove the assigned group named \ **zonename**\ from all nodes assigned to the zone being removed. - -\ **-V | -**\ **-Verbose**\ - + +\ **-V | -**\ **-Verbose**\ + Verbose mode. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. To remove zone1 from the zone table and the zonename attribute on all it's assigned nodes , enter: - - + + .. code-block:: perl - + rmzone zone1 - - + + 2. - + To remove zone2 from the zone table, the zone2 zonename attribute, and the zone2 group assigned to all nodes that were in zone2, enter: - - + + .. code-block:: perl - + rmzone zone2 -g - - + + 3. - + To remove zone3 from the zone table, all the node zone attributes and override the fact it is the defaultzone, enter: - - + + .. code-block:: perl - + rmzone zone3 -g -f - - -\ **Files**\ -\ **/opt/xcat/bin/rmzone/**\ + +\ **Files**\ + +\ **/opt/xcat/bin/rmzone/**\ Location of the rmzone command. **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From 18dd8d8780d146e98735cd4e0b64e1a0fca99358 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0373/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rnetboot.1.rst --- .../references/man1/rnetboot.1.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rnetboot.1.rst b/docs/source/guides/admin-guides/references/man1/rnetboot.1.rst index 866e10306..c86ad1317 100644 --- a/docs/source/guides/admin-guides/references/man1/rnetboot.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rnetboot.1.rst @@ -46,41 +46,41 @@ OPTIONS ******* -\ **-s**\ +\ **-s**\ Set the boot device order. Accepted boot devices are hd and net. -\ **-F**\ +\ **-F**\ Force reboot the system no matter what state the node is. By default, rnetboot will not reboot the node if node is in 'boot' state. -\ **-f**\ +\ **-f**\ Force immediate shutdown of the partition. -\ **-m**\ +\ **-m**\ Use one or multiple -m flags to specify the node attributes and the expected status for the node installation monitoring and automatic retry mechanism. The operators ==, !=, =~ and !~ are valid. This flag must be used with -t flag. Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attrval" needs to be quoted. If the operator is "!~", the "attrval" needs to be quoted using single quote. -\ **-r**\ +\ **-r**\ specify the number of retries that the monitoring process will perform before declaring the failure. The default value is 3. Setting the retrycount to 0 means only monitoring the os installation progress and will not re-initiate the installation if the node status has not been changed to the expected value after timeout. This flag must be used with -m flag. -\ **-t**\ +\ **-t**\ Specify the timeout, in minutes, to wait for the expectedstatus specified by -m flag. This is a required flag if the -m flag is specified. -\ **-V|-**\ **-verbose**\ +\ **-V|-**\ **-verbose**\ Verbose output. -\ **-h|-**\ **-help**\ +\ **-h|-**\ **-help**\ Display usage message. -\ **-v|-**\ **-version**\ +\ **-v|-**\ **-version**\ Command Version. @@ -104,15 +104,15 @@ EXAMPLES .. code-block:: perl rnetboot 1,3 - + rnetboot 14-56,70-203 - + rnetboot 1,3,14-56,70-203 - + rnetboot all,-129-256 - + rnetboot all -s hd,net - + rnetboot all ipl=00c From 9ab6327830df00a3266447114848a643f64e61ff Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0374/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rollupdate.1.rst --- .../references/man1/rollupdate.1.rst | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rollupdate.1.rst b/docs/source/guides/admin-guides/references/man1/rollupdate.1.rst index 4d0210087..385666d8b 100644 --- a/docs/source/guides/admin-guides/references/man1/rollupdate.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rollupdate.1.rst @@ -31,10 +31,10 @@ DESCRIPTION The \ **rollupdate**\ command creates and submits scheduler reservation jobs that will notify xCAT to shutdown a group of nodes, run optional out-of-band commands from the xCAT management node, and reboot the nodes. Currently, only LoadLeveler is supported as a job scheduler with \ **rollupdate**\ . -Input to the \ **rollupdate**\ command is passed in as stanza data through STDIN. Information such as the sets of nodes that will be updated, the name of the job scheduler, a template for generating job command files, and other control data are required. See -/opt/xcat/share/xcat/rollupdate/rollupdate.input.sample +Input to the \ **rollupdate**\ command is passed in as stanza data through STDIN. Information such as the sets of nodes that will be updated, the name of the job scheduler, a template for generating job command files, and other control data are required. See +/opt/xcat/share/xcat/rollupdate/rollupdate.input.sample and -/opt/xcat/share/xcat/rollupdate/rollupdate_all.input.sample +/opt/xcat/share/xcat/rollupdate/rollupdate_all.input.sample for stanza keywords, usage, and examples. The \ **rollupdate**\ command will use the input data to determine each set of nodes that will be managed together as an update group. For each update group, a job scheduler command file is created and a reservation request is submitted. When the group of nodes becomes available and the scheduler activates the reservation, the xcatd daemon on the management node will be notified to begin the update process for all the nodes in the update group. If specified, prescripts will be run, an operating system shutdown command will be sent to each node, out-of-band operations can be run on the management node, and the nodes are powered back on. @@ -48,28 +48,28 @@ OPTIONS -\ **-v|-**\ **-version**\ - +\ **-v|-**\ **-version**\ + Command Version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Display additional progress and error messages. Output is also logged in /var/log/xcat/rollupdate.log. - -\ **-t|-**\ **-test**\ - + +\ **-t|-**\ **-test**\ + Run the rollupdate command in test mode only to verify the output files that are created. No scheduler reservation requests will be submitted. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -95,17 +95,17 @@ EXAMPLES 1. - - To run a cluster rolling update based on the information you have created in the file + + To run a cluster rolling update based on the information you have created in the file /u/admin/rolling_updates/update_all.stanza enter: - - + + .. code-block:: perl - + cat /u/admin/rolling_updates/update_all.stanza | rollupdate - - + + From 82090bd9188f556ef812af3f38ad9534721f937b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0375/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rpower.1.rst --- .../admin-guides/references/man1/rpower.1.rst | 284 +++++++++--------- 1 file changed, 142 insertions(+), 142 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rpower.1.rst b/docs/source/guides/admin-guides/references/man1/rpower.1.rst index 71bdc73a8..3756d063e 100644 --- a/docs/source/guides/admin-guides/references/man1/rpower.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rpower.1.rst @@ -149,94 +149,94 @@ OPTIONS -\ **on**\ - +\ **on**\ + Turn power on. - -\ **onstandby**\ - + +\ **onstandby**\ + Turn power on to standby state - -\ **-T**\ - + +\ **-T**\ + The value could be \ **lpar**\ or \ **fnm**\ . The tooltype value \ **lpar**\ is for xCAT and \ **fnm**\ is for CNM. The default value is "\ **lpar**\ ". For cold start in the large cluster, it will save a lot of time if the admins use "\ **rpower**\ \ *noderange*\ \ **onstandby**\ \ **-T**\ \ **fnm**\ " to power on all the CECs from the management node through the \ **fnm**\ connections. - -\ **rackstandby**\ - + +\ **rackstandby**\ + Places the rack in the rack standby state. It requires that all CECs and DE be powered off before it will run. - -\ **exit_rackstandby**\ - + +\ **exit_rackstandby**\ + Exit Rack standby will be the default state that a rack goes into when power is initially applied to the rack. It simply moves the BPA from Rack standby to both bpa's in standby state. - -\ **resetsp**\ - + +\ **resetsp**\ + Reboot the service processor. If there are primary and secondary FSPs/BPAs of one cec/frame, it will reboot them almost at the same time. - -\ **softoff**\ - + +\ **softoff**\ + Attempt to request clean shutdown of OS (may not detect failures in completing command) - -\ **off**\ - + +\ **off**\ + Turn power off. - -\ **suspend**\ - + +\ **suspend**\ + Suspend the target nodes execution. - + The \ **suspend**\ action could be run together with \ **-w**\ \ **-o**\ \ **-r**\ . - + Refer to the following steps to enable the \ **suspend**\ function: - + 1. Add the 'acpid' and 'suspend'(the suspend package is not needed on RHEL) package to the .pkglist of your osimage so that the required package could be installed correctly to your target system. - + 2. Add two configuration files for the base function: - - + + .. code-block:: perl - + /etc/pm/config.d/suspend S2RAM_OPTS="--force --vbe_save --vbe_post --vbe_mode" - + /etc/acpi/events/suspend_event event=button/sleep.* action=/usr/sbin/pm-suspend - - + + 3. Add the hook files for your specific applications which need specific action before or after the suspend action. - + Refer to the 'pm-utils' package for how to create the specific hook files. - -\ **wake**\ - + +\ **wake**\ + Wake up the target nodes which is in \ **suspend**\ state. - + Don't try to run \ **wake**\ against the 'on' state node, it would cause the node gets to 'off' state. - + For some of xCAT hardware such as NeXtScale, it may need to enable S3 before using \ **wake**\ . The following steps can be used to enable S3. Reference pasu(1)|pasu.1 for "pasu" usage. - - + + .. code-block:: perl - + [root@xcatmn home]# echo "set Power.S3Enable Enable" > power-setting [root@xcatmn home]# pasu -b power-setting node01 node01: Batch mode start. @@ -248,7 +248,7 @@ OPTIONS node01: Command completed successfully. node01: Completed intermediate batch update. node01: Batch mode completed successfully. - + [root@xcatmn home]# pasu node01 show all|grep -i s3 node01: IMM.Community_HostIPAddress3.1= node01: IMM.Community_HostIPAddress3.2= @@ -256,158 +256,158 @@ OPTIONS node01: IMM.DNS_IP_Address3=0.0.0.0 node01: IMM.IPv6DNS_IP_Address3=:: node01: Power.S3Enable=Enable - - -\ **stat | state**\ - + + +\ **stat | state**\ + Print the current power state/status. - -\ **reset**\ - + +\ **reset**\ + Send a hard reset. - -\ **boot**\ - + +\ **boot**\ + If off, then power on. If on, then hard reset. This option is recommended over \ **cycle**\ . - -\ **cycle**\ - + +\ **cycle**\ + Power off, then on. - -\ **reseat**\ - + +\ **reseat**\ + For Lenovo high-density servers, simulates unplugging and replugging the node into the chassis. - -\ **of**\ - + +\ **of**\ + Boot the node to open firmware console mode. - -\ **sms**\ - + +\ **sms**\ + Boot the node to open firmware SMS menu mode. - -\ **-m**\ \ *table.column*\ ==\ *expectedstatus*\ \ **-m**\ \ *table.column*\ =~\ *expectedstatus*\ - + +\ **-m**\ \ *table.column*\ ==\ *expectedstatus*\ \ **-m**\ \ *table.column*\ =~\ *expectedstatus*\ + Use one or multiple \ **-m**\ flags to specify the node attributes and the expected status for the node installation monitoring and automatic retry mechanism. The operators ==, !=, =~ and !~ are valid. This flag must be used with -t flag. - + Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attrval" needs to be quoted. If the operator is "!~", the "attrval" needs to be quoted using single quote. - -\ **-**\ **-nodeps**\ - + +\ **-**\ **-nodeps**\ + Do not use dependency table (default is to use dependency table). Valid only with \ **on|off|boot|reset|cycle**\ for blade power method and \ **on|off|reset|softoff**\ for hmc/fsp power method. - -\ **-r**\ \ *retrycount*\ - + +\ **-r**\ \ *retrycount*\ + specify the number of retries that the monitoring process will perform before declaring the failure. The default value is 3. Setting the retrycount to 0 means only monitoring the os installation progress and will not re-initiate the installation if the node status has not been changed to the expected value after timeout. This flag must be used with -m flag. - -\ **-t**\ \ *timeout*\ - + +\ **-t**\ \ *timeout*\ + Specify the timeout, in minutes, to wait for the expectedstatus specified by -m flag. This is a required flag if the -m flag is specified. - + Power off, then on. - -\ **-w**\ \ *timeout*\ - + +\ **-w**\ \ *timeout*\ + To set the \ *timeout*\ for the \ **suspend**\ action to wait for the success. - -\ **-o**\ - + +\ **-o**\ + To specify that the target node will be power down if \ **suspend**\ action failed. - -\ **-r**\ - + +\ **-r**\ + To specify that the target node will be reset if \ **suspend**\ action failed. - -\ **start**\ - + +\ **start**\ + To start a created docker instance. - -\ **stop**\ - + +\ **stop**\ + To stop a created docker instance. - -\ **restart**\ - + +\ **restart**\ + To restart a created docker instance. - -\ **pause**\ - + +\ **pause**\ + To pause all processes in the instance. - -\ **unpause**\ - + +\ **unpause**\ + To unpause all processes in the instance. - -\ **bmcreboot**\ - + +\ **bmcreboot**\ + To reboot BMC. - -\ **bmcstate**\ - + +\ **bmcstate**\ + To get state of the BMC. - -\ **state**\ - + +\ **state**\ + To get state of the instance. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Prints out a brief usage message. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display the version number. - + @@ -418,40 +418,40 @@ EXAMPLES 1. To display power status of nodes4 and note5 - - + + .. code-block:: perl - + rpower node4,node5 stat - - + + Output is similar to: - - + + .. code-block:: perl - + node4: on node5: off - - + + 2. To power on node5 - - + + .. code-block:: perl - + rpower node5 on - - + + Output is similar to: - - + + .. code-block:: perl - + node5: on - - + + From efc106059cded2a0e7696774473906bcf9a1d87c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0376/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rscan.1.rst --- .../admin-guides/references/man1/rscan.1.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rscan.1.rst b/docs/source/guides/admin-guides/references/man1/rscan.1.rst index 9d6ff5082..fa143d57a 100644 --- a/docs/source/guides/admin-guides/references/man1/rscan.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rscan.1.rst @@ -19,11 +19,11 @@ SYNOPSIS ******** -\ **rscan [-h|-**\ **-help]**\ +\ **rscan [-h|-**\ **-help]**\ -\ **rscan [-v|-**\ **-version]**\ +\ **rscan [-v|-**\ **-version]**\ -\ **rscan [-V|-**\ **-verbose]**\ \ *noderange*\ \ **[-u][-w][-x|-z]**\ +\ **rscan [-V|-**\ **-verbose]**\ \ *noderange*\ \ **[-u][-w][-x|-z]**\ *********** @@ -101,7 +101,7 @@ Output is similar to: .. code-block:: perl type name id type-model serial-number address - + hmc hmc01 7310-C05 10F426A hmc01 fsp Server-9117-MMA-SN10F6F3D 9117-MMA 10F6F3D 3.3.3.197 lpar lpar3 4 9117-MMA 10F6F3D @@ -136,7 +136,7 @@ Output is similar to: fsp,all 10 - + ivm lpar01 @@ -150,7 +150,7 @@ Output is similar to: lpar,all 1 - + ivm lpar02 @@ -191,7 +191,7 @@ Output is similar to: groups=bpa,all mgt=hmc cons= - + Server-9119-590-SN02C5F9E: objtype=node type=fsp @@ -204,7 +204,7 @@ Output is similar to: groups=fsp,all mgt=hmc cons= - + lpar01: objtype=node nodetype=lpar,osi @@ -217,7 +217,7 @@ Output is similar to: groups=lpar,all mgt=hmc cons=hmc - + lpar02: objtype=node nodetype=lpar,osi From b097c09b23a6ada92a2f9801683e18c026a5490b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0377/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rsetboot.1.rst --- .../references/man1/rsetboot.1.rst | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst index f25aa0bed..a38804cb1 100644 --- a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst @@ -30,46 +30,46 @@ OPTIONS -\ **hd**\ - +\ **hd**\ + Boot from the hard disk. - -\ **net**\ - + +\ **net**\ + Boot over the network, using a PXE or BOOTP broadcast. - -\ **cd**\ - + +\ **cd**\ + Boot from the CD or DVD drive. - -\ **def | default**\ - + +\ **def | default**\ + Boot using the default set in BIOS. - -\ **stat**\ - + +\ **stat**\ + Display the current boot setting. - -\ **-u**\ - + +\ **-u**\ + To specify the next boot mode to be "UEFI Mode". (Not supported for OpenBMC) - -\ **-p**\ - + +\ **-p**\ + To make the specified boot device and boot mode settings persistent. - + @@ -80,47 +80,47 @@ EXAMPLES 1. - + Set nodes 1 and 3 to boot from the network on the next boot: - - + + .. code-block:: perl - + rsetboot node1,node3 net - - + + 2. - + Display the next-boot value for nodes 14-56 and 70-203: - - + + .. code-block:: perl - + rsetboot node[14-56],node[70-203] stat - - + + Or: - - + + .. code-block:: perl - + rsetboot node[14-56],node[70-203] - - + + 3. - + Restore the next-boot value for these nodes back to their default set in the BIOS: - - + + .. code-block:: perl - + rsetboot node1,node3,node[14-56],node[70-203] default - - + + From be567e038a2004b0b5153e7f444e57396b0f800e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0378/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rspconfig.1.rst --- .../references/man1/rspconfig.1.rst | 1066 ++++++++--------- 1 file changed, 533 insertions(+), 533 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst index 3e61e08ba..957b8848d 100644 --- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst @@ -29,7 +29,7 @@ BMC/MPA specific: \ **rspconfig**\ \ *noderange*\ \ **alert**\ ={\ **on | enable | off | disable**\ } -\ **rspconfig**\ \ *noderange*\ \ **snmpdest**\ =\ *snmpmanager-IP*\ +\ **rspconfig**\ \ *noderange*\ \ **snmpdest**\ =\ *snmpmanager-IP*\ \ **rspconfig**\ \ *noderange*\ \ **community**\ ={\ **public**\ | \ *string*\ } @@ -40,7 +40,7 @@ BMC specific: \ **rspconfig**\ \ *noderange*\ {\ **ip | netmask | gateway | backupgateway | garp | vlan**\ } -\ **rspconfig**\ \ *noderange*\ \ **garp**\ =\ *time*\ +\ **rspconfig**\ \ *noderange*\ \ **garp**\ =\ *time*\ OpenBMC specific: @@ -51,41 +51,41 @@ OpenBMC specific: \ **rspconfig**\ \ *noderange*\ \ **admin_passwd**\ ={\ *currentpasswd,newpasswd*\ } -\ **rspconfig**\ \ *noderange*\ \ **autoreboot**\ +\ **rspconfig**\ \ *noderange*\ \ **autoreboot**\ -\ **rspconfig**\ \ *noderange*\ \ **autoreboot={0|1}**\ +\ **rspconfig**\ \ *noderange*\ \ **autoreboot={0|1}**\ -\ **rspconfig**\ \ *noderange*\ \ **bootmode**\ +\ **rspconfig**\ \ *noderange*\ \ **bootmode**\ -\ **rspconfig**\ \ *noderange*\ \ **bootmode={safe|regular|setup}**\ +\ **rspconfig**\ \ *noderange*\ \ **bootmode={safe|regular|setup}**\ \ **rspconfig**\ \ *noderange*\ \ **dump**\ [\ **-l | -**\ **-list**\ ] [\ **-g | -**\ **-generate**\ ] [\ **-c | -**\ **-clear**\ {\ *id*\ | \ **all**\ }] [\ **-d | -**\ **-download**\ {\ *id*\ | \ **all**\ }] -\ **rspconfig**\ \ *noderange*\ \ **gard -c|-**\ **-clear**\ +\ **rspconfig**\ \ *noderange*\ \ **gard -c|-**\ **-clear**\ -\ **rspconfig**\ \ *noderange*\ \ **ip=dhcp**\ +\ **rspconfig**\ \ *noderange*\ \ **ip=dhcp**\ -\ **rspconfig**\ \ *noderange*\ \ **hostname**\ +\ **rspconfig**\ \ *noderange*\ \ **hostname**\ \ **rspconfig**\ \ *noderange*\ \ **hostname**\ ={\* | \ *name*\ } -\ **rspconfig**\ \ *noderange*\ \ **ntpservers**\ +\ **rspconfig**\ \ *noderange*\ \ **ntpservers**\ \ **rspconfig**\ \ *noderange*\ \ **ntpservers**\ ={\ *ntpservers*\ } -\ **rspconfig**\ \ *noderange*\ \ **powerrestorepolicy**\ +\ **rspconfig**\ \ *noderange*\ \ **powerrestorepolicy**\ -\ **rspconfig**\ \ *noderange*\ \ **powerrestorepolicy={always_on|restore|always_off}**\ +\ **rspconfig**\ \ *noderange*\ \ **powerrestorepolicy={always_on|restore|always_off}**\ -\ **rspconfig**\ \ *noderange*\ \ **powersupplyredundancy**\ +\ **rspconfig**\ \ *noderange*\ \ **powersupplyredundancy**\ -\ **rspconfig**\ \ *noderange*\ \ **powersupplyredundancy={disabled|enabled}**\ +\ **rspconfig**\ \ *noderange*\ \ **powersupplyredundancy={disabled|enabled}**\ -\ **rspconfig**\ \ *noderange*\ \ **sshcfg**\ +\ **rspconfig**\ \ *noderange*\ \ **sshcfg**\ -\ **rspconfig**\ \ *noderange*\ \ **timesyncmethod**\ +\ **rspconfig**\ \ *noderange*\ \ **timesyncmethod**\ -\ **rspconfig**\ \ *noderange*\ \ **timesyncmethod={manual|ntp}**\ +\ **rspconfig**\ \ *noderange*\ \ **timesyncmethod={manual|ntp}**\ MPA specific: @@ -131,9 +131,9 @@ FSP/CEC specific: \ **rspconfig**\ \ *noderange*\ \ **iocap**\ ={\ **enable | disable**\ } -\ **rspconfig**\ \ *noderange*\ \ **time**\ =\ *hh:mm:ss*\ +\ **rspconfig**\ \ *noderange*\ \ **time**\ =\ *hh:mm:ss*\ -\ **rspconfig**\ \ *noderange*\ \ **date**\ =\ *mm:dd:yyyy*\ +\ **rspconfig**\ \ *noderange*\ \ **date**\ =\ *mm:dd:yyyy*\ \ **rspconfig**\ \ *noderange*\ \ **decfg**\ ={\ **enable|disable**\ :\ *policyname,...*\ } @@ -159,7 +159,7 @@ FSP/CEC specific: \ **rspconfig**\ \ *noderange*\ \ **hostname**\ ={\* | \ *name*\ } -\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ +\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ Flex system Specific: @@ -203,7 +203,7 @@ BPA/Frame Specific: \ **rspconfig**\ \ *noderange*\ \ **hostname**\ ={\* | \ *name*\ } -\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ +\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ FSP/CEC (using Direct FSP Management) Specific: @@ -242,7 +242,7 @@ FSP/CEC (using Direct FSP Management) Specific: \ **rspconfig**\ \ *noderange*\ {\ **force_failover**\ } -\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ +\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ BPA/Frame (using Direct FSP Management) Specific: @@ -269,7 +269,7 @@ BPA/Frame (using Direct FSP Management) Specific: \ **rspconfig**\ \ *noderange*\ \ **pending_power_on_side**\ ={\ **temp | perm**\ } -\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ +\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ HMC Specific: @@ -280,7 +280,7 @@ HMC Specific: \ **rspconfig**\ \ *noderange*\ \ **sshcfg**\ ={\ **enable | disable**\ } -\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ +\ **rspconfig**\ \ *noderange*\ \ **-**\ **-resetnet**\ @@ -300,418 +300,418 @@ OPTIONS -\ **alert={on | enable | off | disable}**\ - +\ **alert={on | enable | off | disable}**\ + Turn on or off SNMP alerts. - + \ **autopower**\ ={\ *enable*\ | \ *disable*\ } - + Select the policy for auto power restart. If enabled, the system will boot automatically once power is restored after a power disturbance. - -\ **backupgateway**\ - + +\ **backupgateway**\ + Get the BMC backup gateway ip address. - + \ **community**\ ={\ **public**\ | \ *string*\ } - + Get or set the SNMP commmunity value. The default is \ **public**\ . - -\ **date**\ =\ *mm:dd:yyy*\ - + +\ **date**\ =\ *mm:dd:yyy*\ + Enter the current date. - + \ **decfg**\ ={\ **enable | disable**\ :\ *policyname,...*\ } - + Enables or disables deconfiguration policies. - + \ **frame**\ ={\ *framenumber*\ | \*} - + Set or get frame number. If no framenumber and \* specified, framenumber for the nodes will be displayed and updated in xCAAT database. If framenumber is specified, it only supports single node and the framenumber will be set for that frame. If \* is specified, it supports noderange and all the frame numbers for the noderange will be read from xCAT database and set to frames. Setting the frame number is a disruptive command which requires all CECs to be powered off prior to issuing the command. - + \ **cec_off_policy**\ ={\ **poweroff | stayon**\ } - + Set or get cec off policy after lpars are powered off. If no cec_off_policy value specified, the cec_off_policy for the nodes will be displayed. the cec_off_policy has two values: \ **poweroff**\ and \ **stayon**\ . \ **poweroff**\ means Power off when last partition powers off. \ **stayon**\ means Stay running after last partition powers off. If cec_off_policy value is specified, the cec off policy will be set for that cec. - + \ **HMC_passwd**\ ={\ *currentpasswd,newpasswd*\ } - + Change the password of the userid \ **HMC**\ for CEC/Frame. If the CEC/Frame is the factory default, the currentpasswd should NOT be specified; otherwise, the currentpasswd should be specified to the current password of the userid \ **HMC**\ for the CEC/Frame. - + \ **admin_passwd**\ ={\ *currentpasswd,newpasswd*\ } - + Change the password of the userid \ **admin**\ for CEC/Frame from currentpasswd to newpasswd. If the CEC/Frame is the factory default, the currentpasswd should NOT be specified; otherwise, the currentpasswd should be specified to the current password of the userid \ **admin**\ for the CEC/Frame. - + \ **general_passwd**\ ={\ *currentpasswd,newpasswd*\ } - + Change the password of the userid \ **general**\ for CEC/Frame from currentpasswd to newpasswd. If the CEC/Frame is the factory default, the currentpasswd should NOT be specified; otherwise, the currentpasswd should be specified to the current password of the userid \ **general**\ for the CEC/Frame. - + \*\ **_passwd**\ ={\ *currentpasswd,newpasswd*\ } - + Change the passwords of the userids \ **HMC**\ , \ **admin**\ and \ **general**\ for CEC/Frame from currentpasswd to newpasswd. If the CEC/Frame is the factory default, the currentpasswd should NOT be specified; otherwise, if the current passwords of the userids \ **HMC**\ , \ **admin**\ and \ **general**\ for CEC/Frame are the same one, the currentpasswd should be specified to the current password, and then the password will be changed to the newpasswd. If the CEC/Frame is NOT the factory default, and the current passwords of the userids \ **HMC**\ , \ **admin**\ and \ **general**\ for CEC/Frame are NOT the same one, this option could NOT be used, and we should change the password one by one. - -\ **frequency**\ - + +\ **frequency**\ + The NTP update frequency (in minutes). - -\ **gard -c|-**\ **-clear**\ - + +\ **gard -c|-**\ **-clear**\ + Clear gard file. [OpenBMC] - -\ **garp**\ =\ *time*\ - + +\ **garp**\ =\ *time*\ + Get or set Gratuitous ARP generation interval. The unit is number of 1/2 second. - -\ **gateway**\ - + +\ **gateway**\ + The gateway ip address. - -\ **hostname**\ - + +\ **hostname**\ + Display the CEC/BPA system names. - -\ **BSR**\ - + +\ **BSR**\ + Get Barrier Synchronization Register (BSR) allocation for a CEC. - -\ **huge_page**\ - + +\ **huge_page**\ + Query huge page information or request NUM of huge pages for CEC. If no value specified, it means query huge page information for the specified CECs, if a CEC is specified, the specified huge_page value NUM will be used as the requested number of huge pages for the CEC, if CECs are specified, it means to request the same NUM huge pages for all the specified CECs. - + \ **setup_failover**\ ={\ **enable**\ | \ **disable**\ } - + Enable or disable the service processor failover function of a CEC or display status of this function. - -\ **force_failover**\ - + +\ **force_failover**\ + Force a service processor failover from the primary service processor to the secondary service processor. - + \ **hostname**\ ={\* | \ *name*\ } - + Set CEC/BPA system names to the names in xCAT DB or the input name. - + \ **iocap**\ ={\ **enable**\ | \ **disable**\ } - + Select the policy for I/O Adapter Enlarged Capacity. This option controls the size of PCI memory space allocated to each PCI slot. - -\ **hostname**\ - + +\ **hostname**\ + Get or set hostname on the service processor. - -\ **vlan**\ - + +\ **vlan**\ + Get or set vlan ID. For get vlan ID, if vlan is not enabled, 'BMC VLAN disabled' will be outputed. For set vlan ID, the valid value are [1-4096]. - -\ **ipsrc**\ - + +\ **ipsrc**\ + Get the IP source for OpenBMC. - -\ **ip**\ - + +\ **ip**\ + The IP address. - + \ **memdecfg**\ ={\ **configure | deconfigure**\ :\ *processingunit*\ :\ *unit|bank*\ :\ *id,...*\ } - + Select whether each memory bank should be enabled or disabled. State changes take effect on the next platform boot. - -\ **netmask**\ - + +\ **netmask**\ + The subnet mask. - -\ **powerrestorepolicy**\ - + +\ **powerrestorepolicy**\ + Display or control BMC Power Restore Policy attribute setting. [OpenBMC] - -\ **powersupplyredundancy**\ - + +\ **powersupplyredundancy**\ + Display or control BMC Power Supply Redundancy attribute setting. [OpenBMC] - -\ **autoreboot**\ - + +\ **autoreboot**\ + Display or control BMC Auto Reboot attribute setting. [OpenBMC] - -\ **bootmode**\ - + +\ **bootmode**\ + Display or control BMC Boot Mode attribute setting. [OpenBMC] - -\ **dump**\ - + +\ **dump**\ + Generate/Manage BMC system dumps. If no sub-option is provided, will generate, wait, and download the dump. [OpenBMC] - - + + \ **-c**\ will clear a single specified dump, or use 'all' to clear all dumps on the BMC. - - - + + + \ **-l**\ will list all the generated dumps on the BMC. - - - + + + \ **-g**\ will generate a new dump on the BMC. Dump generation can take a few minutes. - - - + + + \ **-d**\ will download a single dump or all generated dumps from the BMC to /var/log/xcat/dump on management or service node. - - - -\ **timesyncmethod**\ - + + + +\ **timesyncmethod**\ + Set the method for time synchronization on the BMC. [OpenBMC] - + \ **network**\ ={[\ *ip*\ ],[\ *host*\ ],[\ *gateway*\ ],[\ *netmask*\ ]|\*} - + For MPA: get or set the MPA network parameters. If '\*' is specified, all parameters are read from the xCAT database. - + For FSP of Flex system P node: set the network parameters. If '\*' is specified, all parameters are read from the xCAT database. - + \ **initnetwork**\ ={[\ *ip*\ ],[\ *host*\ ],[\ *gateway*\ ],[\ *netmask*\ ]|\*} - + For MPA only. Connecting to the IP of MPA from the hosts.otherinterfaces to set the MPA network parameters. If '\*' is specified, all parameters are read from the xCAT database. - + \ **network**\ ={\ *nic*\ ,{[\ *ip*\ ],[\ *host*\ ],[\ *gateway*\ ],[\ *netmask*\ ]}|\*} - - Not only for FSP/BPA but also for IMM. Get or set the FSP/BPA/IMM network parameters. If '\*' is specified, all parameters are read from the xCAT database. + + Not only for FSP/BPA but also for IMM. Get or set the FSP/BPA/IMM network parameters. If '\*' is specified, all parameters are read from the xCAT database. If the value of \ *ip*\ is '0.0.0.0', this \ *nic*\ will be configured as a DHCP client. Otherwise this \ *nic*\ will be configured with a static IP. - + Note that IPs of FSP/BPAs will be updated with this option, user needs to put the new IPs to /etc/hosts manually or with xCAT command makehosts. For more details, see the man page of makehosts. - -\ **nonred**\ - + +\ **nonred**\ + Allows loss of redundancy. - + \ **ntp**\ ={[\ *ntpenable*\ ],[\ *ntpserver*\ ],[\ *frequency*\ ],[\ *v3*\ ]} - + Get or set the MPA Network Time Protocol (NTP) parameters. - -\ **ntpenable**\ - + +\ **ntpenable**\ + Enable or disable NTP (enable|disable). - -\ **ntpserver**\ - + +\ **ntpserver**\ + Get or set NTP server IP address or name. - -\ **ntpservers**\ - + +\ **ntpservers**\ + Get or set NTP servers name. [OpenBMC] - + \ **pd1**\ ={\ **nonred | redwoperf | redwperf**\ } - + Power Domain 1 - determines how an MPA responds to a loss of redundant power. - + \ **pd2**\ ={\ **nonred | redwoperf | redwperf**\ } - + Power Domain 2 - determines how an MPA responds to a loss of redundant power. - + \ **procdecfg**\ ={\ **configure|deconfigure**\ :\ *processingunit*\ :\ *id,...*\ } - + Selects whether each processor should be enabled or disabled. State changes take effect on the next platform boot. - -\ **redwoperf**\ - + +\ **redwoperf**\ + Prevents components from turning on that will cause loss of power redundancy. - -\ **redwperf**\ - + +\ **redwperf**\ + Power throttles components to maintain power redundancy and prevents components from turning on that will cause loss of power redundancy. - + \ **snmpcfg**\ ={\ **enable | disable**\ } - + Enable or disable SNMP on MPA. - -\ **snmpdest**\ =\ *snmpmanager-IP*\ - + +\ **snmpdest**\ =\ *snmpmanager-IP*\ + Get or set where the SNMP alerts should be sent to. - + \ **solcfg**\ ={\ **enable | disable**\ } - + Enable or disable the sol on MPA (or CMM) and blade servers belongs to it. - -\ **spdump**\ - + +\ **spdump**\ + Performs a service processor dump. - + \ **sshcfg**\ ={\ **enable | disable**\ } - + Enable or disable SSH on MPA. - -\ **sshcfg**\ - + +\ **sshcfg**\ + Copy SSH keys. - + \ **swnet**\ ={[\ *ip*\ ],[\ *gateway*\ ],[\ *netmask*\ ]} - + Set the Switch network parameters. - -\ **sysdump**\ - + +\ **sysdump**\ + Performs a system dump. - -\ **sysname**\ - + +\ **sysname**\ + Query or set sysname for CEC or Frame. If no value specified, means to query sysname of the specified nodes. If '\*' specified, it means to set sysname for the specified nodes, and the sysname values would get from xCAT datebase. If a string is specified, it means to use the string as sysname value to set for the specified node. - + \ **pending_power_on_side**\ ={\ **temp|perm**\ } - + List or set pending power on side for CEC or Frame. If no pending_power_on_side value specified, the pending power on side for the CECs or frames will be displayed. If specified, the pending_power_on_side value will be set to CEC's FSPs or Frame's BPAs. The value 'temp' means T-side or temporary side. The value 'perm' means P-side or permanent side. - -\ **time**\ =\ *hh:mm:ss*\ - + +\ **time**\ =\ *hh:mm:ss*\ + Enter the current time in UTC (Coordinated Universal Time) format. - + \ **textid**\ ={\ *\\*|textid*\ } - + Set the blade or MPA textid. When using '\*', the textid used is the node name specified on the command-line. Note that when specifying an actual textid, only a single node can be specified in the noderange. - + \ **USERID**\ ={\ *newpasswd*\ } \ **updateBMC**\ ={\ **y|n**\ } - + Change the password of the userid \ **USERID**\ for CMM in Flex system cluster. The option \ *updateBMC*\ can be used to specify whether updating the password of BMCs that connected to the specified CMM. The value is 'y' by default which means whenever updating the password of CMM, the password of BMCs will be also updated. Note that there will be several seconds needed before this command complete. - + If value "\*" is specified for USERID and the object node is \ *Flex System X node*\ , the password used to access the BMC of the System X node through IPMI will be updated as the same password of the userid \ **USERID**\ of the CMM in the same cluster. - -\ **-**\ **-resetnet**\ - + +\ **-**\ **-resetnet**\ + Reset the network interfaces of the specified nodes. - -\ **v3**\ - + +\ **v3**\ + Enable or disable v3 authentication (enable|disable). - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Prints out a brief usage message. - -\ **-v**\ | \ **-**\ **-version**\ - + +\ **-v**\ | \ **-**\ **-version**\ + Display the version number. - + @@ -722,181 +722,181 @@ EXAMPLES 1. To setup new ssh keys on the Management Module mm: - - + + .. code-block:: perl - + rspconfig mm snmpcfg=enable sshcfg=enable - - + + 2. To turn on SNMP alerts for node5: - - + + .. code-block:: perl - + rspconfig node5 alert=on - - + + Output is similar to: - - + + .. code-block:: perl - + node5: Alerts: enabled - - + + 3. To display the destination setting for SNMP alerts for node4: - - + + .. code-block:: perl - + rspconfig node4 snmpdest - - + + Output is similar to: - - + + .. code-block:: perl - + node4: BMC SNMP Destination 1: 9.114.47.227 - - + + 4. - + To display the frame number for frame 9A00-10000001 - - + + .. code-block:: perl - + rspconfig> 9A00-10000001 frame - - + + Output is similar to: - - + + .. code-block:: perl - + 9A00-10000001: 1 - - + + 5. To set the frame number for frame 9A00-10000001 - - + + .. code-block:: perl - + rspconfig 9A00-10000001 frame=2 - - + + Output is similar to: - - + + .. code-block:: perl - + 9A00-10000001: SUCCESS - - + + 6. To set the frame numbers for frame 9A00-10000001 and 9A00-10000002 - - + + .. code-block:: perl - + rspconfig 9A00-10000001,9A00-10000002 frame=* - - + + Output is similar to: - - + + .. code-block:: perl - + 9A00-10000001: SUCCESS 9A00-10000002: SUCCESS - - + + 7. To display the MPA network parameters for mm01: - - + + .. code-block:: perl - + rspconfig mm01 network - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: MM IP: 192.168.1.47 mm01: MM Hostname: MM001125C31F28 mm01: Gateway: 192.168.1.254 mm01: Subnet Mask: 255.255.255.224 - - + + 8. To change the MPA network parameters with the values in the xCAT database for mm01: - - + + .. code-block:: perl - + rspconfig mm01 network=* - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: MM IP: 192.168.1.47 mm01: MM Hostname: mm01 mm01: Gateway: 192.168.1.254 mm01: Subnet Mask: 255.255.255.224 - - + + 9. To change only the gateway parameter for the MPA network mm01: - - + + .. code-block:: perl - + rspconfig mm01 network=,,192.168.1.1, - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: Gateway: 192.168.1.1 - - + + 10. To display the FSP network parameters for fsp01: - - + + .. code-block:: perl - + rspconfig> fsp01 network - - + + Output is similar to: - - + + .. code-block:: perl - + fsp01: eth0: IP Type: Dynamic @@ -904,237 +904,237 @@ EXAMPLES Hostname: Gateway: Netmask: 255.255.255.0 - + eth1: IP Type: Dynamic IP Address: 192.168.200.51 Hostname: fsp01 Gateway: Netmask: 255.255.255.0 - - + + 11. To change the FSP network parameters with the values in command line for eth0 on fsp01: - - + + .. code-block:: perl - + rspconfig fsp01 network=eth0,192.168.1.200,fsp01,,255.255.255.0 - - + + Output is similar to: - - + + .. code-block:: perl - + fsp01: Success to set IP address,hostname,netmask - - + + 12. To change the FSP network parameters with the values in the xCAT database for eth0 on fsp01: - - + + .. code-block:: perl - + rspconfig fsp01 network=eth0,* - - + + Output is similar to: - - + + .. code-block:: perl - + fsp01: Success to set IP address,hostname,gateway,netmask - - + + 13. To configure eth0 on fsp01 to get dynamic IP address from DHCP server: - - + + .. code-block:: perl - + rspconfig fsp01 network=eth0,0.0.0.0 - - + + Output is similar to: - - + + .. code-block:: perl - + fsp01: Success to set IP type to dynamic. - - + + 14. To get the current power redundancy mode for power domain 1 on mm01: - - + + .. code-block:: perl - + rspconfig mm01 pd1 - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: Redundant without performance impact - - + + 15. To change the current power redundancy mode for power domain 1 on mm01 to non-redundant: - - + + .. code-block:: perl - + rspconfig mm01 pd1=nonred - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: nonred - - + + 16. To enable NTP with an NTP server address of 192.168.1.1, an update frequency of 90 minutes, and with v3 authentication enabled on mm01: - - + + .. code-block:: perl - + rspconfig mm01 ntp=enable,192.168.1.1,90,enable - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: NTP: disabled mm01: NTP Server: 192.168.1.1 mm01: NTP: 90 (minutes) mm01: NTP: enabled - - + + 17. To disable NTP v3 authentication only on mm01: - - + + .. code-block:: perl - + rspconfig mm01 ntp=,,,disable - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: NTP v3: disabled - - + + 18. To disable Predictive Failure and L2 Failure deconfiguration policies on mm01: - - + + .. code-block:: perl - + rspconfig mm01 decfg=disable:predictive,L3 - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: Success - - + + 19. To deconfigure processors 4 and 5 of Processing Unit 0 on mm01: - - + + .. code-block:: perl - + rspconfig mm01 procedecfg=deconfigure:0:4,5 - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: Success - - + + 20. To check if CEC sysname set correct on mm01: - - + + .. code-block:: perl - + rspconfig mm01 sysname - + mm01: mm01 - + rspconfig mm01 sysname=cec01 - + mm01: Success - + rspconfig mm01 sysname - + mm01: cec01 - - + + 21. To check and change the pending_power_on_side value of cec01's fsps: - - + + .. code-block:: perl - + rspconfig cec01 pending_power_on_side - + cec01: Pending Power On Side Primary: temp cec01: Pending Power On Side Secondary: temp - + rspconfig cec01 pending_power_on_side=perm - + cec01: Success - + rspconfig cec01 pending_power_on_side - + cec01: Pending Power On Side Primary: perm cec01: Pending Power On Side Secondary: perm - - + + 22. To show the BSR allocation for cec01: - - + + .. code-block:: perl - + rspconfig cec01 BSR - - + + Output is similar to: - - + + .. code-block:: perl - + cec01: Barrier Synchronization Register (BSR) cec01: Number of BSR arrays: 256 cec01: Bytes per BSR array : 4096 @@ -1148,23 +1148,23 @@ EXAMPLES cec01: lpar06 : 32 cec01: lpar07 : 32 cec01: lpar08 : 32 - - + + 23. To query the huge page information for CEC1, enter: - - + + .. code-block:: perl - + rspconfig CEC1 huge_page - - + + Output is similar to: - - + + .. code-block:: perl - + CEC1: Huge Page Memory CEC1: Available huge page memory(in pages): 0 CEC1: Configurable huge page memory(in pages): 12 @@ -1180,199 +1180,199 @@ EXAMPLES CEC1: lpar21 : 0 CEC1: lpar25 : 0 CEC1: lpar29 : 0 - - + + 24. To request 10 huge pages for CEC1, enter: - - + + .. code-block:: perl - + rspconfig CEC1 huge_page=10 - - + + Output is similar to: - - + + .. code-block:: perl - + CEC1: Success - - + + 25. To disable service processor failover for cec01, in order to complete this command, the user should power off cec01 first: - - + + .. code-block:: perl - + rspconfig cec01 setup_failover - + cec01: Failover status: Enabled - + rpower cec01 off - + rspconfig cec01 setup_failover=disable - + cec01: Success - + rspconfig cec01 setup_failover - + cec01: Failover status: Disabled - - + + 26. To force service processor failover for cec01: - - + + .. code-block:: perl - + lshwconn cec01 - + cec01: 192.168.1.1: LINE DOWN cec01: 192.168.2.1: sp=primary,ipadd=192.168.2.1,alt_ipadd=unavailable,state=LINE UP cec01: 192.168.1.2: sp=secondary,ipadd=192.168.1.2,alt_ipadd=unavailable,state=LINE UP cec01: 192.168.2.2: LINE DOWN - + rspconfig cec01 force_failover - + cec01: Success. - - lshwconn> cec01 - + + lshwconn> cec01 + cec01: 192.168.1.1: sp=secondary,ipadd=192.168.1.1,alt_ipadd=unavailable,state=LINE UP cec01: 192.168.2.1: LINE DOWN cec01: 192.168.1.2: LINE DOWN cec01: 192.168.2.2: sp=primary,ipadd=192.168.2.2,alt_ipadd=unavailable,state=LINE UP - - + + 27. - + To deconfigure memory bank 9 and 10 of Processing Unit 0 on mm01: - - + + .. code-block:: perl - + rspconfig mm01 memdecfg=deconfigure:bank:0:9,10 - - + + Output is similar to: - - + + .. code-block:: perl - + mm01: Success - - + + 28. - + To reset the network interface of the specified nodes: - - + + .. code-block:: perl - + rspconfig --resetnet - - + + Output is similar to: - - + + .. code-block:: perl - + Start to reset network.. - + Reset network failed nodes: - + Reset network succeed nodes: Server-8233-E8B-SN1000ECP-A,Server-9119-FHA-SN0275995-B,Server-9119-FHA-SN0275995-A, - + Reset network finished. - - + + 29. To update the existing admin password on fsp: - - + + .. code-block:: perl - + rspconfig fsp admin_passwd=admin,abc123 - - + + Output is similar to: - - + + .. code-block:: perl - + fsp: Success - - + + 30. To set the initial password for user HMC on fsp: - - + + .. code-block:: perl - + rspconfig fsp HMC_passwd=,abc123 - - + + Output is similar to: - - + + .. code-block:: perl - + fsp: Success - - + + 31. To list BMC dumps available for download: - - + + .. code-block:: perl - + rspconfig p9euh02 dump -l - - + + Output is similar to: - - + + .. code-block:: perl - + p9euh02: [1] Generated: 09/06/2017 14:31:49, Size: 4528 p9euh02: [2] Generated: 09/06/2017 14:31:55, Size: 4516 p9euh02: [3] Generated: 09/06/2017 14:32:01, Size: 4236 p9euh02: [4] Generated: 09/06/2017 14:32:07, Size: 4248 p9euh02: [5] Generated: 09/06/2017 14:32:11, Size: 4268 - - + + 32. To generate and download BMC dump: - - + + .. code-block:: perl - + rspconfig p9euh02 dump - - + + Output is similar to: - - + + .. code-block:: perl - + Capturing BMC Diagnostic information, this will take some time... p9euh02: Dump requested. Target ID is 6, waiting for BMC to generate... p9euh02: Dump 6 generated. Downloading to /var/log/xcat/dump/20171211-0951_p9euh02_dump_6.tar.xz - - + + From 41c3f880261442e8e8e3f86bf73f0038df092801 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0379/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rspreset.1.rst --- .../references/man1/rspreset.1.rst | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rspreset.1.rst b/docs/source/guides/admin-guides/references/man1/rspreset.1.rst index a73320790..6d6fe60c4 100644 --- a/docs/source/guides/admin-guides/references/man1/rspreset.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rspreset.1.rst @@ -15,17 +15,17 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** -\ **rspreset**\ \ *noderange*\ +\ **rspreset**\ \ *noderange*\ \ **rspreset**\ [\ **-h | -**\ **-help | -v | -**\ **-version**\ ] ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -36,45 +36,45 @@ the blade's on board service processor will be reset. *************** -\ **Options**\ +\ **Options**\ *************** -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. - + Reset the service processor that controls node5: - - + + .. code-block:: perl - + rspreset node5 - - + + **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From e88779153271130022b309a9c40b8b548f3461f5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0380/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/rvitals.1.rst --- .../references/man1/rvitals.1.rst | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rvitals.1.rst b/docs/source/guides/admin-guides/references/man1/rvitals.1.rst index 862f224ae..ee6ab3d18 100644 --- a/docs/source/guides/admin-guides/references/man1/rvitals.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rvitals.1.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -72,7 +72,7 @@ OpenPOWER (OpenBMC) specific: ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -81,126 +81,126 @@ Processor for a single or range of nodes and groups. *************** -\ **Options**\ +\ **Options**\ *************** -\ **cputemp**\ - +\ **cputemp**\ + Retrieves CPU temperatures. - -\ **disktemp**\ - + +\ **disktemp**\ + Retrieves HD back plane temperatures. - -\ **ambtemp**\ - + +\ **ambtemp**\ + Retrieves ambient temperatures. - -\ **temp**\ - + +\ **temp**\ + Retrieves all temperatures. - -\ **voltage**\ - + +\ **voltage**\ + Retrieves power supply and VRM voltage readings. - -\ **fanspeed**\ - + +\ **fanspeed**\ + Retrieves fan speeds. - -\ **lcds**\ - + +\ **lcds**\ + Retrieves LCDs status. - -\ **rackenv**\ - + +\ **rackenv**\ + Retrieves rack environmentals. - -\ **leds**\ - + +\ **leds**\ + Retrieves LEDs status. - -\ **chassis**\ - + +\ **chassis**\ + Retrieves chassis status. - -\ **altitude**\ - + +\ **altitude**\ + Retrieves altitude related attributes. - -\ **power**\ - + +\ **power**\ + Retrieves power status. - -\ **powertime**\ - + +\ **powertime**\ + Retrieves total power uptime. This value only increases, unless the Service Processor flash gets updated. This option is not valid for x86 architecture systems. - -\ **reboot**\ - + +\ **reboot**\ + Retrieves total number of reboots. This value only increases, unless the Service Processor flash gets updated. This option is not valid for x86 architecture systems. - -\ **state**\ - + +\ **state**\ + Retrieves the system state. - -\ **all**\ - + +\ **all**\ + All of the above. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - + **************** -\ **Examples**\ +\ **Examples**\ **************** @@ -240,7 +240,7 @@ Output is similar to: **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From 8d28bf1d15ca25e81bc0cbad60a2e61de41e84b0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0381/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/sinv.1.rst --- .../admin-guides/references/man1/sinv.1.rst | 262 +++++++++--------- 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/sinv.1.rst b/docs/source/guides/admin-guides/references/man1/sinv.1.rst index 11a98a55b..a897a332f 100644 --- a/docs/source/guides/admin-guides/references/man1/sinv.1.rst +++ b/docs/source/guides/admin-guides/references/man1/sinv.1.rst @@ -7,7 +7,7 @@ sinv.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,7 +15,7 @@ sinv.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** @@ -25,7 +25,7 @@ sinv.1 ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* @@ -67,303 +67,303 @@ Command Protocol can be used. See man \ **xdsh**\ for more details. *************** -\ **OPTIONS**\ +\ **OPTIONS**\ *************** -\ **-o | -**\ **-output**\ \ *report output file*\ - +\ **-o | -**\ **-output**\ \ *report output file*\ + Optional output file. This is the location of the file that will contain the report of the nodes that match, and do not match, the input templates. If the flag is not used, the output will go to stdout. - -\ **-p | -**\ **-tp**\ \ *template path*\ - + +\ **-p | -**\ **-tp**\ \ *template path*\ + This is the path to the template file. The template contains the output - of \ **xdsh**\ or \ **rinv**\ command, that has been run against a "seed" node, a node + of \ **xdsh**\ or \ **rinv**\ command, that has been run against a "seed" node, a node that contains the configuration that you would like all nodes in your noderange to match. - + The admin can create the template by running the \ **xdsh**\ or \ **rinv**\ command on the seed node, pipe to \ **xdshcoll**\ (required) and store the output in the template path. See examples. - + \ **Note:**\ The admin can also edit the template to remove any lines that they do not want checked. - - An alternative method is to use the [\ **-s**\ \ *seed node*\ ] parameter, - which will automatically build the template for you from the + + An alternative method is to use the [\ **-s**\ \ *seed node*\ ] parameter, + which will automatically build the template for you from the seed node named. - + If a a seed node is not provided, then command will automatically use the first node in the noderange as the seed node. - -\ **-t | -**\ **-tc**\ \ *template count*\ - + +\ **-t | -**\ **-tc**\ \ *template count*\ + This count is the number of templates that the command will use to check for nodes matches. If the template in the template path does not - match a node, the \ **sinv**\ will check additional templates up + match a node, the \ **sinv**\ will check additional templates up to the template count. - - For each node, it will compare the node against each template to see if - there is a match. + + For each node, it will compare the node against each template to see if + there is a match. If there is no match, and we are not over the template count, - then a new template will be created from the node output. + then a new template will be created from the node output. This will result in having all nodes that match a given template reported in - their group at the end of the run in the output file. + their group at the end of the run in the output file. If no template count is specified, 0 is the default, and all nodes will be compared against the first template. - -\ **-s | -**\ **-seed**\ \ *seed node*\ - + +\ **-s | -**\ **-seed**\ \ *seed node*\ + This is the node that will be used to build the first template that is stored in template path. You can use this parameter instead of running the command yourself to build the template. - + \ **Note:**\ If no seed node is supplied, the first node in the noderange is automatically selected as a seed node. - -\ **-i | -**\ **-ignorefirst**\ - + +\ **-i | -**\ **-ignorefirst**\ + This flag suppresses the reporting of the nodes matching the first template. In very large systems, you may not want to show the nodes that have the correct configuration, since the list could contain thousands of nodes. - This allows you to only report the nodes that do not match the required + This allows you to only report the nodes that do not match the required configuration. - -\ **-e | -**\ **-exactmatch**\ - + +\ **-e | -**\ **-exactmatch**\ + This requires the check of node output against template to be an exact match. - If this flag is not set, \ **sinv**\ checks to see if the return from the - \ **xdsh**\ or \ **rinv**\ command to the nodes contain a match for each line in the input + If this flag is not set, \ **sinv**\ checks to see if the return from the + \ **xdsh**\ or \ **rinv**\ command to the nodes contain a match for each line in the input template (except for xdshcoll header and comments). If not in exactmatch mode, there can be more lines in the \ **xdsh**\ or \ **rinv**\ return from the nodes. - - For example, if running a "rpm -qa | grep xCAT" command, without exactmatch + + For example, if running a "rpm -qa | grep xCAT" command, without exactmatch set, if the node contains more xCAT rpms that listed in the template, it would be considered a match, as long as all rpms listed in the template - were on the node. With exactmatch set, the output must be identical + were on the node. With exactmatch set, the output must be identical to the template. - -\ **-**\ **-devicetype**\ \ *type_of_device*\ - + +\ **-**\ **-devicetype**\ \ *type_of_device*\ + Specify a user-defined device type that references the location of relevant device configuration file. The devicetype value must correspond to a valid device configuration file. xCAT ships some default configuration files for Ethernet switches and IB switches under \ */opt/xcat/share/xcat/devicetype*\ directory. If you want to overwrite - any of the configuration files, copy them to \ */var/opt/xcat/*\ + any of the configuration files, copy them to \ */var/opt/xcat/*\ directory and cutomize. For example, \ *base/IBSwitch/Qlogic/config*\ is the configuration file location if devicetype is specified as IBSwitch::Qlogic. xCAT will first search config file using \ */var/opt/xcat/*\ as the base. If not found, it will search for it using \ */opt/xcat/share/xcat/devicetype/*\ as the base. - -\ **-l | -**\ **-user**\ \ *user_ID*\ - + +\ **-l | -**\ **-user**\ \ *user_ID*\ + Specifies a remote user name to use for remote command execution. - -\ **-c | -**\ **-command**\ - - The \ **xdsh**\ or \ **rinv**\ command that will be run. The command should be enclosed in + +\ **-c | -**\ **-command**\ + + The \ **xdsh**\ or \ **rinv**\ command that will be run. The command should be enclosed in double quotes to insure correct shell interpretation. This parameter must only contain, the node range or the image path (Linux) or spot name for AIX. It cannot be used to set additional input flags to \ **xdsh**\ or \ **rinv**\ (for example \ **-s**\ ,\ **-T**\ ,\ **-e**\ ). See examples below. - + \ **Note:**\ do not add the \ **| xdshcoll**\ to the command, it is automatically added by \ **sinv**\ . \ **sinv**\ also automatically sets the \ **-v**\ flag for \ **xdsh**\ . - -\ **-f | -**\ **-file**\ - - The file containing the \ **xdsh**\ or \ **rinv**\ command that will be run. + +\ **-f | -**\ **-file**\ + + The file containing the \ **xdsh**\ or \ **rinv**\ command that will be run. This should be the fully qualified name of the file. - + \ **Note:**\ do not add the \ **| xdshcoll**\ to the command in the file, it is automatically added by \ **sinv**\ . - -\ **-r | -**\ **-remove**\ - + +\ **-r | -**\ **-remove**\ + This flag indicates that generated templates should be removed at the at the end of the \ **sinv**\ command execution. - - If the flag is specified, then all templates that are generated by the \ **sinv**\ + + If the flag is specified, then all templates that are generated by the \ **sinv**\ command, will be removed. If the first template is created by the admin, it will not be removed. - + If the flag is not specified, no templates will be removed. It is up to the admin to cleanup templates. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Displays usage information. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Displays xCAT release version. - -\ **-V | -**\ **-Verbose**\ - + +\ **-V | -**\ **-Verbose**\ + Verbose mode. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. To setup sinv.template (name optional) for input to the \ **sinv**\ command, enter: - - + + .. code-block:: perl - + xdsh node1,node2 "rpm -qa | grep ssh " | xdshcoll > /tmp/sinv.template - - + + Note: when setting up the template the output of \ **xdsh**\ must be piped to \ **xdshcoll**\ , \ **sinv**\ processing depends on it. - + 2. To setup rinv.template for input to the \ **sinv**\ command , enter: - - + + .. code-block:: perl - + rinv node1-node2 serial | xdshcoll > /tmp/rinv.template - - + + Note: when setting up the template the output of \ **rinv**\ must be piped to \ **xdshcoll**\ , \ **sinv**\ processing depends on it. - + 3. To execute \ **sinv**\ using the sinv.template generated above on the nodegroup, \ *testnodes*\ ,possibly generating up to two new templates, and removing all generated templates in the end, and writing output report to /tmp/sinv.output, enter: - - + + .. code-block:: perl - + sinv -c "xdsh testnodes rpm -qa | grep ssh" -p /tmp/sinv.template -t 2 -r -o /tmp/sinv.output - - + + Note: do not add the pipe to \ **xdshcoll**\ on the \ **-c**\ flag, it is automatically added by the \ **sinv**\ . - + 4. To execute \ **sinv**\ on noderange, \ *node1-node4*\ , using the seed node, \ *node8*\ , to generate the first template, using the \ **xdsh**\ command (\ **-c**\ ), possibly generating up to two additional templates and not removing any templates at the end, enter: - - + + .. code-block:: perl - + sinv -c "xdsh node1-node4 lslpp -l | grep bos.adt" -s node8 -p /tmp/sinv.template -t 2 -o /tmp/sinv.output - - + + 5. To execute \ **sinv**\ on noderange, \ *node1-node4*\ , using the seed node, \ *node8*\ , to generate the first template, using the \ **rinv**\ command (\ **-c**\ ), possibly generating up to two additional templates and removing any generated templates at the end, enter: - - + + .. code-block:: perl - + sinv -c "rinv node1-node4 serial" -s node8 -p /tmp/sinv.template -t 2 -r -o /tmp/rinv.output - - + + 6. To execute \ **sinv**\ on noderange, \ *node1-node4*\ , using \ *node1*\ as the seed node, to generate the sinv.template from the \ **xdsh**\ command (\ **-c**\ ), using the exact match option, generating no additional templates, enter: - - + + .. code-block:: perl - + sinv -c "xdsh node1-node4 lslpp -l | grep bos.adt" -s node1 -e -p /tmp/sinv.template -o /tmp/sinv.output - - + + Note: the /tmp/sinv.template file must be empty, otherwise it will be used as an admin generated template. - + 7. To execute \ **sinv**\ on the Linux osimage defined for cn1. First build a template from the /etc/hosts on the node. Then run \ **sinv**\ to compare. - - + + .. code-block:: perl - + xdsh cn1 "cat /etc/hosts" | xdshcoll > /tmp/sinv2/template" - + sinv -c "xdsh -i /install/netboot/rhels6/ppc64/test_ramdisk_statelite/rootimg cat /etc/hosts" -e -t 1 -p /tmp/sinv.template -o /tmp/sinv.output - - + + 8. - + To execute \ **sinv**\ on the AIX NIM 611dskls spot and compare /etc/hosts to compute1 node, run the following: - - + + .. code-block:: perl - + xdsh compute1 "cat /etc/hosts" | xdshcoll > /tmp/sinv2/template" - + sinv -c "xdsh -i 611dskls cat /etc/hosts" -e -t1 -p /tmp/sinv.template -o /tmp/sinv.output - - + + 9. - + To execute \ **sinv**\ on the device mswitch2 and compare to mswitch1 - - + + .. code-block:: perl - + sinv -c "xdsh mswitch enable;show version" -s mswitch1 -p /tmp/sinv/template --devicetype IBSwitch::Mellanox -l admin -t 2 - - -\ **Files**\ -\ **/opt/xcat/bin/sinv/**\ + +\ **Files**\ + +\ **/opt/xcat/bin/sinv/**\ Location of the sinv command. **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From edd2a0b214bfdbd81124874fac7014653b4c4971 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0382/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/snmove.1.rst --- .../admin-guides/references/man1/snmove.1.rst | 158 +++++++++--------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/snmove.1.rst b/docs/source/guides/admin-guides/references/man1/snmove.1.rst index 453e64c94..53abb0129 100644 --- a/docs/source/guides/admin-guides/references/man1/snmove.1.rst +++ b/docs/source/guides/admin-guides/references/man1/snmove.1.rst @@ -62,7 +62,7 @@ When the \ **snmove**\ command is run it modifies the xCAT database to switch the primary server to the backup server. It will also check the other services that are being used for the -node (tftpserver, monserver, nfsserver, conserver), and if they were set +node (tftpserver, monserver, nfsserver, conserver), and if they were set to the original service node they will be changed to point to the backup service node. @@ -88,65 +88,65 @@ OPTIONS -\ **-d|-**\ **-dest**\ - +\ **-d|-**\ **-dest**\ + Specifies the hostname of the new destination service node as known by (facing) the management node. - -\ **-D|-**\ **-destn**\ - + +\ **-D|-**\ **-destn**\ + Specifies the hostname of the destination service node as known by (facing) the nodes. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-i|-**\ **-ignorenodes**\ - + +\ **-i|-**\ **-ignorenodes**\ + No modifications will be made on the nodes. If not specified, several xCAT postscripts will be run on the nodes to complete the switch to the new service node. - -\ **-l|-**\ **-liteonly**\ - + +\ **-l|-**\ **-liteonly**\ + Use this option to ONLY synchronize any AIX statelite files from the primary server to the backup server for the nodes. It will not do the actual moving of the nodes to the backup servers. - -\ **-P|-**\ **-postscripts**\ - + +\ **-P|-**\ **-postscripts**\ + Specifies a list of extra postscripts to be run on the nodes after the nodes are moved over to the new service node. If \ **all**\ is specified, all the postscripts defined in the postscripts table will be run for the nodes. The specified postscripts must be stored under /install/postscripts directory. - -\ **-s|-**\ **-source**\ - + +\ **-s|-**\ **-source**\ + Specifies the hostname of the current (source) service node sa known by (facing) the management node. - -\ **-S|-**\ **-sourcen**\ - + +\ **-S|-**\ **-sourcen**\ + Specifies the hostname of the current service node adapter as known by (facing) the nodes. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - + @@ -157,99 +157,99 @@ EXAMPLES 1. - + Move the nodes contained in group "group1" to the service node named "xcatsn02". - - + + .. code-block:: perl - + snmove group1 -d xcatsn02 -D xcatsn02-eth1 - - + + 2. - + Move all the nodes that use service node xcatsn01 to service node xcatsn02. - - + + .. code-block:: perl - + snmove -s xcatsn01 -S xcatsn01-eth1 -d xcatsn02 -D xcatsn02-eth1 - - + + 3. - + Move any nodes that have sn1 as their primary server to the backup service node set in the xCAT node definition. - - + + .. code-block:: perl - + snmove -s sn1 - - + + 4. - + Move all the nodes in the xCAT group named "nodegroup1" to their backup SNs. - - + + .. code-block:: perl - + snmove nodegroup1 - - + + 5. - + Move all the nodes in xCAT group "sngroup1" to the service node named "xcatsn2". - - + + .. code-block:: perl - + snmove sngroup1 -d xcatsn2 - - + + 6. - + Move all the nodes in xCAT group "sngroup1" to the SN named "xcatsn2" and run extra postscripts. - - + + .. code-block:: perl - + snmove sngroup1 -d xcatsn2 -P test1 - - + + 7. - + Move all the nodes in xCAT group "sngroup1" to the SN named "xcatsn2" and do not run anything on the nodes. - - + + .. code-block:: perl - + snmove sngroup1 -d xcatsn2 -i - - + + 8. - + Synchronize any AIX statelite files from the primary server for compute03 to the backup server. This will not actually move the node to it's backup service node. - - + + .. code-block:: perl - + snmove compute03 -l -V - - + + From 64a7e88c4e267c49c26f04671b5d8dcf6a75a43a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0383/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/swapnodes.1.rst --- .../references/man1/swapnodes.1.rst | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/swapnodes.1.rst b/docs/source/guides/admin-guides/references/man1/swapnodes.1.rst index 158c5f4cf..62e76a07b 100644 --- a/docs/source/guides/admin-guides/references/man1/swapnodes.1.rst +++ b/docs/source/guides/admin-guides/references/man1/swapnodes.1.rst @@ -53,28 +53,28 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-c**\ - + +\ **-c**\ + \ *current_node*\ -- the defective non-compute node. - -\ **-f**\ - + +\ **-f**\ + \ *fip_node*\ -- a compute node which will be swapped as the non-compute node. - -\ **-o**\ - + +\ **-o**\ + one way. Only move the \ *current_node*\ definition to the \ *fip_node*\ 's hardware resource, and not move the fip_node definition to the \ *current_node*\ . And then the \ *current_node*\ will use the \ *fip_node*\ 's hardware resource, and the \ *fip_node*\ definition is not changed. if the two nodes are in the same CEC, the I/O adapter from the original \ *current_node*\ will be assigned to the \ *fip_node*\ . - + @@ -95,33 +95,33 @@ EXAMPLES 1. To swap the service node attributes and IO assignments between sn1 and compute2 which are in the same cec, all the attributes in the ppc table and nodepos table of the two node will be swapped, and the I/O adapters from the defective node (the original sn1) will be assigned to the available node (the original compute2). After the swapping, the sn1 will use the compute2's hardware resource and the I/O adapters from the original sn1. - - + + .. code-block:: perl - + swapnodes -c sn1 -f compute2 - - + + 2. To swap the service node attributes and IO assignments between sn1 and compute2 which are NOT in the same cec, all the attributes in the ppc table and nodepos table of the two node will be swapped. After the swapping, the sn1 will use the compute2's hardware resource. - - + + .. code-block:: perl - + swapnodes -c sn1 -f compute2 - - + + 3. Only to move the service node (sn1) definition to the compute node (compute2)'s hardware resource, and not move the compute2 definition to the sn1. After the swapping, the sn1 will use the compute2's hardware resource, and the compute2 definition is not changed. - - + + .. code-block:: perl - + swapnodes -c sn1 -f compute2 -o - - + + From 1deadd0a7ad842420a1f3e0b62a5c11de822ef59 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0384/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/switchblade.1.rst --- .../references/man1/switchblade.1.rst | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/switchblade.1.rst b/docs/source/guides/admin-guides/references/man1/switchblade.1.rst index 3d9ebad71..6421009aa 100644 --- a/docs/source/guides/admin-guides/references/man1/switchblade.1.rst +++ b/docs/source/guides/admin-guides/references/man1/switchblade.1.rst @@ -35,35 +35,35 @@ OPTIONS -\ **list | stat**\ - +\ **list | stat**\ + Display which blade the media tray and KVM are currently assigned to. - -\ **media | mt**\ - + +\ **media | mt**\ + Assign the media tray to the specified blade. - -\ **kvm | video**\ - + +\ **kvm | video**\ + Assign the KVM (video display) to the specified blade. - -\ **both**\ - + +\ **both**\ + Assign both the media tray and the KVM to the specified blade. - -\ *slot_num*\ - + +\ *slot_num*\ + The slot # of the blade that the resources should be assigned to. If not specified, it will use the slot # of the node specified. - + @@ -74,23 +74,23 @@ EXAMPLES 1. - + Switch the media tray to be assigned to the blade in slot 4 (assume it is node4): - - + + .. code-block:: perl - + switchblade node4 media - - + + Output will be like: - - + + .. code-block:: perl - + Media Tray slot: 4 - - + + From 950bc8f65b44151dacc0daa06f3db8b56ca62171 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0385/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst --- .../references/man1/switchdiscover.1.rst | 132 +++++++++--------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst b/docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst index e219a5ea8..2d67ecfae 100644 --- a/docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst +++ b/docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst @@ -11,9 +11,9 @@ SYNOPSIS ******** -\ **switchdiscover [-h| -**\ **-help]**\ +\ **switchdiscover [-h| -**\ **-help]**\ -\ **switchdiscover [-v| -**\ **-version]**\ +\ **switchdiscover [-v| -**\ **-version]**\ \ **switchdiscover**\ [\ *noderange*\ | \ **-**\ **-range**\ \ *ip_ranges*\ ] \ **[-V] [-w][-r|-x|-z][-s**\ \ *scan_methods*\ ] [\ **-**\ **-setup**\ ] [\ **-c**\ \ *community*\ ] @@ -40,88 +40,88 @@ OPTIONS -\ *noderange*\ - +\ *noderange*\ + The switches which the user want to discover. If the user specify the noderange, switchdiscover will just - return the switches in the node range. Which means it will + return the switches in the node range. Which means it will help to add the new switches to the xCAT database without - modifying the existed definitions. But the switches' name - specified in noderange should be defined in database in advance. - The ips of the switches will be defined in /etc/hosts file. + modifying the existed definitions. But the switches' name + specified in noderange should be defined in database in advance. + The ips of the switches will be defined in /etc/hosts file. This command will fill the switch attributes for the switches defined. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-**\ **-range**\ - + +\ **-**\ **-range**\ + Specify one or more IP ranges. Each can be an ip address (10.1.2.3) or an ip range (10.1.2.0/24). If the range is huge, for example, 192.168.1.1/8, the switch discover may take a very long time to scan. So the range should be exactly specified. - + For nmap and snmp scan method, it accepts multiple formats. For example: 192.168.1.1/24, 40-41.1-2.3-4.1-100. - + If the range is not specified, the command scans all the subnets that the active network interfaces (eth0, eth1) are on where this command is issued. - -\ **-r**\ - + +\ **-r**\ + Display Raw responses. - -\ **-s**\ - - It is a comma separated list of methods for switch discovery. + +\ **-s**\ + + It is a comma separated list of methods for switch discovery. The possible switch scan methods are: lldp, nmap or snmp. The default is nmap. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-V**\ - + +\ **-V**\ + Verbose output. - -\ **-w**\ - + +\ **-w**\ + Writes output to xCAT database. - -\ **-x**\ - + +\ **-x**\ + XML formatted output. - -\ **-z**\ - + +\ **-z**\ + Stanza formatted output. - -\ **-**\ **-setup**\ - + +\ **-**\ **-setup**\ + Process switch-based switch discovery. Update discovered switch's ip address, hostname and enable snmpv3 configuration based on the predefined switch. - -\ **-c**\ - + +\ **-c**\ + User defined community string for snmp scan. - + @@ -142,45 +142,45 @@ EXAMPLES 1. To discover the switches on some subnets: - - + + .. code-block:: perl - + switchdiscover --range 10.2.3.0/24,192.168.3.0/24,11.5.6.7 - - + + 2. To do the switch discovery and save them to the xCAT database: - - + + .. code-block:: perl - + switchdiscover --range 10.2.3.4/24 -w - - + + It is recommended to run \ **makehosts**\ after the switches are saved in the DB. - + 3. To use lldp method to discover the switches: - - + + .. code-block:: perl - + switchdiscover -s lldp - - + + 4. To process switch-based switch discovery, the core switch has to be configured and top-of-rack (edge) switch has to be predefine into xCAT databse with attribute \ **switch**\ and \ **switchport**\ to core switch: - - + + .. code-block:: perl - + switchdiscover --range 192.168.5.150-170 -s snmp --setup - - + + From 001e9a5323f1aac947b68c1a1f7e7ccb777723ce Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0386/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/tabgrep.1.rst --- .../references/man1/tabgrep.1.rst | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/tabgrep.1.rst b/docs/source/guides/admin-guides/references/man1/tabgrep.1.rst index 7670799be..7b4b1b427 100644 --- a/docs/source/guides/admin-guides/references/man1/tabgrep.1.rst +++ b/docs/source/guides/admin-guides/references/man1/tabgrep.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **tabgrep**\ \ *nodename*\ +\ **tabgrep**\ \ *nodename*\ \ **tabgrep**\ [\ **-?**\ | \ **-h**\ | \ **-**\ **-help**\ ] @@ -40,10 +40,10 @@ OPTIONS -\ **-?|-h|-**\ **-help**\ - +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -69,20 +69,20 @@ EXAMPLES 1. - + To display the tables that contain blade1: - - + + .. code-block:: perl - + tabgrep blade1 - - + + The output would be similar to: - - + + .. code-block:: perl - + nodelist nodehm mp @@ -91,8 +91,8 @@ EXAMPLES mac noderes nodetype - - + + From 7812cae7d79e074159eb85fa966f61df63649b4e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0387/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/unregnotif.1.rst --- .../guides/admin-guides/references/man1/unregnotif.1.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/unregnotif.1.rst b/docs/source/guides/admin-guides/references/man1/unregnotif.1.rst index a61c02d17..52e735e61 100644 --- a/docs/source/guides/admin-guides/references/man1/unregnotif.1.rst +++ b/docs/source/guides/admin-guides/references/man1/unregnotif.1.rst @@ -19,11 +19,11 @@ SYNOPSIS ******** -\ **unregnotif [-h| -**\ **-help]**\ +\ **unregnotif [-h| -**\ **-help]**\ -\ **unregnotif [-v| -**\ **-version]**\ +\ **unregnotif [-v| -**\ **-version]**\ -\ **unregnotif**\ \ *filename*\ +\ **unregnotif**\ \ *filename*\ *********** From 87fe5fedac26fe1c52f77d75051a0c9f88713b00 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0388/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst --- .../guides/admin-guides/references/man1/updateSNimage.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst b/docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst index cb3d0e024..560c0b973 100644 --- a/docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst +++ b/docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **updateSNimage [-h | -**\ **-help ]**\ +\ **updateSNimage [-h | -**\ **-help ]**\ -\ **updateSNimage [-v | -**\ **-version]**\ +\ **updateSNimage [-v | -**\ **-version]**\ \ **updateSNimage**\ [\ **-n**\ \ *node*\ ] [\ **-p**\ \ *path*\ ] From d6e7061a8ce08197e9621e78e90b50a50633ba04 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0389/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/updatenode.1.rst --- .../references/man1/updatenode.1.rst | 508 +++++++++--------- 1 file changed, 254 insertions(+), 254 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/updatenode.1.rst b/docs/source/guides/admin-guides/references/man1/updatenode.1.rst index 20de04dd5..cffcf7c41 100644 --- a/docs/source/guides/admin-guides/references/man1/updatenode.1.rst +++ b/docs/source/guides/admin-guides/references/man1/updatenode.1.rst @@ -58,24 +58,24 @@ Update the ca and credentials for the service nodes. -The default behavior when no options are input to updatenode will be to run +The default behavior when no options are input to updatenode will be to run the following options \ **-S**\ , \ **-P**\ and \ **-F**\ options in this order. -If you wish to limit updatenode to specific +If you wish to limit updatenode to specific actions you can use combinations of the \ **-S**\ , \ **-P**\ , and \ **-F**\ flags. For example, If you just want to synchronize configuration file you could -specify the \ **-F**\ flag. If you want to synchronize files and update -software you would specify the \ **-F**\ and \ **-S**\ flags. See the descriptions +specify the \ **-F**\ flag. If you want to synchronize files and update +software you would specify the \ **-F**\ and \ **-S**\ flags. See the descriptions of these flags and examples below. The flag \ **-k**\ (\ **-**\ **-security**\ ) can NOT be used together with \ **-S**\ , \ **-P**\ , and \ **-F**\ flags. The flag \ **-f**\ (\ **-**\ **-snsync**\ ) can NOT be used together with \ **-S**\ , \ **-P**\ , and \ **-F**\ flags. -Note: In a large cluster environment the updating of nodes in an ad hoc -manner can quickly get out of hand, leaving the system administrator with -a very confusing environment to deal with. The updatenode command is -designed to encourage users to handle cluster updates in a manner that +Note: In a large cluster environment the updating of nodes in an ad hoc +manner can quickly get out of hand, leaving the system administrator with +a very confusing environment to deal with. The updatenode command is +designed to encourage users to handle cluster updates in a manner that is recorded and easily repeatable. To distribute and synchronize files @@ -97,7 +97,7 @@ The basic process for distributing and synchronizing nodes is: -Files may be distributed and synchronized for both diskless and +Files may be distributed and synchronized for both diskless and diskful nodes. Syncing files to NFS-based statelite nodes is not supported. More information on using the synchronization file function is in the following doc: Using_Updatenode. @@ -106,9 +106,9 @@ Create the synclist file ------------------------ -The synclist file contains the configuration entries that specify -where the files should be synced to. In the synclist file, each -line is an entry which describes the location of the source files +The synclist file contains the configuration entries that specify +where the files should be synced to. In the synclist file, each +line is an entry which describes the location of the source files and the destination location for the files on the target node. For more information on creating your synclist files and where to put them, read: @@ -143,9 +143,9 @@ To install/update the packages, run: updatenode -S -\ **For Linux systems:**\ +\ **For Linux systems:**\ -It this is equivalent to running the +It this is equivalent to running the following command: @@ -154,9 +154,9 @@ following command: updatenode noderange -P ospkgs,otherpkgs -It will update all the rpms specified in the .pkglist file and .otherpkgs.pkglist -file. ospkgs postscript will normally remove all the existing rpm -repositories before adding server:/install///: Not a directory`` - + 3) if the destination file specified in synclist is an existing directory on target node, "updatenode -r /usr/bin/scp" will fail with ``scp: : Is a directory`` - -\ **-g|-**\ **-genmypost**\ - + +\ **-g|-**\ **-genmypost**\ + Will generate a new mypostscript file for the nodes in the noderange, if site precreatemypostscripts is 1 or YES. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-k|-**\ **-security**\ - + +\ **-k|-**\ **-security**\ + Update the ssh keys and host keys for the service nodes and compute nodes; Update the ca and credentials to the service nodes. Never run this command to the Management Node, it will take down xcatd. You must be running updatenode as root to use the -k flag. - -\ **-l | -**\ **-user**\ \ *user_ID*\ - - Specifies a non-root user name to use for remote command execution. This option is only available when running postscripts (-P) for - AIX and Linux and updating software (-S) for Linux only. - The non-root userid must be previously defined as an xCAT user. + +\ **-l | -**\ **-user**\ \ *user_ID*\ + + Specifies a non-root user name to use for remote command execution. This option is only available when running postscripts (-P) for + AIX and Linux and updating software (-S) for Linux only. + The non-root userid must be previously defined as an xCAT user. The userid sudo setup will have to be done by the admin on the node. - This is not supported in a hierarchical cluster, that is the node is serviced by a service node. + This is not supported in a hierarchical cluster, that is the node is serviced by a service node. See the document Granting_Users_xCAT_privileges for required xcat/sudo setup. - -\ **-P|-**\ **-scripts**\ - - Specifies that postscripts and postbootscripts should be run on the nodes. + +\ **-P|-**\ **-scripts**\ + + Specifies that postscripts and postbootscripts should be run on the nodes. updatenode -P syncfiles is not supported. The syncfiles postscript can only be run during install. You should use updatenode -F instead. - -\ **-S|-**\ **-sw**\ - + +\ **-S|-**\ **-sw**\ + Specifies that node software should be updated. In Sysclone environment, specifies pushing the delta changes to target nodes. - -\ **-n|-**\ **-noverify**\ - + +\ **-n|-**\ **-noverify**\ + Specifies that node network availability verification will be skipped. - -\ **-s|-**\ **-sn**\ - + +\ **-s|-**\ **-sn**\ + Set the server information stored on the nodes in /opt/xcat/xcatinfo on Linux. - -\ **-t**\ \ *timeout*\ - + +\ **-t**\ \ *timeout*\ + Specifies a timeout in seconds the command will wait for the remote targets to complete. If timeout is not specified it will wait indefinitely. updatenode -k is the exception that has a timeout of 10 seconds, unless overridden by this flag. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - + @@ -521,274 +521,274 @@ EXAMPLES 1. To perform all updatenode features for the Linux nodes in the group "compute": - - + + .. code-block:: perl - + updatenode compute - - - The command will: run any scripts listed in the nodes "postscripts and postbootscripts" - attribute, install or update any software indicated in the - /install/custom/install//profile.otherpkgs.pkglist (refer to the - \ **To install or update software part**\ ), synchronize any files indicated by + + + The command will: run any scripts listed in the nodes "postscripts and postbootscripts" + attribute, install or update any software indicated in the + /install/custom/install//profile.otherpkgs.pkglist (refer to the + \ **To install or update software part**\ ), synchronize any files indicated by the synclist files specified in the osimage "synclists" attribute. - + 2. To run postscripts,postbootscripts and file synchronization only on the node "clstrn01": - - + + .. code-block:: perl - + updatenode clstrn01 -F -P - - + + 3. Running updatenode -P with the syncfiles postscript is not supported. You should use updatenode -F instead. - + Do not run: - - + + .. code-block:: perl - + updatenode clstrno1 -P syncfiles - - + + Run: - - + + .. code-block:: perl - + updatenode clstrn01 -F - - + + 4. To run the postscripts and postbootscripts indicated in the postscripts and postbootscripts attributes on the node "clstrn01": - - + + .. code-block:: perl - + updatenode clstrn01 -P - - + + 5. To run the postscripts script1 and script2 on the node "clstrn01": - - + + .. code-block:: perl - + cp script1,script2 /install/postscripts - + updatenode clstrn01 -P "script1 p1 p2,script2" - - - Since flag '-P' can be omitted when only script names are specified, + + + Since flag '-P' can be omitted when only script names are specified, the following command is equivalent: - - + + .. code-block:: perl - + updatenode clstrn01 "script1 p1 p2,script2" - - + + p1 p2 are parameters for script1. - -6. To synchronize the files on the node "clstrn01": Prepare the synclist file. -For AIX, set the full path of synclist in the osimage table synclists -attribute. For Linux, put the synclist file into the location: + +6. To synchronize the files on the node "clstrn01": Prepare the synclist file. +For AIX, set the full path of synclist in the osimage table synclists +attribute. For Linux, put the synclist file into the location: /install/custom///...synclist Then: - - + + .. code-block:: perl - + updatenode clstrn01 -F - - -7. To perform the software update on the Linux node "clstrn01": Copy the extra -rpm into the /install/post/otherpkgs///\* and add the rpm names into + + +7. To perform the software update on the Linux node "clstrn01": Copy the extra +rpm into the /install/post/otherpkgs///\* and add the rpm names into the /install/custom/install//profile.otherpkgs.pkglist . Then: - - + + .. code-block:: perl - + updatenode clstrn01 -S - - + + 8. To update the AIX node named "xcatn11" using the "installp_bundle" and/or "otherpkgs" attribute values stored in the xCAT database. Use the default installp, rpm and emgr flags. - - + + .. code-block:: perl - + updatenode xcatn11 -V -S - - - Note: The xCAT "xcatn11" node definition points to an xCAT osimage definition + + + Note: The xCAT "xcatn11" node definition points to an xCAT osimage definition which contains the "installp_bundle" and "otherpkgs" attributes as well as the name of the NIM lpp_source resource. - -9. To update the AIX node "xcatn11" by installing the "bos.cpr" fileset using + +9. To update the AIX node "xcatn11" by installing the "bos.cpr" fileset using the "-agQXY" installp flags. Also display the output of the installp command. - - + + .. code-block:: perl - + updatenode xcatn11 -V -S otherpkgs="I:bos.cpr" installp_flags="-agQXY" - - + + Note: The 'I:' prefix is optional but recommended for installp packages. - + 10. To uninstall the "bos.cpr" fileset that was installed in the previous example. - - + + .. code-block:: perl - + updatenode xcatn11 -V -S otherpkgs="I:bos.cpr" installp_flags="-u" - - + + 11. To update the AIX nodes "xcatn11" and "xcatn12" with the "gpfs.base" fileset and the "rsync" rpm using the installp flags "-agQXY" and the rpm flags "-i --nodeps". - - + + .. code-block:: perl - + updatenode xcatn11,xcatn12 -V -S otherpkgs="I:gpfs.base,R:rsync-2.6.2-1.aix5.1.ppc.rpm" installp_flags="-agQXY" rpm_flags="-i --nodeps" - - + + Note: Using the "-V" flag with multiple nodes may result in a large amount of output. - + 12. To uninstall the rsync rpm that was installed in the previous example. - - + + .. code-block:: perl - + updatenode xcatn11 -V -S otherpkgs="R:rsync-2.6.2-1" rpm_flags="-e" - - + + 13. Update the AIX node "node01" using the software specified in the NIM "sslbnd" and "sshbnd" installp_bundle resources and the "-agQXY" installp flags. - - + + .. code-block:: perl - + updatenode node01 -V -S installp_bundle="sslbnd,sshbnd" installp_flags="-agQXY" - - + + 14. To get a preview of what would happen if you tried to install the "rsct.base" fileset on AIX node "node42". (You must use the "-V" option to get the full output from the installp command.) - - + + .. code-block:: perl - + updatenode node42 -V -S otherpkgs="I:rsct.base" installp_flags="-apXY" - - + + 15. To check what rpm packages are installed on the AIX node "node09". (You must use the "-c" flag so updatenode does not get a list of packages from the database.) - - + + .. code-block:: perl - + updatenode node09 -V -c -S rpm_flags="-qa" - - + + 16. To install all software updates contained in the /images directory. - - + + .. code-block:: perl - + updatenode node27 -V -S -A -d /images - - + + Note: Make sure the directory is exportable and that the permissions are set correctly for all the files. (Including the .toc file in the case of installp filesets.) - + 17. Install the interim fix package located in the /efixes directory. - - + + .. code-block:: perl - + updatenode node29 -V -S -d /efixes otherpkgs=E:IZ38930TL0.120304.epkg.Z - - + + 18. To uninstall the interim fix that was installed in the previous example. - - + + .. code-block:: perl - + updatenode xcatsn11 -V -S -c emgr_flags="-r -L IZ38930TL0" - - + + 19. To update the security keys for the node "node01" - - + + .. code-block:: perl - + updatenode node01 -k - - + + 20. To update the service nodes with the files to be synchronized to node group compute: - - + + .. code-block:: perl - + updatenode compute -f - - + + 21. To run updatenode with the non-root userid "user1" that has been setup as an xCAT userid with sudo on node1 to run as root, do the following: See Granting_Users_xCAT_privileges for required sudo setup. - - + + .. code-block:: perl - + updatenode node1 -l user1 -P syslog - - + + 22. In Sysclone environment, after capturing the delta changes from golden client to management node, to run updatenode to push these delta changes to target nodes. - - + + .. code-block:: perl - + updatenode target-node -S - - + + From b253b9724b07bf73bc4dd9a38d16aae86df043c9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0390/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/wcons.1.rst --- .../admin-guides/references/man1/wcons.1.rst | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/wcons.1.rst b/docs/source/guides/admin-guides/references/man1/wcons.1.rst index 4ff69d007..2ca612b93 100644 --- a/docs/source/guides/admin-guides/references/man1/wcons.1.rst +++ b/docs/source/guides/admin-guides/references/man1/wcons.1.rst @@ -15,17 +15,17 @@ wcons - windowed remote console **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** -\ **wcons**\ [\ **-t | -**\ **-tile**\ =\ *n*\ ] [\ *xterm-options*\ ] \ *noderange*\ +\ **wcons**\ [\ **-t | -**\ **-tile**\ =\ *n*\ ] [\ *xterm-options*\ ] \ *noderange*\ \ **wcons**\ [\ **-h | -**\ **-help | -v | -**\ **-version**\ ] ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -36,45 +36,45 @@ range or nodes or groups. *************** -\ **Options**\ +\ **Options**\ *************** -\ **-t | -**\ **-tile**\ =\ *n*\ - +\ **-t | -**\ **-tile**\ =\ *n*\ + Tile \ **wcons**\ windows from top left to bottom right. If \ *n*\ is spec- ified then tile \ *n*\ across. If \ *n*\ is not specified then tile to edge of screen. If tiled \ **wcons**\ windows reach bottom right, then the windows start at top left overlaying existing \ **wcons**\ windows. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - -\ *xterm options*\ - + +\ *xterm options*\ + See xterm(1). Any options other than those listed above are passed directly to xterm. \ **Note:**\ when given multiple nodes, wcons will - override \ **-title**\ and tries to figure out optimal \ **-geometry**\ + override \ **-title**\ and tries to figure out optimal \ **-geometry**\ options for the xterms (however, \ **-geometry**\ can still be specified). - + ************* -\ **Files**\ +\ **Files**\ ************* @@ -84,21 +84,21 @@ method. **************** -\ **Examples**\ +\ **Examples**\ **************** -\ **wcons**\ \ *node1-node5*\ +\ **wcons**\ \ *node1-node5*\ -\ **wcons**\ \ **-**\ **-tile**\ \ **-**\ **-font**\ =\ *nil2*\ \ *all*\ +\ **wcons**\ \ **-**\ **-tile**\ \ **-**\ **-font**\ =\ *nil2*\ \ *all*\ -\ **wcons**\ \ **-t**\ \ *4*\ \ *node1-node16*\ +\ **wcons**\ \ **-t**\ \ *4*\ \ *node1-node16*\ -\ **wcons**\ \ **-f**\ \ *vs*\ \ **-t**\ \ *4*\ \ *node1-node4*\ +\ **wcons**\ \ **-f**\ \ *vs*\ \ **-t**\ \ *4*\ \ *node1-node4*\ ************ -\ **Bugs**\ +\ **Bugs**\ ************ @@ -109,7 +109,7 @@ window manager let me know. ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From bb54070e40d5444bb45beb003bb8acd0261a8c06 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0391/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/wkill.1.rst --- .../admin-guides/references/man1/wkill.1.rst | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/wkill.1.rst b/docs/source/guides/admin-guides/references/man1/wkill.1.rst index 8d4cd02c7..b40658bcc 100644 --- a/docs/source/guides/admin-guides/references/man1/wkill.1.rst +++ b/docs/source/guides/admin-guides/references/man1/wkill.1.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -25,7 +25,7 @@ Name ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -40,26 +40,26 @@ wcons windows on your $DISPLAY will be killed. *************** -\ **Options**\ +\ **Options**\ *************** -\ **-h | -**\ **-help**\ - +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - + **************** -\ **Examples**\ +\ **Examples**\ **************** @@ -71,7 +71,7 @@ wcons windows on your $DISPLAY will be killed. ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From af2a1aa09576bb1d656f1021cd1c65097e85af49 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0392/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/wvid.1.rst --- .../admin-guides/references/man1/wvid.1.rst | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/wvid.1.rst b/docs/source/guides/admin-guides/references/man1/wvid.1.rst index 5a1c178ad..10447f06d 100644 --- a/docs/source/guides/admin-guides/references/man1/wvid.1.rst +++ b/docs/source/guides/admin-guides/references/man1/wvid.1.rst @@ -7,7 +7,7 @@ wvid.1 ************ -\ **Name**\ +\ **Name**\ ************ @@ -15,15 +15,15 @@ wvid - windowed remote video console for nodes **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** -\ **wvid**\ \ *noderange*\ +\ **wvid**\ \ *noderange*\ ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -35,7 +35,7 @@ The \ **nodehm.cons**\ attribute of the node determines the method used to open *************** -\ **Options**\ +\ **Options**\ *************** @@ -43,26 +43,26 @@ No options are supported at this time. **************** -\ **Examples**\ +\ **Examples**\ **************** 1. - + To open video consoles for the 1st 2 nodes: - - + + .. code-block:: perl - + wvid node1,node2 - - + + **************** -\ **See Also**\ +\ **See Also**\ **************** From 87a6f866c7e980a3610de3cf541c55a35f270c1f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0393/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst --- .../guides/admin-guides/references/man1/xCATWorld.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst b/docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst index d473d603b..c29437dc1 100644 --- a/docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **xCATWorld**\ \ *noderange*\ +\ **xCATWorld**\ \ *noderange*\ *********** @@ -27,7 +27,7 @@ DESCRIPTION *********** -The xCATWorld program gives you a sample client program that interfaces to the /opt/xcat/lib/perl/xCAT_plugin/xCATWorld.pm plugin. +The xCATWorld program gives you a sample client program that interfaces to the /opt/xcat/lib/perl/xCAT_plugin/xCATWorld.pm plugin. For debugging purposes we have an Environment Variable XCATBYPASS. If export XCATBYPASS=yes, the client will call the plugin without going through the xcat daemon, xcatd. From 96cc3d136d0bb4e8d0128e7d2b28f7bcc62b0dd1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0394/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst --- .../source/guides/admin-guides/references/man1/xcat2nim.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst b/docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst index 9069b27de..f855ea2cc 100644 --- a/docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **xcat2nim [-h|-**\ **-help]**\ +\ **xcat2nim [-h|-**\ **-help]**\ -\ **xcat2nim [-V|-**\ **-verbose] [-u|-**\ **-update] [-l|-**\ **-list] [-r|-**\ **-remove] [-f|-**\ **-force] [-t object-types] [-o**\ \ *object-names*\ ] \ **[-a|-**\ **-allobjects] [-p|-**\ **-primarySN] [-b|-**\ **-backupSN]**\ \ *[noderange] [attr=val [attr=val...]]*\ +\ **xcat2nim [-V|-**\ **-verbose] [-u|-**\ **-update] [-l|-**\ **-list] [-r|-**\ **-remove] [-f|-**\ **-force] [-t object-types] [-o**\ \ *object-names*\ ] \ **[-a|-**\ **-allobjects] [-p|-**\ **-primarySN] [-b|-**\ **-backupSN]**\ \ *[noderange] [attr=val [attr=val...]]*\ *********** From c2f88f0f6815078c4fc731b70de8a369fc1463e8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0395/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst --- .../references/man1/xcatchroot.1.rst | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst b/docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst index 1f1c4c9f0..8d7b03e0e 100644 --- a/docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst @@ -19,9 +19,9 @@ SYNOPSIS ******** -\ **xcatchroot -h**\ +\ **xcatchroot -h**\ -\ **xcatchroot [-V] -i**\ \ *osimage_name cmd_string*\ +\ **xcatchroot [-V] -i**\ \ *osimage_name cmd_string*\ *********** @@ -29,11 +29,11 @@ DESCRIPTION *********** -For AIX diskless images this command will modify the AIX SPOT resource using +For AIX diskless images this command will modify the AIX SPOT resource using the chroot command. You must include the name of an xCAT osimage definition and the command that you wish to have run in the spot. -\ **WARNING:**\ +\ **WARNING:**\ Be very careful when using this command!!! Make sure you are @@ -53,21 +53,21 @@ check operation on the spot. nim -Fo check -The xcatchroot command will take care of any of the required setup so that +The xcatchroot command will take care of any of the required setup so that the command you provide will be able to run in the spot chroot environment. It will also mount the lpp_source resource listed in the osimage definition so that you can access additional software that you may wish to install. -For example, assume that the location of the spot named in the xCAT osimage +For example, assume that the location of the spot named in the xCAT osimage definition is /install/nim/spot/614spot/usr. The associated root directory in this spot would be /install/nim/spot/614spot/usr/lpp/bos/inst_root. The chroot -is automatically done to this new root directory. The spot location is +is automatically done to this new root directory. The spot location is mounted on /.../inst_root/usr so that when your command is run in the chroot environment it is actually running commands from the spot usr location. -Also, the location of the lpp_source resource specified in the osimage +Also, the location of the lpp_source resource specified in the osimage definition will be mounted to a subdirectory of the spot /.../inst_root -directory. For example, if the lpp_source location is +directory. For example, if the lpp_source location is /install/nim/lpp_source/614lpp_lpp_source then that would be mounted over /install/nim/spot/614spot/usr/lpp/bos/inst_root/lpp_source. @@ -76,7 +76,7 @@ of all commands and files assuming the /.../inst_root directory is you root directory. If you wish to install software from the lpp_source location you would -provide a directory location of /lpp_source (or /lpp_source/installp/ppc +provide a directory location of /lpp_source (or /lpp_source/installp/ppc or /lpp_source/RPMS/ppc etc.) See the example below. Always run the NIM check operation after you are done updating your spot. @@ -89,29 +89,29 @@ OPTIONS -\ *cmd_string*\ - - The command you wish to have run in the chroot environment. (Use a quoted +\ *cmd_string*\ + + The command you wish to have run in the chroot environment. (Use a quoted string.) - -\ **-h |-**\ **-help**\ - + +\ **-h |-**\ **-help**\ + Display usage message. - -\ **-i**\ \ *osimage_name*\ - + +\ **-i**\ \ *osimage_name*\ + The name of the xCAT osimage definition. - -\ **-V |-**\ **-verbose**\ - + +\ **-V |-**\ **-verbose**\ + Verbose mode. - + @@ -135,7 +135,7 @@ EXAMPLES ******** -1) Set the root password to "cluster" in the spot so that when the diskless +1) Set the root password to "cluster" in the spot so that when the diskless node boots it will have a root password set. From 928b500549c5532757424a9064375377ce2669b2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0396/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst --- .../references/man1/xcatperftest.1.rst | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst b/docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst index 4911358cd..3c7bf5394 100644 --- a/docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst @@ -29,10 +29,10 @@ DESCRIPTION *********** -The xcatperftest command runs commandes defined in a command list file and get their execution response time baseline for performance purpose. +The xcatperftest command runs commandes defined in a command list file and get their execution response time baseline for performance purpose. The xcatperftest command is part of the xCAT package xCAT-test, and you can run it standalone or leverage it to build up your automation test cases. -Any commands could be defined in the command list file, however, it is recommended that the one-time initial configuration are well prepared prior to run xcatperftest command. +Any commands could be defined in the command list file, however, it is recommended that the one-time initial configuration are well prepared prior to run xcatperftest command. For example, the network object, osdistor and osimage image objects. Follow the below steps to run xcatperftest command: @@ -54,22 +54,22 @@ OPTIONS -\ **-?|-h**\ - +\ **-?|-h**\ + Display usage message. - + - + Specifies the command list file with full-path. xCAT supports an example command file: /opt/xcat/share/xcat/tools/autotest/perfcmds.lst - + - + Total number of fake nodes will be defined during the testing. - + @@ -109,7 +109,7 @@ The command list file is in flat text format, the testing framework will parse t noderm #PERFGRP# -\ **Note**\ : Each line defines one command, and the commands dependency should be handled by the line order. +\ **Note**\ : Each line defines one command, and the commands dependency should be handled by the line order. If you define a node range series line (started with #SERIES#) in this file, xcatperftest will run the command for each node range defined in series line. \ **#SERIES#**\ To define a node range series, and the series should be an comma split incremental number sequence. @@ -128,33 +128,33 @@ ENVIRONMENT VARIABLE The xcatperftest command supports be customized by some environment variables. -\ **FAKE_NODE_PREFIX**\ +\ **FAKE_NODE_PREFIX**\ Optional, the prefix of the fake compute node name. By default, the value is 'fake' -\ **FAKE_NODE_GROUP**\ +\ **FAKE_NODE_GROUP**\ # Optional, the group name of all the fake compute nodes. By default, the value is 'perftest' -\ **FAKE_NETWORK_PRO**\ +\ **FAKE_NETWORK_PRO**\ Mandatory, the Provision network for all the fake compute nodes. By default, the value is '192.168'. It must be a string like 'A.B', and be matched with \`tabdump networks\` -\ **FAKE_NETWORK_BMC**\ +\ **FAKE_NETWORK_BMC**\ Mandatory, the BMC network for all the fake compute nodes. By default, the value is '192.168'. Note: It could not be the same subnet as 'FAKE_NETWORK_PRO' It must be a string like 'A.B' and no need to be defined in 'networks' table. -\ **PERF_NODETEMPL**\ +\ **PERF_NODETEMPL**\ Optional, The node template name used for generating fake nodes. By default, it will be auto-detected according to the current arch. -\ **PERF_DRYRUN**\ +\ **PERF_DRYRUN**\ Optional, Indicate no real commands will be executed if the environment variable is set. -\ **PERF_NOCREATE**\ +\ **PERF_NOCREATE**\ Optional, Indicate no new fake nodes will be created if the environment variable is set. @@ -166,39 +166,39 @@ EXAMPLES 1. - + To run the performance testing for the commands defined in /tmp/cmd.lst on 5000 fake nodes: - - + + .. code-block:: perl - + xcatperftest 5000 /tmp/cmd.lst - - + + 2. - + To generate an xCAT node object stanz file for 10000 nodes in subnet 10.100.0.0: - - + + .. code-block:: perl - + FAKE_NETWORK_PRO=10.100 FAKE_NETWORK_BMC=10.200 xcatperftest 10000 - - + + 3. - + To run the performance testing for the commands defined in /opt/xcat/share/xcat/tools/autotest/perfcmds.lst on 5000 existing fake nodes: - - + + .. code-block:: perl - + PERF_NOCREATE=y xcatperftest 5000 /opt/xcat/share/xcat/tools/autotest/perfcmds.lst - - + + From fec59b760bde7cc3b1c80577d110d8c71fe42fa3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0397/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xcattest.1.rst --- .../references/man1/xcattest.1.rst | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xcattest.1.rst b/docs/source/guides/admin-guides/references/man1/xcattest.1.rst index 53a022bdf..fbc86963b 100644 --- a/docs/source/guides/admin-guides/references/man1/xcattest.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xcattest.1.rst @@ -54,46 +54,46 @@ OPTIONS -\ **-?|-h**\ - +\ **-?|-h**\ + Display usage message. - -\ **-f**\ \ *configure file*\ - + +\ **-f**\ \ *configure file*\ + Specifies the configuration file with full-path. xCAT supports an example config file: /opt/xcat/share/xcat/tools/autotest/linux.conf.template - -\ **-b**\ \ *case bundle list*\ - + +\ **-b**\ \ *case bundle list*\ + Comma separated list of test cases bundle files, each test cases bundle can contain multiple lines and each line for one test case name. The bundle files should be listed in: /opt/xcat/share/xcat/tools/autotest/bundle. - -\ **-t**\ \ *cases list*\ - + +\ **-t**\ \ *cases list*\ + Comma separated list of test cases that will be run. - -\ **-c**\ \ *cmd list*\ - + +\ **-c**\ \ *cmd list*\ + Comma separated list of commands which will be tested, i.e., all the test cases under the command sub directory will be run. - -\ **-l**\ - + +\ **-l**\ + Display the test cases names specified by the flag -b, -t or -c. - -\ **-s**\ - + +\ **-s**\ + Display the bundle files and command with value: bundle or command. - + @@ -121,7 +121,7 @@ The xCAT-test test cases are in flat text format, the testing framework will par start:case name #optional, description of the test case description: what the test case is for? - #optional, environment requirements + #optional, environment requirements os:AIX/Linux #optional, environment requirements arch:ppc/x86 @@ -146,50 +146,50 @@ EXAMPLES 1. - + To run all test cases related command rpower: - - + + .. code-block:: perl - + xcattest -f /tmp/config -c rpower - - + + 2. - + To run customized bundle with /tmp/config file: - - + + .. code-block:: perl - + xcattest -c lsdef -l > /opt/xcat/share/xcat/tools/autotest/bundle/custom.bundle Modify custom.bundle xcattest -f /tmp/config -b custom.bundle - - + + 3. - + To run specified test cases with /tmp/config file: - - + + .. code-block:: perl - + xcattest -f /tmp/config -t lsdef_t_o_l_z - - + + 4. - + To add a new case to test chvm. In the example, we assume that the min_mem should not be equal to 16 in the lpar profile of computenode. The case name is chvm_custom. It create a test lpar named testnode firstly, that change the min_mem of the lpar to 16 using chvm, then check if min_mem have changed correctly. At last, the testnode be remove to ensure no garbage produced in the cases. - - + + .. code-block:: perl - + add a new test case file in /opt/xcat/share/xcat/tools/autotest/chvm edit filename start:chvm_custom @@ -207,8 +207,8 @@ EXAMPLES cmd:rmvm testnode cmd:rm -f /tmp/autotest.profile end - - + + From 46bb4f66fcd951a231e8631486dcf16780aff005 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0398/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xcoll.1.rst --- .../admin-guides/references/man1/xcoll.1.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xcoll.1.rst b/docs/source/guides/admin-guides/references/man1/xcoll.1.rst index 678d76ac2..ef49f4b13 100644 --- a/docs/source/guides/admin-guides/references/man1/xcoll.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xcoll.1.rst @@ -7,7 +7,7 @@ xcoll.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,7 +15,7 @@ xcoll.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** @@ -23,11 +23,11 @@ xcoll.1 ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* -The \ **xcoll**\ command formats and consolidates output from the \ **psh,rinv**\ command. The \ **xcoll**\ +The \ **xcoll**\ command formats and consolidates output from the \ **psh,rinv**\ command. The \ **xcoll**\ command takes, as input, lines in the following format: groupname: line of output from remote command, will use group name, if defined @@ -47,7 +47,7 @@ is identical: lines from psh for node1 with hostnames stripped off . . - + ==================================== node2 or nodegroup name ==================================== @@ -56,7 +56,7 @@ is identical: lines from psh for node2 with hostnames stripped off . . - + ==================================== node3, node4 or nodegroup name ==================================== @@ -69,44 +69,44 @@ is identical: *************** -\ **OPTIONS**\ +\ **OPTIONS**\ *************** -\ **-c**\ - +\ **-c**\ + Display a total nodecount for each set of output. - -\ **-n**\ - + +\ **-n**\ + Display output as nodenames instead of groupnames. - + **************** -\ **EXAMPLES**\ +\ **EXAMPLES**\ **************** 1. To display the results of a command issued on several nodes, in the format used in the Description, enter: - - + + .. code-block:: perl - + psh node1,node2,node3 cat /etc/passwd | xcoll - - + + **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From b22f6245931ae0c678c1a52038053b34d65e8aa2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0399/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xdcp.1.rst --- .../admin-guides/references/man1/xdcp.1.rst | 504 +++++++++--------- 1 file changed, 252 insertions(+), 252 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xdcp.1.rst b/docs/source/guides/admin-guides/references/man1/xdcp.1.rst index 0eb60167e..4584d26c8 100644 --- a/docs/source/guides/admin-guides/references/man1/xdcp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xdcp.1.rst @@ -7,7 +7,7 @@ xdcp.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,11 +15,11 @@ xdcp.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** -\ **xdcp**\ \ *noderange*\ [[\ **-B**\ | \ **-**\ **-bypass**\ ] [\ **-f**\ \ *fanout*\ ] [\ **-L**\ ] [\ **-l**\ \ *userID*\ ] [\ **-o**\ \ *node_options*\ ] [\ **-p**\ ] [\ **-P**\ ] [\ **-r**\ \ *node_remote_shell*\ ] [\ **-R**\ ] [\ **-t**\ \ *timeout*\ ] [\ **-T**\ ] [\ **-v**\ ] [\ **-q**\ ] [\ **-X**\ \ *env_list*\ ] \ *sourcefile.... targetpath*\ +\ **xdcp**\ \ *noderange*\ [[\ **-B**\ | \ **-**\ **-bypass**\ ] [\ **-f**\ \ *fanout*\ ] [\ **-L**\ ] [\ **-l**\ \ *userID*\ ] [\ **-o**\ \ *node_options*\ ] [\ **-p**\ ] [\ **-P**\ ] [\ **-r**\ \ *node_remote_shell*\ ] [\ **-R**\ ] [\ **-t**\ \ *timeout*\ ] [\ **-T**\ ] [\ **-v**\ ] [\ **-q**\ ] [\ **-X**\ \ *env_list*\ ] \ *sourcefile.... targetpath*\ \ **xdcp**\ \ *noderange*\ [\ **-F**\ \ *rsync input file*\ ] @@ -31,17 +31,17 @@ xdcp.1 ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* The \ **xdcp**\ command concurrently copies files to or from remote target nodes. The command issues a remote copy command for each node or device specified. When files are pulled from a target, they are placed into the target_path with the name of the remote node or device appended to the copied source_file name. The -/usr/bin/rcp command is the model for syntax and security. +/usr/bin/rcp command is the model for syntax and security. If using hierarchy, then xdcp runs on the service node that is servicing the compute node. The file will first be copied to the path defined in the site table, SNsyncfiledir attribute, or the default path /var/xcat/syncfiles on the service node, if the attribute is not defined. The -P flag will not automatically copy the files from the compute node to the Management node, hierarchically. There -is a two step process, see \ **-P**\ flag. +is a two step process, see \ **-P**\ flag. If the Management Node is target node, it must be defined in the xCAT database with nodetype=mn. When the \ **xdcp**\ command runs the Management Node as the target, it does not use remote commands but uses the local OS copy (\ **cp**\ ) command. \ **REMOTE**\ \ **USER**\ : @@ -85,114 +85,114 @@ standard output or standard error is displayed. *************** -\ **OPTIONS**\ +\ **OPTIONS**\ *************** -\ *sourcefile...*\ - +\ *sourcefile...*\ + Specifies the complete path for the file to be copied to or from the target. Multiple files can be specified. When used with the -R flag, only a single directory can be specified. When used with the -P flag, only a single file can be specified. - -\ *targetpath*\ - + +\ *targetpath*\ + If one source_file file, then it specifies the file to copy the source_file file to on the target. If multiple source_file files, it specifies the directory to copy the source_file files to on the target. If the -P flag is specified, the target_path is the local host location for the copied files. The remote file directory structure is recreated - under target_path and the remote target name is appended + under target_path and the remote target name is appended to the copied source_file name in the target_path directory. Note: the targetpath directory must exist. - -\ **-B | -**\ **-bypass**\ - + +\ **-B | -**\ **-bypass**\ + Runs in bypass mode, use if the xcatd daemon is hung. - -\ **-f | -**\ **-fanout**\ \ *fanout_value*\ - + +\ **-f | -**\ **-fanout**\ \ *fanout_value*\ + Specifies a fanout value for the maximum number of concur- rently executing remote shell processes. Serial execution - can be specified by indicating a fanout value of \ **1**\ . + can be specified by indicating a fanout value of \ **1**\ . If \ **-f**\ is not specified, a default fanout value of \ **64**\ is used. - -\ **-F | -**\ **-File**\ \ *rsync input file*\ - - Specifies the path to the file that will be used to + +\ **-F | -**\ **-File**\ \ *rsync input file*\ + + Specifies the path to the file that will be used to build the \ **rsync**\ command. The format of the input file is as follows, each line contains: - - + + .. code-block:: perl - + ... -> < path to destination file/directory> - - + + or - - + + .. code-block:: perl - + -> - - + + or - - + + .. code-block:: perl - + -> - - + + For example: - - + + .. code-block:: perl - + /etc/password /etc/hosts -> /etc - + /tmp/file2 -> /tmp/file2 - + /tmp/file2 -> /tmp/ - + /tmp/filex -> /tmp/source/filey - + /etc/* -> /etc/ - - + + \ **Running postscripts after files are sync'd to the nodes**\ : - - After you define the files to rsync, you can add an \ **EXECUTE:**\ clause in the synclist file. The \ **EXECUTE:**\ clause will list all the postscripts that you would like to run after the files are sync'd to the node. + + After you define the files to rsync, you can add an \ **EXECUTE:**\ clause in the synclist file. The \ **EXECUTE:**\ clause will list all the postscripts that you would like to run after the files are sync'd to the node. The postscript file must be of the form \ **filename.post**\ , where the is the is the from , reside in the same directory as \ **filename**\ , and be executable. - If the file \ **filename**\ is rsync'd to the node, then the \ **filename.post**\ + If the file \ **filename**\ is rsync'd to the node, then the \ **filename.post**\ will automatically be run on the node. If the file \ **filename**\ is not updated on the node, the \ **filename.post**\ will not be run. - + Putting the \ **filename.post**\ in the file list to rsync to the node is required for hierarchical clusters. It is optional for non-hierarchical clusters. - + Another option is the \ **EXECUTEALWAYS:**\ clause in the synclist file. The \ **EXECUTEALWAYS:**\ will list all the postscripts that you would like to run after the files are sync'd to the nodes. These scripts will run whether or not any files are sync'd to the nodes. The scripts have no special format, but must contain the fully qualified path. - + The scripts must be also added to the file list to rsync to the node for hierarchical clusters. It is optional for non-hierarchical clusters. - + For example, your rsynclist file may look like this: - - + + .. code-block:: perl - + /tmp/share/file2 -> /tmp/file2 /tmp/share/file2.post -> /tmp/file2.post /tmp/share/file3 -> /tmp/filex @@ -204,18 +204,18 @@ standard output or standard error is displayed. /tmp/share/file3.post EXECUTEALWAYS: /tmp/myscript - - - If /tmp/file2 and /tmp/file3 update /tmp/file2 and /tmp/filex on the node, then the postscripts /tmp/file2.post and /tmp/file3.post are automatically run on + + + If /tmp/file2 and /tmp/file3 update /tmp/file2 and /tmp/filex on the node, then the postscripts /tmp/file2.post and /tmp/file3.post are automatically run on the node. /tmp/myscript will always be run on the node. - + Another option is the \ **APPEND:**\ clause in the synclist file. The \ **APPEND:**\ clause is used to append the contents of the input file to an existing file on the node. The file to append \ **must**\ already exist on the node and not be part of the synclist that contains the \ **APPEND:**\ clause. - + For example, your rsynclist file may look like this: - - + + .. code-block:: perl - + /tmp/share/file2 -> /tmp/file2 /tmp/share/file2.post -> /tmp/file2.post /tmp/share/file3 -> /tmp/filex @@ -230,12 +230,12 @@ standard output or standard error is displayed. APPEND: /etc/myappenddir/appendfile -> /etc/mysetup/setup /etc/myappenddir/appendfile2 -> /etc/mysetup/setup2 - - + + When you use the append script, the file (left) of the arrow is appended to the file right of the arrow. In this example, /etc/myappenddir/appendfile is appended to /etc/mysetup/setup file, which must already exist on the node. The /opt/xcat/share/xcat/scripts/xdcpappend.sh is used to accomplish this. - + Another option is the \ **MERGE:**\ clause in the synclist file. The \ **MERGE:**\ clause is used to append the contents of the input file to /etc/passwd, /etc/group, or /etc/shadow on a Linux node. It is only supported for those files and only on Linux. You must not use both the APPEND and MERGE funcion for these three files. The processing could end up not creating the file you desire. The MERGE function is the preferred method, becuase APPEND only adds to the file. MERGE will add to the file but also insure there are no duplicate entries. - + For example, your rsynclist file may look like this: /tmp/share/file2 -> /tmp/file2 /tmp/share/file2.post -> /tmp/file2.post @@ -252,44 +252,44 @@ standard output or standard error is displayed. /custom/mypasswd -> /etc/passwd /custom/mygroups -> /etc/group /custom/myshadow -> /etc/shadow - + Note: no order can be assumed by the order that the EXECUTE,EXECUTEALWAYS and APPEND clause fall in the synclist file. - + For more information on syncing files to node, read Sync-ing_Config_Files_to_Nodes - + On Linux rsync always uses ssh remoteshell. On AIX, ssh or rsh is used depending on the site.useSSHonAIX attribute. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Displays usage information. - -\ **-i | -**\ **-rootimg**\ \ *install image*\ - + +\ **-i | -**\ **-rootimg**\ \ *install image*\ + Specifies the path to the install image on the local Linux node. - -\ **-o | -**\ **-node-options**\ \ *node_options*\ - + +\ **-o | -**\ **-node-options**\ \ *node_options*\ + Specifies options to pass to the remote shell command for node targets. The options must be specified within double quotation marks ("") to distinguish them from \ **xdsh**\ options. - -\ **-p | -**\ **-preserve**\ - + +\ **-p | -**\ **-preserve**\ + Preserves the source file characteristics as implemented by the configured remote copy command. - -\ **-P | -**\ **-pull**\ - + +\ **-P | -**\ **-pull**\ + Pulls (copies) the files from the targets and places them in the target_path directory on the local host. The target_path must be a directory. Files pulled from remote machines have @@ -298,164 +298,164 @@ standard output or standard error is displayed. appended to the directory. Only one file per invocation of the xdcp pull command can be pulled from the specified targets. Hierarchy is not automatically support yet. You must first pull - the file to the Service Node and then pull the file to the Management + the file to the Service Node and then pull the file to the Management node. - -\ **-q | -**\ **-show-config**\ - + +\ **-q | -**\ **-show-config**\ + Displays the current environment settings for all DSH Utilities commands. This includes the values of all environment variables and settings for all currently installed and valid contexts. Each setting is prefixed with \ *context*\ : to identify the source context of the setting. - -\ **-r | -**\ **-node-rcp**\ \ *node_remote_copy*\ - + +\ **-r | -**\ **-node-rcp**\ \ *node_remote_copy*\ + Specifies the full path of the remote copy command used for remote command execution on node targets. - -\ **-R | -**\ **-recursive**\ \ *recursive*\ - + +\ **-R | -**\ **-recursive**\ \ *recursive*\ + Recursively copies files from a local directory to the remote targets, or when specified with the \ **-P**\ flag, recursively pulls (copies) files from a remote directory to the local host. A single source directory can be specified using the source_file parameter. - -\ **-s**\ \ *synch service nodes*\ - + +\ **-s**\ \ *synch service nodes*\ + Will only sync the files listed in the synclist (\ **-F**\ ), to the service nodes for the input compute node list. The files will be placed in the directory defined by the site.SNsyncfiledir attribute, or the default /var/xcat/syncfiles directory. - -\ **-t | -**\ **-timeout**\ \ *timeout*\ - + +\ **-t | -**\ **-timeout**\ \ *timeout*\ + Specifies the time, in seconds, to wait for output from any currently executing remote targets. If no output is - available from any target in the specified \ *timeout*\ , + available from any target in the specified \ *timeout*\ , \ **xdsh**\ displays an error and terminates execution for the remote targets that failed to respond. If \ *timeout*\ is not specified, \ **xdsh**\ waits indefinitely to continue processing output from all remote targets. When specified with the \ **-i**\ flag, the user is prompted for an additional timeout interval to wait for output. - -\ **-T | -**\ **-trace**\ - + +\ **-T | -**\ **-trace**\ + Enables trace mode. The \ **xdcp**\ command prints diagnostic messages to standard output during execution to each target. - -\ **-v | -**\ **-verify**\ - + +\ **-v | -**\ **-verify**\ + Verifies each target before executing any remote commands on the target. If a target is not responding, execution of remote commands for the target is canceled. - -\ **-V | -**\ **-version**\ - + +\ **-V | -**\ **-version**\ + Displays the \ **xdcp**\ command version information. - + ************************************* -\ **Environment**\ \ **Variables**\ +\ **Environment**\ \ **Variables**\ ************************************* -\ **DSH_ENVIRONMENT**\ - +\ **DSH_ENVIRONMENT**\ + Specifies a file that contains environment variable definitions to export to the target before executing the remote command. This variable is overridden by the \ **-E**\ flag. - -\ **DSH_FANOUT**\ - + +\ **DSH_FANOUT**\ + Specifies the fanout value. This variable is overridden by the \ **-f**\ flag. - -\ **DSH_NODE_OPTS**\ - + +\ **DSH_NODE_OPTS**\ + Specifies the options to use for the remote shell command with node targets only. This variable is overridden by the \ **-o**\ flag. - -\ **DSH_NODE_RCP**\ - + +\ **DSH_NODE_RCP**\ + Specifies the full path of the remote copy command to use to copy local scripts and local environment configuration files to node targets. - -\ **DSH_NODE_RSH**\ - + +\ **DSH_NODE_RSH**\ + Specifies the full path of the remote shell to use for remote command execution on node targets. This variable is overridden by the \ **-r**\ flag. - -\ **DSH_NODEGROUP_PATH**\ - + +\ **DSH_NODEGROUP_PATH**\ + Specifies a colon-separated list of directories that contain node group files for the \ **DSH**\ context. When the \ **-a**\ flag is specified in the \ **DSH**\ context, a list of unique node names is collected from all node group files in the path. - -\ **DSH_PATH**\ - + +\ **DSH_PATH**\ + Sets the command path to use on the targets. If \ **DSH_PATH**\ is not set, the default path defined in the profile of the remote \ *user_ID*\ is used. - -\ **DSH_SYNTAX**\ - + +\ **DSH_SYNTAX**\ + Specifies the shell syntax to use on remote targets; \ **ksh**\ or \ **csh**\ . If not specified, the \ **ksh**\ syntax is assumed. This variable is overridden by the \ **-S**\ flag. - -\ **DSH_TIMEOUT**\ - + +\ **DSH_TIMEOUT**\ + Specifies the time, in seconds, to wait for output from - each remote target. This variable is overridden by the \ **-t**\ + each remote target. This variable is overridden by the \ **-t**\ flag. - + ******************* -\ **Exit Status**\ +\ **Exit Status**\ ******************* @@ -473,7 +473,7 @@ successfully, the xdcp command exit value is greater than 0. **************** -\ **Security**\ +\ **Security**\ **************** @@ -491,235 +491,235 @@ userdefined. **************** -\ **Examples**\ +\ **Examples**\ **************** 1. To copy the /etc/hosts file from all nodes in the cluster to the /tmp/hosts.dir directory on the local host, enter: - - + + .. code-block:: perl - + xdcp all -P /etc/hosts /tmp/hosts.dir - - + + A suffix specifying the name of the target is appended to each file name. The contents of the /tmp/hosts.dir directory are similar to: - - + + .. code-block:: perl - + hosts._node1 hosts._node4 hosts._node7 hosts._node2 hosts._node5 hosts._node8 hosts._node3 hosts._node6 - - + + 2. To copy the directory /var/log/testlogdir from all targets in NodeGroup1 with a fanout of 12, and save each directory on the local host as /var/log._target, enter: - - + + .. code-block:: perl - + xdcp NodeGroup1 -f 12 -RP /var/log/testlogdir /var/log - - + + 3. To copy /localnode/smallfile and /tmp/bigfile to /tmp on node1 using rsync and input -t flag to rsync, enter: - - + + .. code-block:: perl - + xdcp node1 -r /usr/bin/rsync -o "-t" /localnode/smallfile /tmp/bigfile /tmp - - + + 4. To copy the /etc/hosts file from the local host to all the nodes in the cluster, enter: - - + + .. code-block:: perl - + xdcp all /etc/hosts /etc/hosts - - + + 5. To copy all the files in /tmp/testdir from the local host to all the nodes in the cluster, enter: - - + + .. code-block:: perl - + xdcp all /tmp/testdir/* /tmp/testdir - - -6. To copy all the files in /tmp/testdir and it's subdirectories + + +6. To copy all the files in /tmp/testdir and it's subdirectories from the local host to node1 in the cluster, enter: - - + + .. code-block:: perl - + xdcp node1 -R /tmp/testdir /tmp/testdir - - + + 7. To copy the /etc/hosts file from node1 and node2 to the /tmp/hosts.dir directory on the local host, enter: - - + + .. code-block:: perl - + xdcp node1,node2 -P /etc/hosts /tmp/hosts.dir - - + + 8. To rsync the /etc/hosts file to your compute nodes: - + Create a rsync file /tmp/myrsync, with this line: - + /etc/hosts -> /etc/hosts - + or - + /etc/hosts -> /etc/ (last / is required) - + Run: - - + + .. code-block:: perl - + xdcp compute -F /tmp/myrsync - - + + 9. - + To rsync all the files in /home/mikev to the compute nodes: - + Create a rsync file /tmp/myrsync, with this line: - + /home/mikev/\* -> /home/mikev/ (last / is required) - + Run: - - + + .. code-block:: perl - + xdcp compute -F /tmp/myrsync - - + + 10. To rsync to the compute nodes, using service nodes, the command will first rsync the files to the /var/xcat/syncfiles directory on the service nodes and then rsync the files from that directory to the compute nodes. The /var/xcat/syncfiles default directory on the service nodes, can be changed by putting a directory value in the site table SNsyncfiledir attribute. - + Create a rsync file /tmp/myrsync, with this line: - + /etc/hosts /etc/passwd -> /etc - + or - + /etc/hosts /etc/passwd -> /etc/ - + Run: - - + + .. code-block:: perl - + xdcp compute -F /tmp/myrsync - - + + to update the Compute Nodes - + 11. To rsync to the service nodes in preparation for rsyncing the compute nodes during an install from the service node. - + Create a rsync file /tmp/myrsync, with this line: - + /etc/hosts /etc/passwd -> /etc - + Run: - - + + .. code-block:: perl - + xdcp compute -s -F /tmp/myrsync - - + + to sync the service node for compute - + 12. To rsync the /etc/file1 and file2 to your compute nodes and rename to filex and filey: - + Create a rsync file /tmp/myrsync, with these line: - + /etc/file1 -> /etc/filex - + /etc/file2 -> /etc/filey - + Run: - - + + .. code-block:: perl - + xdcp compute -F /tmp/myrsync - - + + to update the Compute Nodes - + 13. To rsync files in the Linux image at /install/netboot/fedora9/x86_64/compute/rootimg on the MN: - + Create a rsync file /tmp/myrsync, with this line: - + /etc/hosts /etc/passwd -> /etc - + Run: - - + + .. code-block:: perl - + xdcp -i /install/netboot/fedora9/x86_64/compute/rootimg -F /tmp/myrsync - - + + 14. To define the Management Node in the database so you can use xdcp, run - - + + .. code-block:: perl - + xcatconfig -m - - + + ************* -\ **Files**\ +\ **Files**\ ************* **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From ab95896d48c386ac91c28bb01a66bc53de636ecf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0400/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xdsh.1.rst --- .../admin-guides/references/man1/xdsh.1.rst | 458 +++++++++--------- 1 file changed, 229 insertions(+), 229 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xdsh.1.rst b/docs/source/guides/admin-guides/references/man1/xdsh.1.rst index 6132f8048..03f6db8f2 100644 --- a/docs/source/guides/admin-guides/references/man1/xdsh.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xdsh.1.rst @@ -7,7 +7,7 @@ xdsh.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,19 +15,19 @@ xdsh.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** \ **xdsh**\ \ *noderange*\ [\ **-B**\ | \ **-**\ **-bypass**\ ] [\ **-**\ **-devicetype**\ \ *type_of_device*\ ] [\ **-e**\ ] [\ **-E**\ \ *environment_file*\ ] [\ **-f**\ \ *fanout*\ ] [\ **-L**\ ] [\ **-l**\ \ *userID*\ ] [\ **-m**\ ] [\ **-o**\ \ *node_options*\ ] [\ **-Q**\ ] [\ **-r**\ \ *node_remote_shell*\ ] [\ **-s**\ ] [\ **-S**\ {\ **csh | ksh**\ }] [\ **-t**\ \ *timeout*\ ] -[\ **-T**\ ] [\ **-v**\ ] [\ **-X**\ \ *env_list*\ ] [\ **-z**\ ] [\ **-**\ **-sudo**\ ] \ *command_list*\ +[\ **-T**\ ] [\ **-v**\ ] [\ **-X**\ \ *env_list*\ ] [\ **-z**\ ] [\ **-**\ **-sudo**\ ] \ *command_list*\ \ **xdsh**\ \ *noderange*\ [\ **-K**\ ] -\ **xdsh**\ \ *noderange*\ [\ **-K**\ ] [\ **-l**\ \ *userID*\ ] \ **-**\ **-devicetype**\ \ *type_of_device*\ +\ **xdsh**\ \ *noderange*\ [\ **-K**\ ] [\ **-l**\ \ *userID*\ ] \ **-**\ **-devicetype**\ \ *type_of_device*\ -\ **xdsh**\ [\ **-i**\ \ *image path | nim image name*\ ] \ *command_list*\ +\ **xdsh**\ [\ **-i**\ \ *image path | nim image name*\ ] \ *command_list*\ \ **xdsh**\ \ *noderange*\ [\ **-c**\ ] @@ -35,7 +35,7 @@ xdsh.1 ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* @@ -43,7 +43,7 @@ The \ **xdsh**\ command runs commands in parallel on remote nodes and/or the Ma remote shell command for each target specified, and returns the output from all targets, formatted so that command results from all nodes can be managed. -If the command is to be executed on the Management Node, it does not use a remote shell command, but uses the local OS copy or shell command. The Management Node must be defined in the xCAT database. The best way to do this is to use the xcatconfig -m option. +If the command is to be executed on the Management Node, it does not use a remote shell command, but uses the local OS copy or shell command. The Management Node must be defined in the xCAT database. The best way to do this is to use the xcatconfig -m option. The \ **xdsh**\ command is an xCAT Distributed Shell Utility. \ **COMMAND**\ \ **SPECIFICATION**\ : @@ -116,7 +116,7 @@ The file should be executable and contain one environment variable per line. \ **COMMAND**\ \ **EXECUTION**\ : The maximum number of concurrent remote shell command processes (the -fanout) can be specified with the \ **-f**\ flag or with the \ **DSH_FANOUT**\ +fanout) can be specified with the \ **-f**\ flag or with the \ **DSH_FANOUT**\ environment variable. The fanout is only restricted by the number of remote shell commands that can be run in parallel. You can experiment with the \ **DSH_FANOUT**\ value on your management server to see if higher values are @@ -177,240 +177,240 @@ the commands executing on the remote targets. Signal 19 (CONT), Signal 17 (STOP), and Signal 18 (TSTP) default to \ **xdsh**\ ; the \ **xdsh**\ command responds normally to these signals, but the signals do not have an effect on remotely executing commands. Other -signals are caught by \ **xdsh**\ and have their default effects on the \ **xdsh**\ +signals are caught by \ **xdsh**\ and have their default effects on the \ **xdsh**\ command; all current child processes, through propagation to remotely running commands, are terminated (SIGTERM). *************** -\ **OPTIONS**\ +\ **OPTIONS**\ *************** -\ **-B | -**\ **-bypass**\ - +\ **-B | -**\ **-bypass**\ + Runs in bypass mode, use if the xcatd daemon is hung. - -\ **-c | -**\ **-cleanup**\ - + +\ **-c | -**\ **-cleanup**\ + This flag will have xdsh remove all files from the subdirectories of the - the directory on the servicenodes, where xdcp stages the copy to the + the directory on the servicenodes, where xdcp stages the copy to the compute nodes as defined in the site table SNsyncfiledir and nodesyncfiledir attribute, when the target is a service node. - - It can also be used to remove the nodesyncfiledir directory on the compute + + It can also be used to remove the nodesyncfiledir directory on the compute nodes, which keeps the backup copies of files for the xdcp APPEND function support, if a compute node is the target. - -\ **-e | -**\ **-execute**\ - + +\ **-e | -**\ **-execute**\ + Indicates that \ *command_list*\ specifies a local script filename and arguments to be executed on the remote targets. The script file is copied to the remote targets and then remotely executed with the given arguments. The \ **DSH_NODE_RCP**\ environment variables specify the remote copy command to use to copy the script file to node targets. - -\ **-E | -**\ **-environment**\ \ *environment_file*\ - + +\ **-E | -**\ **-environment**\ \ *environment_file*\ + Specifies that the \ *environment_file*\ contains environment variable definitions to export to the target before executing the \ *command_list*\ . - -\ **-**\ **-devicetype**\ \ *type_of_device*\ - + +\ **-**\ **-devicetype**\ \ *type_of_device*\ + Specify a user-defined device type that references the location of relevant device configuration file. The devicetype value must correspond to a valid device configuration file. xCAT ships some default configuration files - for Ethernet switches and and IB switches under + for Ethernet switches and and IB switches under \ */opt/xcat/share/xcat/devicetype*\ directory. If you want to overwrite - any of the configuration files, copy them to \ */var/opt/xcat/*\ - directory and cutomize. + any of the configuration files, copy them to \ */var/opt/xcat/*\ + directory and cutomize. For example, \ *base/IBSwitch/Qlogic/config*\ is the configuration file location if devicetype is specified as IBSwitch::Qlogic. - xCAT will first search config file using \ */var/opt/xcat/*\ as the base. - If not found, it will search for it using + xCAT will first search config file using \ */var/opt/xcat/*\ as the base. + If not found, it will search for it using \ */opt/xcat/share/xcat/devicetype/*\ as the base. - -\ **-f | -**\ **-fanout**\ \ *fanout_value*\ - + +\ **-f | -**\ **-fanout**\ \ *fanout_value*\ + Specifies a fanout value for the maximum number of concurrently executing remote shell processes. Serial execution can be specified by indicating a fanout value of \ **1**\ . If \ **-f**\ is not specified, a default fanout value of \ **64**\ is used. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Displays usage information. - -\ **-i | -**\ **-rootimg**\ \ *install image*\ - + +\ **-i | -**\ **-rootimg**\ \ *install image*\ + For Linux, Specifies the path to the install image on the local node. - For AIX, specifies the name of the osimage on the local node. Run lsnim + For AIX, specifies the name of the osimage on the local node. Run lsnim for valid names. xdsh will chroot (xcatchroot for AIX) to this path and run the xdsh command against the - install image. No other xdsh flags, environment variables apply with - this input. A noderange is not accepted. Only runs on the local host, + install image. No other xdsh flags, environment variables apply with + this input. A noderange is not accepted. Only runs on the local host, normally the Management Node. The command you run must not prompt for input, the prompt will not be returned to you, and it will appear that \ **xdsh**\ hangs. - - - -\ **-K | -**\ **-ssh-setup**\ -\ **-K | -**\ **-ssh-setup**\ \ **-l | -**\ **-user**\ \ *user_ID*\ \ **-**\ **-devicetype**\ \ *type_of_device*\ - +\ **-K | -**\ **-ssh-setup**\ + + + +\ **-K | -**\ **-ssh-setup**\ \ **-l | -**\ **-user**\ \ *user_ID*\ \ **-**\ **-devicetype**\ \ *type_of_device*\ + Set up the SSH keys for the user running the command to the specified node list. The userid must have the same uid, gid and password as the userid on the node where the keys will be setup. - + If the current user is root, roots public ssh keys will be put in the authorized_keys\* files under roots .ssh directory on the node(s). If the current user is non-root, the user must be in the policy table and have credential to run the xdsh command. The non-root users public ssh keys and root's public ssh keys will be put in the authorized_keys\* files under the non-root users .ssh directory on the node(s). Other device types, such as IB switch, are also supported. The - device should be defined as a node and nodetype should be defined + device should be defined as a node and nodetype should be defined as switch before connecting. The \ **xdsh -K**\ command must be run from the Management Node. - -\ **-l | -**\ **-user**\ \ *user_ID*\ - + +\ **-l | -**\ **-user**\ \ *user_ID*\ + Specifies a remote user name to use for remote command execution. - -\ **-L | -**\ **-no-locale**\ - + +\ **-L | -**\ **-no-locale**\ + Specifies to not export the locale definitions of the local host to the remote targets. Local host locale definitions are exported by default to each remote target. - -\ **-m | -**\ **-monitor**\ - + +\ **-m | -**\ **-monitor**\ + Monitors remote shell execution by displaying status messages during execution on each target. - -\ **-o | -**\ **-node-options**\ \ *node_options*\ - + +\ **-o | -**\ **-node-options**\ \ *node_options*\ + Specifies options to pass to the remote shell command for node targets. The options must be specified within double quotation marks ("") to distinguish them from \ **xdsh**\ options. - -\ **-q | -**\ **-show-config**\ - + +\ **-q | -**\ **-show-config**\ + Displays the current environment settings for all DSH Utilities commands. This includes the values of all environment variables and settings for all currently installed and valid contexts. Each setting is prefixed with \ *context*\ : to identify the source context of the setting. - -\ **-Q | -**\ **-silent**\ - + +\ **-Q | -**\ **-silent**\ + Specifies silent mode. No target output is written to standard output or standard error. Monitoring messages are written to standard output. - -\ **-r | -**\ **-node-rsh**\ \ *node_remote_shell*\ - + +\ **-r | -**\ **-node-rsh**\ \ *node_remote_shell*\ + Specifies the path of the remote shell command used for remote command execution on node targets. - -\ **-s | -**\ **-stream**\ - + +\ **-s | -**\ **-stream**\ + Specifies that output is returned as it becomes available - from each target, instead of waiting for the \ *command_list*\ + from each target, instead of waiting for the \ *command_list*\ to be completed on a target before returning output. - + \ **-S | -**\ **-syntax**\ {\ **csh | ksh**\ } - + Specifies the shell syntax to be used on the remote target. If not specified, the \ **ksh**\ syntax is used. - -\ **-**\ **-sudo**\ - + +\ **-**\ **-sudo**\ + Adding the \ **-**\ **-sudo**\ flag to the xdsh command will have xdsh run sudo before running the command. This is particular useful when using the \ **-e**\ option. This is required when you input \ **-l**\ with a non-root user id and want that id - to be able to run as root on the node. The non-root userid will must be + to be able to run as root on the node. The non-root userid will must be previously defined as an xCAT user, see process for defining non-root ids in - xCAT and setting up for using xdsh. The userid sudo setup will have + xCAT and setting up for using xdsh. The userid sudo setup will have to be done by the admin on the node. This includes, allowing all commands that you would like to run with xdsh by using visudo to edit the /etc/sudoers file. - You must disabl ssh tty requirements by commenting out or removing this line in the /etc/sudoes file "#Defaults requiretty". + You must disabl ssh tty requirements by commenting out or removing this line in the /etc/sudoes file "#Defaults requiretty". See the document Granting_Users_xCAT_privileges for sudo setup requirements. This is not supported in a hierarical cluster, that is the nodes are serviced by servicenodes. - -\ **-t | -**\ **-timeout**\ \ *timeout*\ - + +\ **-t | -**\ **-timeout**\ \ *timeout*\ + Specifies the time, in seconds, to wait for output from any currently executing remote targets. If no output is - available from any target in the specified \ *timeout*\ , \ **xdsh**\ + available from any target in the specified \ *timeout*\ , \ **xdsh**\ displays an error and terminates execution for the remote targets that failed to respond. If \ *timeout*\ is not specified, \ **xdsh**\ waits indefinitely to continue processing output from - all remote targets. The exception is the \ **-K**\ flag which defaults + all remote targets. The exception is the \ **-K**\ flag which defaults to 10 seconds. - -\ **-T | -**\ **-trace**\ - + +\ **-T | -**\ **-trace**\ + Enables trace mode. The \ **xdsh**\ command prints diagnostic messages to standard output during execution to each target. - -\ **-v | -**\ **-verify**\ - + +\ **-v | -**\ **-verify**\ + Verifies each target before executing any remote commands on the target. If a target is not responding, execution of remote commands for the target is canceled. When specified with the \ **-i**\ flag, the user is prompted to retry the verification request. - -\ **-V | -**\ **-version**\ - + +\ **-V | -**\ **-version**\ + Displays the \ **xdsh**\ command version information. - -\ **-X**\ \ *env_list*\ - + +\ **-X**\ \ *env_list*\ + Ignore \ **xdsh**\ environment variables. This option can take an argument which is a comma separated list of environment variable names that should \ **NOT**\ be ignored. If there is no @@ -419,16 +419,16 @@ running commands, are terminated (SIGTERM). This option is useful when running \ **xdsh**\ from within other scripts when you don't want the user's environment affecting the behavior of xdsh. - -\ **-z | -**\ **-exit-status**\ - + +\ **-z | -**\ **-exit-status**\ + Displays the exit status for the last remotely executed non-asynchronous command on each target. If the command issued on the remote node is run in the background, the exit status is not displayed. - + Exit values for each remote shell execution are displayed in messages from the \ **xdsh**\ command, if the remote shell exit values are non-zero. A non-zero return code from a remote shell indicates that @@ -436,7 +436,7 @@ running commands, are terminated (SIGTERM). unrelated to the exit code of the remotely issued command. If a remote shell encounters an error, execution of the remote command on that target is bypassed. - + The \ **xdsh**\ command exit code is \ **0**\ if the command executed without errors and all remote shell commands finished with exit codes of \ **0**\ . If internal \ **xdsh**\ errors occur or the remote shell commands do not @@ -445,101 +445,101 @@ running commands, are terminated (SIGTERM). an unsuccessful remote command execution. If the remotely issued command is run in the background, the exit code of the remotely issued command is \ **0**\ . - + ************************************* -\ **Environment**\ \ **Variables**\ +\ **Environment**\ \ **Variables**\ ************************************* -\ **DEVICETYPE**\ - +\ **DEVICETYPE**\ + Specify a user-defined device type. See \ **-**\ **-devicetype**\ flag. - -\ **DSH_ENVIRONMENT**\ - + +\ **DSH_ENVIRONMENT**\ + Specifies a file that contains environment variable definitions to export to the target before executing the remote command. This variable is overridden by the \ **-E**\ flag. - -\ **DSH_FANOUT**\ - + +\ **DSH_FANOUT**\ + Specifies the fanout value. This variable is overridden by the \ **-f**\ flag. - -\ **DSH_NODE_OPTS**\ - + +\ **DSH_NODE_OPTS**\ + Specifies the options to use for the remote shell command with node targets only. This variable is overridden by the \ **-o**\ flag. - -\ **DSH_NODE_RCP**\ - + +\ **DSH_NODE_RCP**\ + Specifies the full path of the remote copy command to use to copy local scripts and local environment configuration files to node targets. - -\ **DSH_NODE_RSH**\ - + +\ **DSH_NODE_RSH**\ + Specifies the full path of the remote shell to use for remote command execution on node targets. This variable is overridden by the \ **-r**\ flag. - -\ **DSH_PATH**\ - + +\ **DSH_PATH**\ + Sets the command path to use on the targets. If \ **DSH_PATH**\ is not set, the default path defined in the profile of the remote \ *user_ID*\ is used. - -\ **DSH_REMOTE_PASSWORD**\ - + +\ **DSH_REMOTE_PASSWORD**\ + If \ **DSH_REMOTE_PASSWORD**\ is set to the password of the userid (usually root) that will ssh to the node, then when you use the \ **-K**\ flag, you will not be prompted for a password. - -\ **DSH_SYNTAX**\ - + +\ **DSH_SYNTAX**\ + Specifies the shell syntax to use on remote targets; \ **ksh**\ or \ **csh**\ . If not specified, the \ **ksh**\ syntax is assumed. This variable is overridden by the \ **-S**\ flag. - -\ **DSH_TIMEOUT**\ - + +\ **DSH_TIMEOUT**\ + Specifies the time, in seconds, to wait for output from each remote target. This variable is overridden by the \ **-t**\ flag. - -\ **DSH_VERIFY**\ - + +\ **DSH_VERIFY**\ + Verifies each target before executing any remote commands on the target. If a target is not responding, execution of remote commands for the target is canceled. This variable is overridden by the \ **-v**\ flag. - + ********************************** -\ **Compatibility with AIX dsh**\ +\ **Compatibility with AIX dsh**\ ********************************** @@ -550,7 +550,7 @@ xCAT database that can be used by \ **dsh**\ . See \ **man groupfiles4dsh**\ . **************** -\ **SECURITY**\ +\ **SECURITY**\ **************** @@ -568,7 +568,7 @@ userdefined. ******************* -\ **EXIT STATUS**\ +\ **EXIT STATUS**\ ******************* @@ -576,178 +576,178 @@ The \ **xdsh**\ command exit code is 0 if the command executed without errors a **************** -\ **EXAMPLES**\ +\ **EXAMPLES**\ **************** 1. To set up the SSH keys for root on node1, run as root: - - + + .. code-block:: perl - + xdsh node1 -K - - + + 2. To run the \ **ps -ef**\ command on node targets \ **node1**\ and \ **node2**\ , enter: - - + + .. code-block:: perl - + xdsh node1,node2 "ps -ef" - - + + 3. To run the \ **ps**\ command on node targets \ **node1**\ and run the remote command with the -v and -t flag, enter: - - + + .. code-block:: perl - + xdsh node1,node2 -o "-v -t" ps - - -4. To execute the commands contained in \ **myfile**\ in the \ **XCAT**\ + + +4. To execute the commands contained in \ **myfile**\ in the \ **XCAT**\ context on several node targets, with a fanout of \ **1**\ , enter: - - + + .. code-block:: perl - + xdsh node1,node2 -f 1 -e myfile - - + + 5. To run the ps command on node1 and ignore all the dsh environment variable except the DSH_NODE_OPTS, enter: - - + + .. code-block:: perl - + xdsh node1 -X `DSH_NODE_OPTS' ps - - -6. To run on Linux, the xdsh command "rpm -qa | grep xCAT" + + +6. To run on Linux, the xdsh command "rpm -qa | grep xCAT" on the service node fedora9 diskless image, enter: - - + + .. code-block:: perl - + xdsh -i /install/netboot/fedora9/x86_64/service/rootimg "rpm -qa | grep xCAT" - - + + 7. To run on AIX, the xdsh command "lslpp -l | grep bos" on the NIM 611dskls spot, enter: - - + + .. code-block:: perl - + xdsh -i 611dskls "/usr/bin/lslpp -l | grep bos" - - + + 8. To cleanup the servicenode directory that stages the copy of files to the nodes, enter: - - + + .. code-block:: perl - + xdsh servicenoderange -c - - + + 9. - - To define the QLogic IB switch as a node and to set up the SSH keys for IB switch + + To define the QLogic IB switch as a node and to set up the SSH keys for IB switch \ **qswitch**\ with device configuration file \ **/var/opt/xcat/IBSwitch/Qlogic/config**\ and user name \ **username**\ , enter - - + + .. code-block:: perl - + chdef -t node -o qswitch groups=all nodetype=switch - + xdsh qswitch -K -l username --devicetype IBSwitch::Qlogic - - + + 10. To define the Management Node in the database so you can use \ **xdsh**\ , enter - - + + .. code-block:: perl - + xcatconfig -m - - -11. To define the Mellanox switch as a node and run a command to show the ssh keys. + + +11. To define the Mellanox switch as a node and run a command to show the ssh keys. \ **mswitch**\ with and user name \ **username**\ , enter - - + + .. code-block:: perl - + chdef -t node -o mswitch groups=all nodetype=switch - + xdsh mswitch -l admin --devicetype IBSwitch::Mellanox 'enable;configure terminal;show ssh server host-keys' - - + + 12. - + To define a BNT Ethernet switch as a node and run a command to create a new vlan with vlan id 3 on the switch. - - + + .. code-block:: perl - + chdef myswitch groups=all - + tabch switch=myswitch switches.sshusername=admin switches.sshpassword=passw0rd switches.protocol=[ssh|telnet] - - + + where \ *admin*\ and \ *passw0rd*\ are the SSH user name and password for the switch. - + If it is for Telnet, add \ *tn:*\ in front of the user name: \ *tn:admin*\ . - - + + .. code-block:: perl - + dsh myswitch --devicetype EthSwitch::BNT 'enable;configure terminal;vlan 3;end;show vlan' - - + + 13. - + To run \ **xdsh**\ with the non-root userid "user1" that has been setup as an xCAT userid and with sudo on node1 and node2 to run as root, do the following, see xCAT doc on Granting_Users_xCAT_privileges: - - + + .. code-block:: perl - + xdsh node1,node2 --sudo -l user1 "cat /etc/passwd" - - + + ************* -\ **Files**\ +\ **Files**\ ************* **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From 299ec79e23aa3518838a28dda99bb17ece374362 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0401/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xdshbak.1.rst --- .../references/man1/xdshbak.1.rst | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xdshbak.1.rst b/docs/source/guides/admin-guides/references/man1/xdshbak.1.rst index aa9e3a74e..3ebac0d2d 100644 --- a/docs/source/guides/admin-guides/references/man1/xdshbak.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xdshbak.1.rst @@ -15,7 +15,7 @@ NAME **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** @@ -27,7 +27,7 @@ DESCRIPTION *********** -The \ **xdshbak**\ command formats output from the \ **xdsh**\ command. The \ **xdshbak**\ +The \ **xdshbak**\ command formats output from the \ **xdsh**\ command. The \ **xdshbak**\ command takes, as input, lines in the following format: @@ -73,7 +73,7 @@ When output is displayed from more than one node in collapsed form, the host names are displayed alphabetically. When output is not collapsed, output is displayed sorted alphabetically by host name. -If the \ **-q**\ quiet flag is not set then \ **xdshbak**\ +If the \ **-q**\ quiet flag is not set then \ **xdshbak**\ command writes "." for each 1000 lines of output processed (to show progress), since it won't display the output until it has processed all of it. @@ -112,87 +112,87 @@ OPTIONS -\ **-b**\ - +\ **-b**\ + Strip the host prefix from the beginning of the lines. This only works with the \ **-x**\ option. - -\ **-c**\ - + +\ **-c**\ + If the output from multiple nodes is identical it will be collapsed and displayed only once. - -\ **-x**\ - + +\ **-x**\ + Omit the extra header lines that xdshbak normally displays for each node. This provides more compact output, but xdshbak still sorts the output by node name for easier viewing. This option should not be used with \ **-c**\ . - -\ **-h**\ - + +\ **-h**\ + Displays usage information. - -\ **-q**\ - + +\ **-q**\ + Quiet mode, do not display "." for each 1000 lines of output. - + **************** -\ **EXAMPLES**\ +\ **EXAMPLES**\ **************** 1. To display the results of a command issued on several nodes, in the format used in the Description, enter: - - + + .. code-block:: perl - + xdsh node1,node2,node3 cat /etc/passwd | xdshbak - - + + 2. - + To display the results of a command issued on several nodes with identical output displayed only once, enter: - - + + .. code-block:: perl - + xdsh host1,host2,host3 pwd | xdshbak -c - - + + 3. To display the results of a command issued on several nodes with compact output and be sorted alphabetically by host name, enter: - - + + .. code-block:: perl - + xdsh host1,host2,host3 date | xdshbak -x - - + + **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From f5b7bd16aac93a1752f86a246631ffa3ce866fae Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0402/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst --- .../references/man1/xdshcoll.1.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst b/docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst index 0e1b13487..d70cfe2a8 100644 --- a/docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst @@ -7,7 +7,7 @@ xdshcoll.1 ************ -\ **NAME**\ +\ **NAME**\ ************ @@ -15,19 +15,19 @@ xdshcoll.1 **************** -\ **SYNOPSIS**\ +\ **SYNOPSIS**\ **************** -\ **xdshcoll**\ +\ **xdshcoll**\ ******************* -\ **DESCRIPTION**\ +\ **DESCRIPTION**\ ******************* -The \ **xdshcoll**\ command formats and consolidates output from the \ **xdsh,sinv**\ command. The \ **xdshcoll**\ +The \ **xdshcoll**\ command formats and consolidates output from the \ **xdsh,sinv**\ command. The \ **xdshcoll**\ command takes, as input, lines in the following format: host_name: line of output from remote command @@ -47,7 +47,7 @@ is identical: lines from xdsh for node1 with hostnames stripped off . . - + ==================================== node2 ==================================== @@ -56,7 +56,7 @@ is identical: lines from xdsh for node2 with hostnames stripped off . . - + ==================================== node3, node4 ==================================== @@ -69,25 +69,25 @@ is identical: **************** -\ **EXAMPLES**\ +\ **EXAMPLES**\ **************** 1. To display the results of a command issued on several nodes, in the format used in the Description, enter: - - + + .. code-block:: perl - + xdsh node1,node2,node3 cat /etc/passwd> | B Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0403/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man3/noderange.3.rst --- .../references/man3/noderange.3.rst | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man3/noderange.3.rst b/docs/source/guides/admin-guides/references/man3/noderange.3.rst index e2a2180ce..4e2a1b268 100644 --- a/docs/source/guides/admin-guides/references/man3/noderange.3.rst +++ b/docs/source/guides/admin-guides/references/man3/noderange.3.rst @@ -15,43 +15,43 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** -\ *Examples:*\ +\ *Examples:*\ .. code-block:: perl node1,node2,node8,node20,group1 - + node14-node56,node70-node203,group1-group10 - + node1,node2,node8,node20,node14-node56,node70-node203 - + node[14-56] - + f[1-3]n[1-20] - + all,-node129-node256,-frame01-frame03 - + /node.* - + ^/tmp/nodes - + node10+5 - + 10-15,-13 - + group1@group2 - + table.attributevalue ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -180,7 +180,7 @@ no group range match will be attempted. All node and group names are validated against the nodelist table. Invalid names are ignored and return nothing. -\ **xCAT Node Name Format**\ +\ **xCAT Node Name Format**\ ============================= @@ -237,134 +237,134 @@ Example of \ **xCAT Node Name Format**\ node/group names: **************** -\ **Examples**\ +\ **Examples**\ **************** 1. - + Generates a list of all nodes (assuming all is a group) listed in the \ **nodelist**\ table less node5 through node10: - - + + .. code-block:: perl - + all,-node5-node10 - - + + 2. - + Generates a list of nodes 1 through 10 less nodes 3,4,5. Note that node4 is listed twice, first in the range and then at the end. Because exclusion has precedence node4 will be excluded. - - + + .. code-block:: perl - + node1-node10,-node3-node5,node4 - - + + 3. - + Generates a list of nodes 1 through 10 less nodes 3 and 5. - - + + .. code-block:: perl - + node1-node10,-node3,-node5 - - + + 4. - + Generates a list of all (assuming \`all' is a group) nodes in the \ **nodelist**\ table less 17 through 32. - - + + .. code-block:: perl - + -node17-node32,all - - + + 5. - + Generates a list of nodes 1 through 128, and user nodes 1 through 4. - - + + .. code-block:: perl - + node1-node128,user1-user4 - - + + 6. - + Generates a list of all nodes (assuming \`all' is a group), less nodes in groups rack1 through rack3 (assuming groups rack1, rack2, and rack3 are defined), less nodes 100 through 200, less nodes in the storage group. Note that node150 is listed but is excluded. - - + + .. code-block:: perl - + all,-rack1-rack3,-node100-node200,node150,-storage - - + + 7. - + Generates a list of nodes matching the regex \ *node[23].\\**\ . That is all nodes that start with node2 or node3 and end in anything or nothing. E.g. node2, node3, node20, node30, node21234 all match. - - + + .. code-block:: perl - + /node[23].* - - + + 8. - - Generates a list of nodes which have the value hmc in the nodehm.cons + + Generates a list of nodes which have the value hmc in the nodehm.cons attribute. - - + + .. code-block:: perl - + nodehm.cons==hmc - + nodehm.cons=~hmc - - + + 9. - + Generate a list of nodes in the 1st two frames: - - + + .. code-block:: perl - + f[1-2]n[1-42] - - + + ************ -\ **Bugs**\ +\ **Bugs**\ ************ @@ -374,7 +374,7 @@ and \`~' may have to be escaped from the shell. **************** -\ **SEE ALSO**\ +\ **SEE ALSO**\ **************** From 6ed1c9e8f7b3f6eff2dcb65c475bb47f7c4e1b01 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0404/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/auditlog.5.rst --- .../references/man5/auditlog.5.rst | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/auditlog.5.rst b/docs/source/guides/admin-guides/references/man5/auditlog.5.rst index a89b681aa..b16ed7ad6 100644 --- a/docs/source/guides/admin-guides/references/man5/auditlog.5.rst +++ b/docs/source/guides/admin-guides/references/man5/auditlog.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **auditlog Attributes:**\ \ *recid*\ , \ *audittime*\ , \ *userid*\ , \ *clientname*\ , \ *clienttype*\ , \ *command*\ , \ *noderange*\ , \ *args*\ , \ *status*\ , \ *comments*\ , \ *disable*\ +\ **auditlog Attributes:**\ \ *recid*\ , \ *audittime*\ , \ *userid*\ , \ *clientname*\ , \ *clienttype*\ , \ *command*\ , \ *noderange*\ , \ *args*\ , \ *status*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,70 +36,70 @@ auditlog Attributes: -\ **recid**\ - +\ **recid**\ + The record id. - -\ **audittime**\ - + +\ **audittime**\ + The timestamp for the audit entry. - -\ **userid**\ - + +\ **userid**\ + The user running the command. - -\ **clientname**\ - + +\ **clientname**\ + The client machine, where the command originated. - -\ **clienttype**\ - + +\ **clienttype**\ + Type of command: cli, java, webui, other. - -\ **command**\ - + +\ **command**\ + Command executed. See auditskipcmds site table attribute to control which commands get logged. - -\ **noderange**\ - + +\ **noderange**\ + The noderange on which the command was run. - -\ **args**\ - + +\ **args**\ + The command argument list. - -\ **status**\ - + +\ **status**\ + Allowed or Denied. - -\ **comments**\ - + +\ **comments**\ + Any user-provided notes. - -\ **disable**\ - + +\ **disable**\ + Do not use. tabprune will not work if set to yes or 1 - + @@ -108,5 +108,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 716e9b605b7cb59d9f2c933f40f80ba13d8264f7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0405/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/bootparams.5.rst --- .../references/man5/bootparams.5.rst | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/bootparams.5.rst b/docs/source/guides/admin-guides/references/man5/bootparams.5.rst index 13f261616..f984191a8 100644 --- a/docs/source/guides/admin-guides/references/man5/bootparams.5.rst +++ b/docs/source/guides/admin-guides/references/man5/bootparams.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **bootparams Attributes:**\ \ *node*\ , \ *kernel*\ , \ *initrd*\ , \ *kcmdline*\ , \ *addkcmdline*\ , \ *dhcpstatements*\ , \ *adddhcpstatements*\ , \ *comments*\ , \ *disable*\ +\ **bootparams Attributes:**\ \ *node*\ , \ *kernel*\ , \ *initrd*\ , \ *kcmdline*\ , \ *addkcmdline*\ , \ *dhcpstatements*\ , \ *adddhcpstatements*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,58 +36,58 @@ bootparams Attributes: -\ **node**\ - +\ **node**\ + The node or group name - -\ **kernel**\ - + +\ **kernel**\ + The kernel that network boot actions should currently acquire and use. Note this could be a chained boot loader such as memdisk or a non-linux boot loader - -\ **initrd**\ - + +\ **initrd**\ + The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel) - -\ **kcmdline**\ - + +\ **kcmdline**\ + Arguments to be passed to the kernel - -\ **addkcmdline**\ - + +\ **addkcmdline**\ + User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ") - -\ **dhcpstatements**\ - + +\ **dhcpstatements**\ + xCAT manipulated custom dhcp statements (not intended for user manipulation) - -\ **adddhcpstatements**\ - + +\ **adddhcpstatements**\ + Custom dhcp statements for administrator use (not implemneted yet) - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -96,5 +96,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 1d4a54fd5d2f3afdafc3a5ae81afa2742994f323 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0406/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/boottarget.5.rst --- .../references/man5/boottarget.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/boottarget.5.rst b/docs/source/guides/admin-guides/references/man5/boottarget.5.rst index ff34f5b4a..b93468c43 100644 --- a/docs/source/guides/admin-guides/references/man5/boottarget.5.rst +++ b/docs/source/guides/admin-guides/references/man5/boottarget.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **boottarget Attributes:**\ \ *bprofile*\ , \ *kernel*\ , \ *initrd*\ , \ *kcmdline*\ , \ *comments*\ , \ *disable*\ +\ **boottarget Attributes:**\ \ *bprofile*\ , \ *kernel*\ , \ *initrd*\ , \ *kcmdline*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ boottarget Attributes: -\ **bprofile**\ - +\ **bprofile**\ + All nodes with a nodetype.profile value equal to this value and nodetype.os set to "boottarget", will use the associated kernel, initrd, and kcmdline. - -\ **kernel**\ - + +\ **kernel**\ + The kernel that network boot actions should currently acquire and use. Note this could be a chained boot loader such as memdisk or a non-linux boot loader - -\ **initrd**\ - + +\ **initrd**\ + The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel) - -\ **kcmdline**\ - + +\ **kcmdline**\ + Arguments to be passed to the kernel - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 2223a51fa106045e7ae90b2c8ebf4436ae113de6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0407/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst --- .../admin-guides/references/man5/cfgmgt.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst b/docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst index 58d9c3f7a..b659a1ac4 100644 --- a/docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst +++ b/docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **cfgmgt Attributes:**\ \ *node*\ , \ *cfgmgr*\ , \ *cfgserver*\ , \ *roles*\ , \ *comments*\ , \ *disable*\ +\ **cfgmgt Attributes:**\ \ *node*\ , \ *cfgmgr*\ , \ *cfgserver*\ , \ *roles*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ cfgmgt Attributes: -\ **node**\ - +\ **node**\ + The node being managed by the cfgmgr service - -\ **cfgmgr**\ - + +\ **cfgmgr**\ + The name of the configuration manager service. Currently 'chef' and 'puppet' are supported services. - -\ **cfgserver**\ - + +\ **cfgserver**\ + The xCAT node name of the chef server or puppet master - -\ **roles**\ - + +\ **roles**\ + The roles associated with this node as recognized by the cfgmgr for the software that is to be installed and configured. These role names map to chef recipes or puppet manifest classes that should be used for this node. For example, chef OpenStack cookbooks have roles such as mysql-master,keystone, glance, nova-controller, nova-conductor, cinder-all. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From e11d442f38430e75853dd06d039511bb340a8c37 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0408/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/chain.5.rst --- .../admin-guides/references/man5/chain.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/chain.5.rst b/docs/source/guides/admin-guides/references/man5/chain.5.rst index 37ac50f22..dd2e5b869 100644 --- a/docs/source/guides/admin-guides/references/man5/chain.5.rst +++ b/docs/source/guides/admin-guides/references/man5/chain.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **chain Attributes:**\ \ *node*\ , \ *currstate*\ , \ *currchain*\ , \ *chain*\ , \ *ondiscover*\ , \ *comments*\ , \ *disable*\ +\ **chain Attributes:**\ \ *node*\ , \ *currstate*\ , \ *currchain*\ , \ *chain*\ , \ *ondiscover*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ chain Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **currstate**\ - + +\ **currstate**\ + The current or next chain step to be executed on this node by xCAT-genesis. Set by xCAT during node discovery or as a result of nodeset. - -\ **currchain**\ - + +\ **currchain**\ + The chain steps still left to do for this node. This attribute will be automatically adjusted by xCAT while xCAT-genesis is running on the node (either during node discovery or a special operation like firmware update). During node discovery, this attribute is initialized from the chain attribute and updated as the chain steps are executed. - -\ **chain**\ - + +\ **chain**\ + A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.) The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell. - -\ **ondiscover**\ - + +\ **ondiscover**\ + This attribute is currently not used by xCAT. The "nodediscover" operation is always done during node discovery. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 50a126d624daa92519d79cb86e7b6777e7719a5f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0409/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/deps.5.rst --- .../admin-guides/references/man5/deps.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/deps.5.rst b/docs/source/guides/admin-guides/references/man5/deps.5.rst index 1da97c43c..7058824d6 100644 --- a/docs/source/guides/admin-guides/references/man5/deps.5.rst +++ b/docs/source/guides/admin-guides/references/man5/deps.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **deps Attributes:**\ \ *node*\ , \ *nodedep*\ , \ *msdelay*\ , \ *cmd*\ , \ *comments*\ , \ *disable*\ +\ **deps Attributes:**\ \ *node*\ , \ *nodedep*\ , \ *msdelay*\ , \ *cmd*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ deps Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **nodedep**\ - + +\ **nodedep**\ + Comma-separated list of nodes or node groups it is dependent on. - -\ **msdelay**\ - + +\ **msdelay**\ + How long to wait between operating on the dependent nodes and the primary nodes. - -\ **cmd**\ - + +\ **cmd**\ + Comma-separated list of which operation this dependency applies to. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 29839be16f99025b59863d246482be7c916d576d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0410/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/discoverydata.5.rst --- .../references/man5/discoverydata.5.rst | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/discoverydata.5.rst b/docs/source/guides/admin-guides/references/man5/discoverydata.5.rst index b187e5b5f..014c3c685 100644 --- a/docs/source/guides/admin-guides/references/man5/discoverydata.5.rst +++ b/docs/source/guides/admin-guides/references/man5/discoverydata.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **discoverydata Attributes:**\ \ *uuid*\ , \ *node*\ , \ *method*\ , \ *discoverytime*\ , \ *arch*\ , \ *cpucount*\ , \ *cputype*\ , \ *memory*\ , \ *mtm*\ , \ *serial*\ , \ *nicdriver*\ , \ *nicipv4*\ , \ *nichwaddr*\ , \ *nicpci*\ , \ *nicloc*\ , \ *niconboard*\ , \ *nicfirm*\ , \ *switchname*\ , \ *switchaddr*\ , \ *switchdesc*\ , \ *switchport*\ , \ *otherdata*\ , \ *comments*\ , \ *disable*\ +\ **discoverydata Attributes:**\ \ *uuid*\ , \ *node*\ , \ *method*\ , \ *discoverytime*\ , \ *arch*\ , \ *cpucount*\ , \ *cputype*\ , \ *memory*\ , \ *mtm*\ , \ *serial*\ , \ *nicdriver*\ , \ *nicipv4*\ , \ *nichwaddr*\ , \ *nicpci*\ , \ *nicloc*\ , \ *niconboard*\ , \ *nicfirm*\ , \ *switchname*\ , \ *switchaddr*\ , \ *switchdesc*\ , \ *switchport*\ , \ *otherdata*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,148 +36,148 @@ discoverydata Attributes: -\ **uuid**\ - +\ **uuid**\ + The uuid of the node which send out the discovery request. - -\ **node**\ - + +\ **node**\ + The node name which assigned to the discovered node. - -\ **method**\ - + +\ **method**\ + The method which handled the discovery request. The method could be one of: switch, blade, profile, sequential. - -\ **discoverytime**\ - + +\ **discoverytime**\ + The last time that xCAT received the discovery message. - -\ **arch**\ - + +\ **arch**\ + The architecture of the discovered node. e.g. x86_64. - -\ **cpucount**\ - + +\ **cpucount**\ + The number of cores multiply by threads core supported for the discovered node. e.g. 192. - -\ **cputype**\ - + +\ **cputype**\ + The cpu type of the discovered node. e.g. Intel(R) Xeon(R) CPU E5-2690 0 @ 2.90GHz - -\ **memory**\ - + +\ **memory**\ + The memory size of the discovered node. e.g. 198460852 - -\ **mtm**\ - + +\ **mtm**\ + The machine type model of the discovered node. e.g. 786310X - -\ **serial**\ - + +\ **serial**\ + The serial number of the discovered node. e.g. 1052EFB - -\ **nicdriver**\ - + +\ **nicdriver**\ + The driver of the nic. The value should be comma separated . e.g. eth0!be2net,eth1!be2net - -\ **nicipv4**\ - + +\ **nicipv4**\ + The ipv4 address of the nic. The value should be comma separated . e.g. eth0!10.0.0.212/8 - -\ **nichwaddr**\ - + +\ **nichwaddr**\ + The hardware address of the nic. The should will be comma separated . e.g. eth0!34:40:B5:BE:DB:B0,eth1!34:40:B5:BE:DB:B4 - -\ **nicpci**\ - + +\ **nicpci**\ + The pic device of the nic. The value should be comma separated . e.g. eth0!0000:0c:00.0,eth1!0000:0c:00.1 - -\ **nicloc**\ - + +\ **nicloc**\ + The location of the nic. The value should be comma separated . e.g. eth0!Onboard Ethernet 1,eth1!Onboard Ethernet 2 - -\ **niconboard**\ - + +\ **niconboard**\ + The onboard info of the nic. The value should be comma separated . e.g. eth0!1,eth1!2 - -\ **nicfirm**\ - + +\ **nicfirm**\ + The firmware description of the nic. The value should be comma separated . e.g. eth0!ServerEngines BE3 Controller,eth1!ServerEngines BE3 Controller - -\ **switchname**\ - + +\ **switchname**\ + The switch name which the nic connected to. The value should be comma separated . e.g. eth0!c909f06sw01 - -\ **switchaddr**\ - + +\ **switchaddr**\ + The address of the switch which the nic connected to. The value should be comma separated . e.g. eth0!192.168.70.120 - -\ **switchdesc**\ - + +\ **switchdesc**\ + The description of the switch which the nic connected to. The value should be comma separated . e.g. eth0!IBM Flex System Fabric EN4093 10Gb Scalable Switch, flash image: version 7.2.6, boot image: version 7.2.6 - -\ **switchport**\ - + +\ **switchport**\ + The port of the switch that the nic connected to. The value should be comma separated . e.g. eth0!INTA2 - -\ **otherdata**\ - + +\ **otherdata**\ + The left data which is not parsed to specific attributes (The complete message comes from genesis) - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -186,5 +186,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 65d7a3d1d053f545b7372c68f8d1ebfc3c93c277 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0411/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/domain.5.rst --- .../admin-guides/references/man5/domain.5.rst | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/domain.5.rst b/docs/source/guides/admin-guides/references/man5/domain.5.rst index 73cc78ebb..724d6d4da 100644 --- a/docs/source/guides/admin-guides/references/man5/domain.5.rst +++ b/docs/source/guides/admin-guides/references/man5/domain.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **domain Attributes:**\ \ *node*\ , \ *ou*\ , \ *authdomain*\ , \ *adminuser*\ , \ *adminpassword*\ , \ *type*\ , \ *comments*\ , \ *disable*\ +\ **domain Attributes:**\ \ *node*\ , \ *ou*\ , \ *authdomain*\ , \ *adminuser*\ , \ *adminpassword*\ , \ *type*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,52 +36,52 @@ domain Attributes: -\ **node**\ - +\ **node**\ + The node or group the entry applies to - -\ **ou**\ - + +\ **ou**\ + For an LDAP described machine account (i.e. Active Directory), the organizational unit to place the system. If not set, defaults to cn=Computers,dc=your,dc=domain - -\ **authdomain**\ - + +\ **authdomain**\ + If a node should participate in an AD domain or Kerberos realm distinct from domain indicated in site, this field can be used to specify that - -\ **adminuser**\ - + +\ **adminuser**\ + Allow a node specific indication of Administrative user. Most will want to just use passwd table to indicate this once rather than by node. - -\ **adminpassword**\ - + +\ **adminpassword**\ + Allow a node specific indication of Administrative user password for the domain. Most will want to ignore this in favor of passwd table. - -\ **type**\ - + +\ **type**\ + Type, if any, of authentication domain to manipulate. The only recognized value at the moment is activedirectory. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -90,5 +90,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From b3c7eedc2e78932b15791f5eaaa48e245a20e896 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0412/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/eventlog.5.rst --- .../references/man5/eventlog.5.rst | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/eventlog.5.rst b/docs/source/guides/admin-guides/references/man5/eventlog.5.rst index f75afb9de..bc82fc48e 100644 --- a/docs/source/guides/admin-guides/references/man5/eventlog.5.rst +++ b/docs/source/guides/admin-guides/references/man5/eventlog.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **eventlog Attributes:**\ \ *recid*\ , \ *eventtime*\ , \ *eventtype*\ , \ *monitor*\ , \ *monnode*\ , \ *node*\ , \ *application*\ , \ *component*\ , \ *id*\ , \ *severity*\ , \ *message*\ , \ *rawdata*\ , \ *comments*\ , \ *disable*\ +\ **eventlog Attributes:**\ \ *recid*\ , \ *eventtime*\ , \ *eventtype*\ , \ *monitor*\ , \ *monnode*\ , \ *node*\ , \ *application*\ , \ *component*\ , \ *id*\ , \ *severity*\ , \ *message*\ , \ *rawdata*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,88 +36,88 @@ eventlog Attributes: -\ **recid**\ - +\ **recid**\ + The record id. - -\ **eventtime**\ - + +\ **eventtime**\ + The timestamp for the event. - -\ **eventtype**\ - + +\ **eventtype**\ + The type of the event. - -\ **monitor**\ - + +\ **monitor**\ + The name of the monitor that monitors this event. - -\ **monnode**\ - + +\ **monnode**\ + The node that monitors this event. - -\ **node**\ - + +\ **node**\ + The node where the event occurred. - -\ **application**\ - + +\ **application**\ + The application that reports the event. - -\ **component**\ - + +\ **component**\ + The component where the event occurred. - -\ **id**\ - + +\ **id**\ + The location or the resource name where the event occurred. - -\ **severity**\ - + +\ **severity**\ + The severity of the event. Valid values are: informational, warning, critical. - -\ **message**\ - + +\ **message**\ + The full description of the event. - -\ **rawdata**\ - + +\ **rawdata**\ + The data that associated with the event. - -\ **comments**\ - + +\ **comments**\ + Any user-provided notes. - -\ **disable**\ - + +\ **disable**\ + Do not use. tabprune will not work if set to yes or 1 - + @@ -126,5 +126,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 2d2396d4afc2314beb160d58faaa192425158dd6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0413/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/firmware.5.rst --- .../references/man5/firmware.5.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/firmware.5.rst b/docs/source/guides/admin-guides/references/man5/firmware.5.rst index 3b41f261f..358c49dc0 100644 --- a/docs/source/guides/admin-guides/references/man5/firmware.5.rst +++ b/docs/source/guides/admin-guides/references/man5/firmware.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **firmware Attributes:**\ \ *node*\ , \ *cfgfile*\ , \ *comments*\ , \ *disable*\ +\ **firmware Attributes:**\ \ *node*\ , \ *cfgfile*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,28 +36,28 @@ firmware Attributes: -\ **node**\ - +\ **node**\ + The node id. - -\ **cfgfile**\ - + +\ **cfgfile**\ + The file to use. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -66,5 +66,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From cca2b68b97cf15e7839413864fcf6222b15e8f1b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0414/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/hosts.5.rst --- .../admin-guides/references/man5/hosts.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/hosts.5.rst b/docs/source/guides/admin-guides/references/man5/hosts.5.rst index 2771c52d9..d18fbd6da 100644 --- a/docs/source/guides/admin-guides/references/man5/hosts.5.rst +++ b/docs/source/guides/admin-guides/references/man5/hosts.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **hosts Attributes:**\ \ *node*\ , \ *ip*\ , \ *hostnames*\ , \ *otherinterfaces*\ , \ *comments*\ , \ *disable*\ +\ **hosts Attributes:**\ \ *node*\ , \ *ip*\ , \ *hostnames*\ , \ *otherinterfaces*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ hosts Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **ip**\ - + +\ **ip**\ + The IP address of the node. This is only used in makehosts. The rest of xCAT uses system name resolution to resolve node names to IP addresses. - -\ **hostnames**\ - + +\ **hostnames**\ + Hostname aliases added to /etc/hosts for this node. Comma or blank separated list. - -\ **otherinterfaces**\ - + +\ **otherinterfaces**\ + Other IP addresses to add for this node. Format: -:,:,... - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 8212e26495f5f5dfd8b8831e9318a52b70b16083 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0415/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/hwinv.5.rst --- .../admin-guides/references/man5/hwinv.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/hwinv.5.rst b/docs/source/guides/admin-guides/references/man5/hwinv.5.rst index 626fee9c2..b74b094d9 100644 --- a/docs/source/guides/admin-guides/references/man5/hwinv.5.rst +++ b/docs/source/guides/admin-guides/references/man5/hwinv.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **hwinv Attributes:**\ \ *node*\ , \ *cputype*\ , \ *cpucount*\ , \ *memory*\ , \ *disksize*\ , \ *comments*\ , \ *disable*\ +\ **hwinv Attributes:**\ \ *node*\ , \ *cputype*\ , \ *cpucount*\ , \ *memory*\ , \ *disksize*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ hwinv Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **cputype**\ - + +\ **cputype**\ + The cpu model name for the node. - -\ **cpucount**\ - + +\ **cpucount**\ + The number of cpus for the node. - -\ **memory**\ - + +\ **memory**\ + The size of the memory for the node in MB. - -\ **disksize**\ - + +\ **disksize**\ + The size of the disks for the node in GB. - -\ **comments**\ - + +\ **comments**\ + Any user-provided notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 7e0bc91ae230ebd2b6e8f608b88e3734ef456755 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0416/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/hypervisor.5.rst --- .../references/man5/hypervisor.5.rst | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/hypervisor.5.rst b/docs/source/guides/admin-guides/references/man5/hypervisor.5.rst index c3f9e3a4c..2c9886af6 100644 --- a/docs/source/guides/admin-guides/references/man5/hypervisor.5.rst +++ b/docs/source/guides/admin-guides/references/man5/hypervisor.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **hypervisor Attributes:**\ \ *node*\ , \ *type*\ , \ *mgr*\ , \ *interface*\ , \ *netmap*\ , \ *defaultnet*\ , \ *cluster*\ , \ *datacenter*\ , \ *preferdirect*\ , \ *comments*\ , \ *disable*\ +\ **hypervisor Attributes:**\ \ *node*\ , \ *type*\ , \ *mgr*\ , \ *interface*\ , \ *netmap*\ , \ *defaultnet*\ , \ *cluster*\ , \ *datacenter*\ , \ *preferdirect*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,65 +36,65 @@ hypervisor Attributes: -\ **node**\ - +\ **node**\ + The node or static group name - -\ **type**\ - + +\ **type**\ + The plugin associated with hypervisor specific commands such as revacuate - -\ **mgr**\ - + +\ **mgr**\ + The virtualization specific manager of this hypervisor when applicable - -\ **interface**\ - + +\ **interface**\ + The definition of interfaces for the hypervisor. The format is [networkname:interfacename:bootprotocol:IP:netmask:gateway] that split with | for each interface - -\ **netmap**\ - + +\ **netmap**\ + Optional mapping of useful names to relevant physical ports. For example, 10ge=vmnic_16.0&vmnic_16.1,ge=vmnic1 would be requesting two virtual switches to be created, one called 10ge with vmnic_16.0 and vmnic_16.1 bonded, and another simply connected to vmnic1. Use of this allows abstracting guests from network differences amongst hypervisors - -\ **defaultnet**\ - + +\ **defaultnet**\ + Optionally specify a default network entity for guests to join to if they do not specify. - -\ **cluster**\ - + +\ **cluster**\ + Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor. - -\ **datacenter**\ - + +\ **datacenter**\ + Optionally specify a datacenter for the hypervisor to exist in (only applicable to VMWare) - -\ **preferdirect**\ - + +\ **preferdirect**\ + If a mgr is declared for a hypervisor, xCAT will default to using the mgr for all operations. If this is field is set to yes or 1, xCAT will prefer to directly communicate with the hypervisor if possible - - - -\ **comments**\ -\ **disable**\ +\ **comments**\ + + + +\ **disable**\ @@ -104,5 +104,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 4f42952758c69658b1d7ad24d233a224870d8f56 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0417/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/ipmi.5.rst --- .../admin-guides/references/man5/ipmi.5.rst | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/ipmi.5.rst b/docs/source/guides/admin-guides/references/man5/ipmi.5.rst index 1912e186c..0d45e562d 100644 --- a/docs/source/guides/admin-guides/references/man5/ipmi.5.rst +++ b/docs/source/guides/admin-guides/references/man5/ipmi.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **ipmi Attributes:**\ \ *node*\ , \ *bmc*\ , \ *bmcport*\ , \ *taggedvlan*\ , \ *bmcid*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ +\ **ipmi Attributes:**\ \ *node*\ , \ *bmc*\ , \ *bmcport*\ , \ *taggedvlan*\ , \ *bmcid*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,98 +36,98 @@ ipmi Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **bmc**\ - + +\ **bmc**\ + The hostname of the BMC adapter. - -\ **bmcport**\ - + +\ **bmcport**\ + In systems with selectable shared/dedicated ethernet ports, this parameter can be used to specify the preferred port. 0 means use the shared port, 1 means dedicated, blank is to not assign. - - + + .. code-block:: perl - + The following special cases exist for IBM System x servers: - + For x3755 M3 systems, 0 means use the dedicated port, 1 means shared, blank is to not assign. - + For certain systems which have a mezzaine or ML2 adapter, there is a second value to include: - - + + For x3750 M4 (Model 8722): - - + + 0 2 1st 1Gbps interface for LOM - + 0 0 1st 10Gbps interface for LOM - + 0 3 2nd 1Gbps interface for LOM - + 0 1 2nd 10Gbps interface for LOM - - + + For x3750 M4 (Model 8752), x3850/3950 X6, dx360 M4, x3550 M4, and x3650 M4: - - + + 0 Shared (1st onboard interface) - + 1 Dedicated - + 2 0 First interface on ML2 or mezzanine adapter - + 2 1 Second interface on ML2 or mezzanine adapter - + 2 2 Third interface on ML2 or mezzanine adapter - + 2 3 Fourth interface on ML2 or mezzanine adapter - - -\ **taggedvlan**\ - + + +\ **taggedvlan**\ + bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified. - -\ **bmcid**\ - + +\ **bmcid**\ + Unique identified data used by discovery processes to distinguish known BMCs from unrecognized BMCs - -\ **username**\ - + +\ **username**\ + The BMC userid. If not specified, the key=ipmi row in the passwd table is used as the default. - -\ **password**\ - + +\ **password**\ + The BMC password. If not specified, the key=ipmi row in the passwd table is used as the default. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -136,5 +136,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 5f70a33eae6e0f3a3138d0a6541508b33f17ccac Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0418/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/iscsi.5.rst --- .../admin-guides/references/man5/iscsi.5.rst | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/iscsi.5.rst b/docs/source/guides/admin-guides/references/man5/iscsi.5.rst index 48a91d893..6371674ee 100644 --- a/docs/source/guides/admin-guides/references/man5/iscsi.5.rst +++ b/docs/source/guides/admin-guides/references/man5/iscsi.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **iscsi Attributes:**\ \ *node*\ , \ *server*\ , \ *target*\ , \ *lun*\ , \ *iname*\ , \ *file*\ , \ *userid*\ , \ *passwd*\ , \ *kernel*\ , \ *kcmdline*\ , \ *initrd*\ , \ *comments*\ , \ *disable*\ +\ **iscsi Attributes:**\ \ *node*\ , \ *server*\ , \ *target*\ , \ *lun*\ , \ *iname*\ , \ *file*\ , \ *userid*\ , \ *passwd*\ , \ *kernel*\ , \ *kcmdline*\ , \ *initrd*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,82 +36,82 @@ iscsi Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **server**\ - + +\ **server**\ + The server containing the iscsi boot device for this node. - -\ **target**\ - + +\ **target**\ + The iscsi disk used for the boot device for this node. Filled in by xCAT. - -\ **lun**\ - + +\ **lun**\ + LUN of boot device. Per RFC-4173, this is presumed to be 0 if unset. tgtd often requires this to be 1 - -\ **iname**\ - + +\ **iname**\ + Initiator name. Currently unused. - -\ **file**\ - + +\ **file**\ + The path on the server of the OS image the node should boot from. - -\ **userid**\ - + +\ **userid**\ + The userid of the iscsi server containing the boot device for this node. - -\ **passwd**\ - + +\ **passwd**\ + The password for the iscsi server containing the boot device for this node. - -\ **kernel**\ - + +\ **kernel**\ + The path of the linux kernel to boot from. - -\ **kcmdline**\ - + +\ **kcmdline**\ + The kernel command line to use with iSCSI for this node. - -\ **initrd**\ - + +\ **initrd**\ + The initial ramdisk to use when network booting this node. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -120,5 +120,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 399911b4eb5919bec165dab5a9dca1bcb157ee88 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0419/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/kit.5.rst --- .../admin-guides/references/man5/kit.5.rst | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/kit.5.rst b/docs/source/guides/admin-guides/references/man5/kit.5.rst index af76b1134..3ffd4f226 100644 --- a/docs/source/guides/admin-guides/references/man5/kit.5.rst +++ b/docs/source/guides/admin-guides/references/man5/kit.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **kit Attributes:**\ \ *kitname*\ , \ *basename*\ , \ *description*\ , \ *version*\ , \ *release*\ , \ *ostype*\ , \ *isinternal*\ , \ *kitdeployparams*\ , \ *kitdir*\ , \ *comments*\ , \ *disable*\ +\ **kit Attributes:**\ \ *kitname*\ , \ *basename*\ , \ *description*\ , \ *version*\ , \ *release*\ , \ *ostype*\ , \ *isinternal*\ , \ *kitdeployparams*\ , \ *kitdir*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,70 +36,70 @@ kit Attributes: -\ **kitname**\ - +\ **kitname**\ + The unique generated kit name, when kit is added to the cluster. - -\ **basename**\ - + +\ **basename**\ + The kit base name - -\ **description**\ - + +\ **description**\ + The Kit description. - -\ **version**\ - + +\ **version**\ + The kit version - -\ **release**\ - + +\ **release**\ + The kit release - -\ **ostype**\ - + +\ **ostype**\ + The kit OS type. Linux or AIX. - -\ **isinternal**\ - + +\ **isinternal**\ + A flag to indicated if the Kit is internally used. When set to 1, the Kit is internal. If 0 or undefined, the kit is not internal. - -\ **kitdeployparams**\ - + +\ **kitdeployparams**\ + The file containing the default deployment parameters for this Kit. These parameters are added to the OS Image definition.s list of deployment parameters when one or more Kit Components from this Kit are added to the OS Image. - -\ **kitdir**\ - + +\ **kitdir**\ + The path to Kit Installation directory on the Mgt Node. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -108,5 +108,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From edd7a333ac57fe133b5696a4874746e13ced42a3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0420/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst --- .../references/man5/kitcomponent.5.rst | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst b/docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst index ac48fa7a0..cd52254e8 100644 --- a/docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst +++ b/docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **kitcomponent Attributes:**\ \ *kitcompname*\ , \ *description*\ , \ *kitname*\ , \ *kitreponame*\ , \ *basename*\ , \ *version*\ , \ *release*\ , \ *serverroles*\ , \ *kitpkgdeps*\ , \ *prerequisite*\ , \ *driverpacks*\ , \ *kitcompdeps*\ , \ *postbootscripts*\ , \ *genimage_postinstall*\ , \ *exlist*\ , \ *comments*\ , \ *disable*\ +\ **kitcomponent Attributes:**\ \ *kitcompname*\ , \ *description*\ , \ *kitname*\ , \ *kitreponame*\ , \ *basename*\ , \ *version*\ , \ *release*\ , \ *serverroles*\ , \ *kitpkgdeps*\ , \ *prerequisite*\ , \ *driverpacks*\ , \ *kitcompdeps*\ , \ *postbootscripts*\ , \ *genimage_postinstall*\ , \ *exlist*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,106 +36,106 @@ kitcomponent Attributes: -\ **kitcompname**\ - +\ **kitcompname**\ + The unique Kit Component name. It is auto-generated when the parent Kit is added to the cluster. - -\ **description**\ - + +\ **description**\ + The Kit component description. - -\ **kitname**\ - + +\ **kitname**\ + The Kit name which this Kit Component belongs to. - -\ **kitreponame**\ - + +\ **kitreponame**\ + The Kit Package Repository name which this Kit Component belongs to. - -\ **basename**\ - + +\ **basename**\ + Kit Component basename. - -\ **version**\ - + +\ **version**\ + Kit Component version. - -\ **release**\ - + +\ **release**\ + Kit Component release. - -\ **serverroles**\ - + +\ **serverroles**\ + The types of servers that this Kit Component can install on. Valid types are: mgtnode, servicenode, compute - -\ **kitpkgdeps**\ - + +\ **kitpkgdeps**\ + Comma-separated list of packages that this kit component depends on. - -\ **prerequisite**\ - + +\ **prerequisite**\ + Prerequisite for this kit component, the prerequisite includes ospkgdeps,preinstall,preupgrade,preuninstall scripts - -\ **driverpacks**\ - + +\ **driverpacks**\ + Comma-separated List of driver package names. These must be full names like: pkg1-1.0-1.x86_64.rpm. - -\ **kitcompdeps**\ - + +\ **kitcompdeps**\ + Comma-separated list of kit components that this kit component depends on. - -\ **postbootscripts**\ - + +\ **postbootscripts**\ + Comma-separated list of postbootscripts that will run during the node boot. - -\ **genimage_postinstall**\ - + +\ **genimage_postinstall**\ + Comma-separated list of postinstall scripts that will run during the genimage. - -\ **exlist**\ - + +\ **exlist**\ + Exclude list file containing the files/directories to exclude when building a diskless image. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -144,5 +144,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From fbcd48781f8c1bbdb2f91091a1eacdac3beda16b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0421/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/kitrepo.5.rst --- .../references/man5/kitrepo.5.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/kitrepo.5.rst b/docs/source/guides/admin-guides/references/man5/kitrepo.5.rst index da260bccb..5a47317db 100644 --- a/docs/source/guides/admin-guides/references/man5/kitrepo.5.rst +++ b/docs/source/guides/admin-guides/references/man5/kitrepo.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **kitrepo Attributes:**\ \ *kitreponame*\ , \ *kitname*\ , \ *osbasename*\ , \ *osmajorversion*\ , \ *osminorversion*\ , \ *osarch*\ , \ *compat_osbasenames*\ , \ *kitrepodir*\ , \ *comments*\ , \ *disable*\ +\ **kitrepo Attributes:**\ \ *kitreponame*\ , \ *kitname*\ , \ *osbasename*\ , \ *osmajorversion*\ , \ *osminorversion*\ , \ *osarch*\ , \ *compat_osbasenames*\ , \ *kitrepodir*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,64 +36,64 @@ kitrepo Attributes: -\ **kitreponame**\ - +\ **kitreponame**\ + The unique generated kit repo package name, when kit is added to the cluster. - -\ **kitname**\ - + +\ **kitname**\ + The Kit name which this Kit Package Repository belongs to. - -\ **osbasename**\ - + +\ **osbasename**\ + The OS distro name which this repository is based on. - -\ **osmajorversion**\ - + +\ **osmajorversion**\ + The OS distro major version which this repository is based on. - -\ **osminorversion**\ - + +\ **osminorversion**\ + The OS distro minor version which this repository is based on. If this attribute is not set, it means that this repo applies to all minor versions. - -\ **osarch**\ - + +\ **osarch**\ + The OS distro arch which this repository is based on. - -\ **compat_osbasenames**\ - + +\ **compat_osbasenames**\ + List of compatible OS base names. - -\ **kitrepodir**\ - + +\ **kitrepodir**\ + The path to Kit Repository directory on the Mgt Node. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -102,5 +102,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 323b9f28aced960ac979dbf8399c75ea48942465 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0422/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst --- .../references/man5/kvm_masterdata.5.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst b/docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst index 7ac2d011a..d9a70a8c3 100644 --- a/docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst +++ b/docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **kvm_masterdata Attributes:**\ \ *name*\ , \ *xml*\ , \ *comments*\ , \ *disable*\ +\ **kvm_masterdata Attributes:**\ \ *name*\ , \ *xml*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,26 +36,26 @@ kvm_masterdata Attributes: -\ **name**\ - +\ **name**\ + The name of the relevant master - -\ **xml**\ - + +\ **xml**\ + The XML description to be customized for clones of this master - - - -\ **comments**\ -\ **disable**\ - +\ **comments**\ + + + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -64,5 +64,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From c03e7ffd3fd00652d6cba2c85854ac5b94b0b3cf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0423/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst --- .../references/man5/kvm_nodedata.5.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst b/docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst index c2286a413..b564c9979 100644 --- a/docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst +++ b/docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **kvm_nodedata Attributes:**\ \ *node*\ , \ *xml*\ , \ *comments*\ , \ *disable*\ +\ **kvm_nodedata Attributes:**\ \ *node*\ , \ *xml*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,28 +36,28 @@ kvm_nodedata Attributes: -\ **node**\ - +\ **node**\ + The node corresponding to the virtual machine - -\ **xml**\ - + +\ **xml**\ + The XML description generated by xCAT, fleshed out by libvirt, and stored for reuse - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -66,5 +66,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From a1b41a478ecb14c8217872fb20513cda89cec054 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0424/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/linuximage.5.rst --- .../references/man5/linuximage.5.rst | 156 +++++++++--------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/linuximage.5.rst b/docs/source/guides/admin-guides/references/man5/linuximage.5.rst index c39c9ff3d..f5c879187 100644 --- a/docs/source/guides/admin-guides/references/man5/linuximage.5.rst +++ b/docs/source/guides/admin-guides/references/man5/linuximage.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **linuximage Attributes:**\ \ *imagename*\ , \ *template*\ , \ *boottarget*\ , \ *addkcmdline*\ , \ *pkglist*\ , \ *pkgdir*\ , \ *otherpkglist*\ , \ *otherpkgdir*\ , \ *exlist*\ , \ *postinstall*\ , \ *rootimgdir*\ , \ *kerneldir*\ , \ *nodebootif*\ , \ *otherifce*\ , \ *netdrivers*\ , \ *kernelver*\ , \ *krpmver*\ , \ *permission*\ , \ *dump*\ , \ *crashkernelsize*\ , \ *partitionfile*\ , \ *driverupdatesrc*\ , \ *comments*\ , \ *disable*\ +\ **linuximage Attributes:**\ \ *imagename*\ , \ *template*\ , \ *boottarget*\ , \ *addkcmdline*\ , \ *pkglist*\ , \ *pkgdir*\ , \ *otherpkglist*\ , \ *otherpkgdir*\ , \ *exlist*\ , \ *postinstall*\ , \ *rootimgdir*\ , \ *kerneldir*\ , \ *nodebootif*\ , \ *otherifce*\ , \ *netdrivers*\ , \ *kernelver*\ , \ *krpmver*\ , \ *permission*\ , \ *dump*\ , \ *crashkernelsize*\ , \ *partitionfile*\ , \ *driverupdatesrc*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,67 +36,67 @@ linuximage Attributes: -\ **imagename**\ - +\ **imagename**\ + The name of this xCAT OS image definition. - -\ **template**\ - + +\ **template**\ + The fully qualified name of the template file that will be used to create the OS installer configuration file for stateful installations (e.g. kickstart for RedHat, autoyast for SLES). - -\ **boottarget**\ - + +\ **boottarget**\ + The name of the boottarget definition. When this attribute is set, xCAT will use the kernel, initrd and kernel params defined in the boottarget definition instead of the default. - -\ **addkcmdline**\ - + +\ **addkcmdline**\ + User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" "). This attribute is ignored if linuximage.boottarget is set. - -\ **pkglist**\ - + +\ **pkglist**\ + The fully qualified name of the file that stores the distro packages list that will be included in the image. Make sure that if the pkgs in the pkglist have dependency pkgs, the dependency pkgs should be found in one of the pkgdir - -\ **pkgdir**\ - + +\ **pkgdir**\ + The name of the directory where the distro packages are stored. It could be set to multiple paths. The multiple paths must be separated by ",". The first path in the value of osimage.pkgdir must be the OS base pkg dir path, such as pkgdir=/install/rhels6.2/x86_64,/install/updates . In the os base pkg path, there are default repository data. And in the other pkg path(s), the users should make sure there are repository data. If not, use "createrepo" command to create them. For ubuntu, multiple mirrors can be specified in the pkgdir attribute, the mirrors must be prefixed by the protocol(http/ssh) and delimited with "," between each other. - -\ **otherpkglist**\ - + +\ **otherpkglist**\ + The fully qualified name of the file that stores non-distro package lists that will be included in the image. It could be set to multiple paths. The multiple paths must be separated by ",". - -\ **otherpkgdir**\ - + +\ **otherpkgdir**\ + The base directory and urls of internet repos from which the non-distro packages are retrived. Only 1 local directory is supported at present. The entries should be delimited with comma ",". Currently, the internet repos are only supported on Ubuntu and Redhat. - -\ **exlist**\ - + +\ **exlist**\ + The fully qualified name of the file that stores the file names and directory names that will be excluded from the image during packimage command. It is used for diskless image only. - -\ **postinstall**\ - + +\ **postinstall**\ + Supported in diskless image only. The fully qualified name of the scripts and the user-specified arguments running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be seperated with comma ",". The arguments passed to each postinstall script include 4 implicit arguments(,,,) and the user-specified arguments. A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts: - - + + .. code-block:: perl - + IMG_ARCH(The architecture of the osimage, such as "ppc64le","x86_64"), IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"), IMG_OSVER(The os release of the osimage, such as "rhels7.3","sles11.4"), @@ -107,72 +107,72 @@ linuximage Attributes: IMG_OTHERPKGLIST(the "otherpkglist" attribute of the osimage), IMG_OTHERPKGDIR(the "otherpkgdir" attribute of the osimage), IMG_ROOTIMGDIR(the "rootimgdir" attribute of the osimage) - - -\ **rootimgdir**\ - + + +\ **rootimgdir**\ + The directory name where the image is stored. It is generally used for diskless image. it also can be used in sysclone environment to specify where the image captured from golden client is stored. in sysclone environment, rootimgdir is generally assigned to some default value by xcat, but you can specify your own store directory. just one thing need to be noticed, wherever you save the image, the name of last level directory must be the name of image. for example, if your image name is testimage and you want to save this image under home directoy, rootimgdir should be assigned to value /home/testimage/ - -\ **kerneldir**\ - + +\ **kerneldir**\ + The directory name where the 3rd-party kernel is stored. It is used for diskless image only. - -\ **nodebootif**\ - + +\ **nodebootif**\ + The network interface the stateless/statelite node will boot over (e.g. eth0) - -\ **otherifce**\ - + +\ **otherifce**\ + Other network interfaces (e.g. eth1) in the image that should be configured via DHCP - -\ **netdrivers**\ - + +\ **netdrivers**\ + The ethernet device drivers of the nodes which will use this linux image, at least the device driver for the nodes' installnic should be included - -\ **kernelver**\ - + +\ **kernelver**\ + The version of linux kernel used in the linux image. If the kernel version is not set, the default kernel in rootimgdir will be used - -\ **krpmver**\ - + +\ **krpmver**\ + The rpm version of kernel packages (for SLES only). If it is not set, the default rpm version of kernel packages will be used. - -\ **permission**\ - + +\ **permission**\ + The mount permission of /.statelite directory is used, its default value is 755 - -\ **dump**\ - + +\ **dump**\ + The NFS directory to hold the Linux kernel dump file (vmcore) when the node with this image crashes, its format is "nfs:///". If you want to use the node's "xcatmaster" (its SN or MN), can be left blank. For example, "nfs:///" means the NFS directory to hold the kernel dump file is on the node's SN, or MN if there's no SN. - -\ **crashkernelsize**\ - + +\ **crashkernelsize**\ + the size that assigned to the kdump kernel. If the kernel size is not set, 256M will be the default value. - -\ **partitionfile**\ - + +\ **partitionfile**\ + Only available for diskful osimages and statelite osimages(localdisk enabled). The full path of the partition file or the script to generate the partition file. The valid value includes: "": For diskful osimages, the partition file contains the partition definition that will be inserted directly into the template file for os installation. The syntax and format of the partition file should confirm to the corresponding OS installer of the Linux distributions(e.g. kickstart for RedHat, autoyast for SLES, pressed for Ubuntu). For statelite osimages, when the localdisk is enabled, the partition file with specific syntax and format includes the partition scheme of the local disk, please refer to the statelite documentation for details. "s:": a shell script to generate the partition file "/tmp/partitionfile" inside the installer before the installation start. @@ -180,25 +180,25 @@ linuximage Attributes: "s:d:": only available for ubuntu osimages, a script to generate the disk name file "/tmp/xcat.install_disk" inside the debian installer. This script is run in the "pressed/early_command" section. "c:": only availbe for ubuntu osimages, contains the additional pressed entries in "d-i ..." form. This can be used to specify some additional preseed options to support RAID or LVM in Ubuntu. "s:c:": only available for ubuntu osimages, runs in pressed/early_command and set the preseed values with "debconf-set". The multiple values should be delimited with comma "," - -\ **driverupdatesrc**\ - + +\ **driverupdatesrc**\ + The source of the drivers which need to be loaded during the boot. Two types of driver update source are supported: Driver update disk and Driver rpm package. The value for this attribute should be comma separated sources. Each source should be the format tab:full_path_of_source_file. The tab keyword can be: dud (for Driver update disk) and rpm (for driver rpm). If missing the tab, the rpm format is the default. e.g. dud:/install/dud/dd.img,rpm:/install/rpm/d.rpm - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -207,5 +207,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 3957e46b22cbcea094f045a4ce9f9dffa26301ef Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0425/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/litefile.5.rst --- .../references/man5/litefile.5.rst | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/litefile.5.rst b/docs/source/guides/admin-guides/references/man5/litefile.5.rst index 220627f91..e3c131f0a 100644 --- a/docs/source/guides/admin-guides/references/man5/litefile.5.rst +++ b/docs/source/guides/admin-guides/references/man5/litefile.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **litefile Attributes:**\ \ *image*\ , \ *file*\ , \ *options*\ , \ *comments*\ , \ *disable*\ +\ **litefile Attributes:**\ \ *image*\ , \ *file*\ , \ *options*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,56 +36,56 @@ litefile Attributes: -\ **image**\ - +\ **image**\ + The name of the image (as specified in the osimage table) that will use these options on this dir/file. You can also specify an image group name that is listed in the osimage.groups attribute of some osimages. 'ALL' means use this row for all images. - -\ **file**\ - + +\ **file**\ + The full pathname of the file. e.g: /etc/hosts. If the path is a directory, then it should be terminated with a '/'. - -\ **options**\ - + +\ **options**\ + Options for the file: - - + + .. code-block:: perl - + tmpfs - It is the default option if you leave the options column blank. It provides a file or directory for the node to use when booting, its permission will be the same as the original version on the server. In most cases, it is read-write; however, on the next statelite boot, the original version of the file or directory on the server will be used, it means it is non-persistent. This option can be performed on files and directories.. - - rw - Same as above. Its name "rw" does NOT mean it always be read-write, even in most cases it is read-write. Do not confuse it with the "rw" permission in the file system. - - persistent - It provides a mounted file or directory that is copied to the xCAT persistent location and then over-mounted on the local file or directory. Anything written to that file or directory is preserved. It means, if the file/directory does not exist at first, it will be copied to the persistent location. Next time the file/directory in the persistent location will be used. The file/directory will be persistent across reboots. Its permission will be the same as the original one in the statelite location. It requires the statelite table to be filled out with a spot for persistent statelite. This option can be performed on files and directories. - + + rw - Same as above. Its name "rw" does NOT mean it always be read-write, even in most cases it is read-write. Do not confuse it with the "rw" permission in the file system. + + persistent - It provides a mounted file or directory that is copied to the xCAT persistent location and then over-mounted on the local file or directory. Anything written to that file or directory is preserved. It means, if the file/directory does not exist at first, it will be copied to the persistent location. Next time the file/directory in the persistent location will be used. The file/directory will be persistent across reboots. Its permission will be the same as the original one in the statelite location. It requires the statelite table to be filled out with a spot for persistent statelite. This option can be performed on files and directories. + con - The contents of the pathname are concatenated to the contents of the existing file. For this directive the searching in the litetree hierarchy does not stop when the first match is found. All files found in the hierarchy will be concatenated to the file when found. The permission of the file will be "-rw-r--r--", which means it is read-write for the root user, but readonly for the others. It is non-persistent, when the node reboots, all changes to the file will be lost. It can only be performed on files. Do not use it for one directory. - + ro - The file/directory will be overmounted read-only on the local file/directory. It will be located in the directory hierarchy specified in the litetree table. Changes made to this file or directory on the server will be immediately seen in this file/directory on the node. This option requires that the file/directory to be mounted must be available in one of the entries in the litetree table. This option can be performed on files and directories. - - link - It provides one file/directory for the node to use when booting, it is copied from the server, and will be placed in tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to one file/directory in tmpfs. And the permission of the symbolic link is "lrwxrwxrwx", which is not the real permission of the file/directory on the node. So for some application sensitive to file permissions, it will be one issue to use "link" as its option, for example, "/root/.ssh/", which is used for SSH, should NOT use "link" as its option. It is non-persistent, when the node is rebooted, all changes to the file/directory will be lost. This option can be performed on files and directories. - - link,con - It works similar to the "con" option. All the files found in the litetree hierarchy will be concatenated to the file when found. The final file will be put to the tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to the file/directory in tmpfs. It is non-persistent, when the node is rebooted, all changes to the file will be lost. The option can only be performed on files. - + + link - It provides one file/directory for the node to use when booting, it is copied from the server, and will be placed in tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to one file/directory in tmpfs. And the permission of the symbolic link is "lrwxrwxrwx", which is not the real permission of the file/directory on the node. So for some application sensitive to file permissions, it will be one issue to use "link" as its option, for example, "/root/.ssh/", which is used for SSH, should NOT use "link" as its option. It is non-persistent, when the node is rebooted, all changes to the file/directory will be lost. This option can be performed on files and directories. + + link,con - It works similar to the "con" option. All the files found in the litetree hierarchy will be concatenated to the file when found. The final file will be put to the tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to the file/directory in tmpfs. It is non-persistent, when the node is rebooted, all changes to the file will be lost. The option can only be performed on files. + link,persistent - It provides a mounted file or directory that is copied to the xCAT persistent location and then over-mounted to the tmpfs on the booted node, and finally the symbolic link in the local file system will be linked to the over-mounted tmpfs file/directory on the booted node. The file/directory will be persistent across reboots. The permission of the file/directory where the symbolic link points to will be the same as the original one in the statelite location. It requires the statelite table to be filled out with a spot for persistent statelite. The option can be performed on files and directories. - + link,ro - The file is readonly, and will be placed in tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to the tmpfs. It is non-persistent, when the node is rebooted, all changes to the file/directory will be lost. This option requires that the file/directory to be mounted must be available in one of the entries in the litetree table. The option can be performed on files and directories. - - -\ **comments**\ - + + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -94,5 +94,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From ef10fcb47e92cea0884641c5dc5951338b079a0c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0426/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/litetree.5.rst --- .../references/man5/litetree.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/litetree.5.rst b/docs/source/guides/admin-guides/references/man5/litetree.5.rst index 50d1eaa6f..473af0218 100644 --- a/docs/source/guides/admin-guides/references/man5/litetree.5.rst +++ b/docs/source/guides/admin-guides/references/man5/litetree.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **litetree Attributes:**\ \ *priority*\ , \ *image*\ , \ *directory*\ , \ *mntopts*\ , \ *comments*\ , \ *disable*\ +\ **litetree Attributes:**\ \ *priority*\ , \ *image*\ , \ *directory*\ , \ *mntopts*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ litetree Attributes: -\ **priority**\ - +\ **priority**\ + This number controls what order the directories are searched. Directories are searched from smallest priority number to largest. - -\ **image**\ - + +\ **image**\ + The name of the image (as specified in the osimage table) that will use this directory. You can also specify an image group name that is listed in the osimage.groups attribute of some osimages. 'ALL' means use this row for all images. - -\ **directory**\ - + +\ **directory**\ + The location (hostname:path) of a directory that contains files specified in the litefile table. Variables are allowed. E.g: $noderes.nfsserver://xcatmasternode/install/$node/#CMD=uname-r#/ - -\ **mntopts**\ - + +\ **mntopts**\ + A comma-separated list of options to use when mounting the litetree directory. (Ex. 'soft') The default is to do a 'hard' mount. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From c6347cae81bfb550b8b8b44daf22e1249e18d8d6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0427/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/mac.5.rst --- .../admin-guides/references/man5/mac.5.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/mac.5.rst b/docs/source/guides/admin-guides/references/man5/mac.5.rst index 993fdd0cf..4221756cc 100644 --- a/docs/source/guides/admin-guides/references/man5/mac.5.rst +++ b/docs/source/guides/admin-guides/references/man5/mac.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **mac Attributes:**\ \ *node*\ , \ *interface*\ , \ *mac*\ , \ *comments*\ , \ *disable*\ +\ **mac Attributes:**\ \ *node*\ , \ *interface*\ , \ *mac*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,34 +36,34 @@ mac Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **interface**\ - + +\ **interface**\ + The adapter interface name that will be used to install and manage the node. E.g. eth0 (for linux) or en0 (for AIX).) - -\ **mac**\ - + +\ **mac**\ + The mac address or addresses for which xCAT will manage static bindings for this node. This may be simply a mac address, which would be bound to the node name (such as "01:02:03:04:05:0E"). This may also be a "|" delimited string of "mac address!hostname" format (such as "01:02:03:04:05:0E!node5|01:02:03:04:05:0F!node6-eth1"). If there are multiple nics connected to Management Network(usually for bond), in order to make sure the OS deployment finished successfully, the macs of those nics must be able to resolve to same IP address. First, users have to create alias of the node for each mac in the Management Network through either: 1. adding the alias into /etc/hosts for the node directly or: 2. setting the alias to the "hostnames" attribute and then run "makehost" against the node. Then, configure the "mac" attribute of the node like "mac1!node|mac2!node-alias". For the first mac address (mac1 in the example) set in "mac" attribute, do not need to set a "node name" string for it since the nodename of the node will be used for it by default. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -72,5 +72,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From bf003a107136ff415a4d8d468c430af03fea0db2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0428/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/mic.5.rst --- .../admin-guides/references/man5/mic.5.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/mic.5.rst b/docs/source/guides/admin-guides/references/man5/mic.5.rst index 896113110..07e543a4d 100644 --- a/docs/source/guides/admin-guides/references/man5/mic.5.rst +++ b/docs/source/guides/admin-guides/references/man5/mic.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **mic Attributes:**\ \ *node*\ , \ *host*\ , \ *id*\ , \ *nodetype*\ , \ *bridge*\ , \ *onboot*\ , \ *vlog*\ , \ *powermgt*\ , \ *comments*\ , \ *disable*\ +\ **mic Attributes:**\ \ *node*\ , \ *host*\ , \ *id*\ , \ *nodetype*\ , \ *bridge*\ , \ *onboot*\ , \ *vlog*\ , \ *powermgt*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,64 +36,64 @@ mic Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **host**\ - + +\ **host**\ + The host node which the mic card installed on. - -\ **id**\ - + +\ **id**\ + The device id of the mic node. - -\ **nodetype**\ - + +\ **nodetype**\ + The hardware type of the mic node. Generally, it is mic. - -\ **bridge**\ - + +\ **bridge**\ + The virtual bridge on the host node which the mic connected to. - -\ **onboot**\ - + +\ **onboot**\ + Set mic to autoboot when mpss start. Valid values: yes|no. Default is yes. - -\ **vlog**\ - + +\ **vlog**\ + Set the Verbose Log to console. Valid values: yes|no. Default is no. - -\ **powermgt**\ - + +\ **powermgt**\ + Set the Power Management for mic node. This attribute is used to set the power management state that mic may get into when it is idle. Four states can be set: cpufreq, corec6, pc3 and pc6. The valid value for powermgt attribute should be [cpufreq=]![corec6=]![pc3=]![pc6=]. e.g. cpufreq=on!corec6=off!pc3=on!pc6=off. Refer to the doc of mic to get more information for power management. - -\ **comments**\ - + +\ **comments**\ + Any user-provided notes. - -\ **disable**\ - + +\ **disable**\ + Do not use. tabprune will not work if set to yes or 1 - + @@ -102,5 +102,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 6d639701174e0f66e890aabc5a489cbcb402f464 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0429/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/monitoring.5.rst --- .../references/man5/monitoring.5.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/monitoring.5.rst b/docs/source/guides/admin-guides/references/man5/monitoring.5.rst index 6ea1f73d3..52d3079aa 100644 --- a/docs/source/guides/admin-guides/references/man5/monitoring.5.rst +++ b/docs/source/guides/admin-guides/references/man5/monitoring.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **monitoring Attributes:**\ \ *name*\ , \ *nodestatmon*\ , \ *comments*\ , \ *disable*\ +\ **monitoring Attributes:**\ \ *name*\ , \ *nodestatmon*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,28 +36,28 @@ monitoring Attributes: -\ **name**\ - +\ **name**\ + The name of the monitoring plug-in module. The plug-in must be put in /lib/perl/xCAT_monitoring/. See the man page for monstart for details. - -\ **nodestatmon**\ - + +\ **nodestatmon**\ + Specifies if the monitoring plug-in is used to feed the node status to the xCAT cluster. Any one of the following values indicates "yes": y, Y, yes, Yes, YES, 1. Any other value or blank (default), indicates "no". - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -66,5 +66,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 05b8f5513b59730ebb4e228ec3426a49f6e217c9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0430/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/monsetting.5.rst --- .../references/man5/monsetting.5.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/monsetting.5.rst b/docs/source/guides/admin-guides/references/man5/monsetting.5.rst index d14541ee0..ebe081dc3 100644 --- a/docs/source/guides/admin-guides/references/man5/monsetting.5.rst +++ b/docs/source/guides/admin-guides/references/man5/monsetting.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **monsetting Attributes:**\ \ *name*\ , \ *key*\ , \ *value*\ , \ *comments*\ , \ *disable*\ +\ **monsetting Attributes:**\ \ *name*\ , \ *key*\ , \ *value*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,34 +36,34 @@ monsetting Attributes: -\ **name**\ - +\ **name**\ + The name of the monitoring plug-in module. The plug-in must be put in /lib/perl/xCAT_monitoring/. See the man page for monstart for details. - -\ **key**\ - + +\ **key**\ + Specifies the name of the attribute. The valid values are specified by each monitoring plug-in. Use "monls name -d" to get a list of valid keys. - -\ **value**\ - + +\ **value**\ + Specifies the value of the attribute. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -72,5 +72,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 6afc728b0c5e91745fbe75da0db7dab13cb4662f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0431/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/mp.5.rst --- .../admin-guides/references/man5/mp.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/mp.5.rst b/docs/source/guides/admin-guides/references/man5/mp.5.rst index ee046aee4..ff110772d 100644 --- a/docs/source/guides/admin-guides/references/man5/mp.5.rst +++ b/docs/source/guides/admin-guides/references/man5/mp.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **mp Attributes:**\ \ *node*\ , \ *mpa*\ , \ *id*\ , \ *nodetype*\ , \ *comments*\ , \ *disable*\ +\ **mp Attributes:**\ \ *node*\ , \ *mpa*\ , \ *id*\ , \ *nodetype*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ mp Attributes: -\ **node**\ - +\ **node**\ + The blade node name or group name. - -\ **mpa**\ - + +\ **mpa**\ + The management module used to control this blade. - -\ **id**\ - + +\ **id**\ + The slot number of this blade in the BladeCenter chassis. - -\ **nodetype**\ - + +\ **nodetype**\ + The hardware type for mp node. Valid values: mm,cmm, blade. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 0368918adb77458cc22e772062d638e8dee30bbf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0432/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/mpa.5.rst --- .../admin-guides/references/man5/mpa.5.rst | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/mpa.5.rst b/docs/source/guides/admin-guides/references/man5/mpa.5.rst index 4b03e9d12..71d846ac6 100644 --- a/docs/source/guides/admin-guides/references/man5/mpa.5.rst +++ b/docs/source/guides/admin-guides/references/man5/mpa.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **mpa Attributes:**\ \ *mpa*\ , \ *username*\ , \ *password*\ , \ *displayname*\ , \ *slots*\ , \ *urlpath*\ , \ *comments*\ , \ *disable*\ +\ **mpa Attributes:**\ \ *mpa*\ , \ *username*\ , \ *password*\ , \ *displayname*\ , \ *slots*\ , \ *urlpath*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,60 +36,60 @@ mpa Attributes: -\ **mpa**\ - +\ **mpa**\ + Hostname of the management module. - -\ **username**\ - + +\ **username**\ + Userid to use to access the management module. - -\ **password**\ - + +\ **password**\ + Password to use to access the management module. If not specified, the key=blade row in the passwd table is used as the default. - -\ **displayname**\ - + +\ **displayname**\ + Alternative name for BladeCenter chassis. Only used by PCM. - -\ **slots**\ - + +\ **slots**\ + The number of available slots in the chassis. For PCM, this attribute is used to store the number of slots in the following format: ,, Where: - - + + .. code-block:: perl - + = number of rows of slots in chassis = number of columns of slots in chassis = set to 0 if slots are vertical, and set to 1 if slots of horizontal - - -\ **urlpath**\ - + + +\ **urlpath**\ + URL path for the Chassis web interface. The full URL is built as follows: / - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -98,5 +98,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From e9a250aecd45ad079009682de619a7af6523d39e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0433/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/networks.5.rst --- .../references/man5/networks.5.rst | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/networks.5.rst b/docs/source/guides/admin-guides/references/man5/networks.5.rst index c71afb5f2..14358db0e 100644 --- a/docs/source/guides/admin-guides/references/man5/networks.5.rst +++ b/docs/source/guides/admin-guides/references/man5/networks.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **networks Attributes:**\ \ *netname*\ , \ *net*\ , \ *mask*\ , \ *mgtifname*\ , \ *gateway*\ , \ *dhcpserver*\ , \ *tftpserver*\ , \ *nameservers*\ , \ *ntpservers*\ , \ *logservers*\ , \ *dynamicrange*\ , \ *staticrange*\ , \ *staticrangeincrement*\ , \ *nodehostname*\ , \ *ddnsdomain*\ , \ *vlanid*\ , \ *domain*\ , \ *mtu*\ , \ *comments*\ , \ *disable*\ +\ **networks Attributes:**\ \ *netname*\ , \ *net*\ , \ *mask*\ , \ *mgtifname*\ , \ *gateway*\ , \ *dhcpserver*\ , \ *tftpserver*\ , \ *nameservers*\ , \ *ntpservers*\ , \ *logservers*\ , \ *dynamicrange*\ , \ *staticrange*\ , \ *staticrangeincrement*\ , \ *nodehostname*\ , \ *ddnsdomain*\ , \ *vlanid*\ , \ *domain*\ , \ *mtu*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,122 +36,122 @@ networks Attributes: -\ **netname**\ - +\ **netname**\ + Name used to identify this network definition. - -\ **net**\ - + +\ **net**\ + The network address. - -\ **mask**\ - + +\ **mask**\ + The network mask. - -\ **mgtifname**\ - + +\ **mgtifname**\ + The interface name of the management/service node facing this network. !remote! indicates a non-local network on a specific nic for relay DHCP. - -\ **gateway**\ - + +\ **gateway**\ + The network gateway. It can be set to an ip address or the keyword , the keyword indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network. - -\ **dhcpserver**\ - + +\ **dhcpserver**\ + The DHCP server that is servicing this network. Required to be explicitly set for pooled service node operation. - -\ **tftpserver**\ - + +\ **tftpserver**\ + The TFTP server that is servicing this network. If not set, the DHCP server is assumed. - -\ **nameservers**\ - + +\ **nameservers**\ + A comma delimited list of DNS servers that each node in this network should use. This value will end up in the nameserver settings of the /etc/resolv.conf on each node in this network. If this attribute value is set to the IP address of an xCAT node, make sure DNS is running on it. In a hierarchical cluster, you can also set this attribute to "" to mean the DNS server for each node in this network should be the node that is managing it (either its service node or the management node). Used in creating the DHCP network definition, and DNS configuration. - -\ **ntpservers**\ - + +\ **ntpservers**\ + The ntp servers for this network. Used in creating the DHCP network definition. Assumed to be the DHCP server if not set. - -\ **logservers**\ - + +\ **logservers**\ + The log servers for this network. Used in creating the DHCP network definition. Assumed to be the DHCP server if not set. - -\ **dynamicrange**\ - + +\ **dynamicrange**\ + The IP address range used by DHCP to assign dynamic IP addresses for requests on this network. This should not overlap with entities expected to be configured with static host declarations, i.e. anything ever expected to be a node with an address registered in the mac table. - -\ **staticrange**\ - + +\ **staticrange**\ + The IP address range used to dynamically assign static IPs to newly discovered nodes. This should not overlap with the dynamicrange nor overlap with entities that were manually assigned static IPs. The format for the attribute value is: -. - - - -\ **staticrangeincrement**\ -\ **nodehostname**\ - +\ **staticrangeincrement**\ + + + +\ **nodehostname**\ + A regular expression used to specify node name to network-specific hostname. i.e. "/\z/-secondary/" would mean that the hostname of "n1" would be n1-secondary on this network. By default, the nodename is assumed to equal the hostname, followed by nodename-interfacename. - -\ **ddnsdomain**\ - + +\ **ddnsdomain**\ + A domain to be combined with nodename to construct FQDN for DDNS updates induced by DHCP. This is not passed down to the client as "domain" - -\ **vlanid**\ - + +\ **vlanid**\ + The vlan ID if this network is within a vlan. - -\ **domain**\ - + +\ **domain**\ + The DNS domain name (ex. cluster.com). - -\ **mtu**\ - + +\ **mtu**\ + The default MTU for the network, If multiple networks are applied to the same nic on the SN and/or CN, the MTU shall be the same for those networks. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -160,5 +160,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 6ddae451d07dd6e55c51999971585ffb676b8be2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0434/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/nics.5.rst --- .../admin-guides/references/man5/nics.5.rst | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/nics.5.rst b/docs/source/guides/admin-guides/references/man5/nics.5.rst index 92a5621be..cf264ff18 100644 --- a/docs/source/guides/admin-guides/references/man5/nics.5.rst +++ b/docs/source/guides/admin-guides/references/man5/nics.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **nics Attributes:**\ \ *node*\ , \ *nicips*\ , \ *nichostnamesuffixes*\ , \ *nichostnameprefixes*\ , \ *nictypes*\ , \ *niccustomscripts*\ , \ *nicnetworks*\ , \ *nicaliases*\ , \ *nicextraparams*\ , \ *nicdevices*\ , \ *nicsadapter*\ , \ *comments*\ , \ *disable*\ +\ **nics Attributes:**\ \ *node*\ , \ *nicips*\ , \ *nichostnamesuffixes*\ , \ *nichostnameprefixes*\ , \ *nictypes*\ , \ *niccustomscripts*\ , \ *nicnetworks*\ , \ *nicaliases*\ , \ *nicextraparams*\ , \ *nicdevices*\ , \ *nicsadapter*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,117 +36,117 @@ nics Attributes: -\ **node**\ - +\ **node**\ + The node or group name. - -\ **nicips**\ - - Comma-separated list of IP addresses per NIC. + +\ **nicips**\ + + Comma-separated list of IP addresses per NIC. To specify one ip address per NIC: !,!,..., for example, eth0!10.0.0.100,ib0!11.0.0.100 To specify multiple ip addresses per NIC: !|,!|,..., for example, eth0!10.0.0.100|fd55::214:5eff:fe15:849b,ib0!11.0.0.100|2001::214:5eff:fe15:849a. The xCAT object definition commands support to use nicips. as the sub attributes. Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address. - -\ **nichostnamesuffixes**\ - - Comma-separated list of hostname suffixes per NIC. + +\ **nichostnamesuffixes**\ + + Comma-separated list of hostname suffixes per NIC. If only one ip address is associated with each NIC: !,!,..., for example, eth0!-eth0,ib0!-ib0 If multiple ip addresses are associated with each NIC: - !|,!|,..., for example, eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. + !|,!|,..., for example, eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. The xCAT object definition commands support to use nichostnamesuffixes. as the sub attributes. - - + + .. code-block:: perl - + Note: According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnamesuffixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention - - -\ **nichostnameprefixes**\ - - Comma-separated list of hostname prefixes per NIC. + + +\ **nichostnameprefixes**\ + + Comma-separated list of hostname prefixes per NIC. If only one ip address is associated with each NIC: !,!,..., for example, eth0!eth0-,ib0!ib- If multiple ip addresses are associated with each NIC: - !|,!|,..., for example, eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. - The xCAT object definition commands support to use nichostnameprefixes. as the sub attributes. + !|,!|,..., for example, eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. + The xCAT object definition commands support to use nichostnameprefixes. as the sub attributes. Note: According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnameprefixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention - -\ **nictypes**\ - + +\ **nictypes**\ + Comma-separated list of NIC types per NIC. !,!, e.g. eth0!Ethernet,ib0!Infiniband. The xCAT object definition commands support to use nictypes. as the sub attributes. - -\ **niccustomscripts**\ - + +\ **niccustomscripts**\ + Comma-separated list of custom scripts per NIC. !,!, e.g. eth0!configeth eth0, ib0!configib ib0. The xCAT object definition commands support to use niccustomscripts. as the sub attribute . - -\ **nicnetworks**\ - + +\ **nicnetworks**\ + Comma-separated list of networks connected to each NIC. If only one ip address is associated with each NIC: !,!, for example, eth0!10_0_0_0-255_255_0_0, ib0!11_0_0_0-255_255_0_0 If multiple ip addresses are associated with each NIC: !|,!|, for example, eth0!10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64,ib0!11_0_0_0-255_255_0_0|2001:db8:1:0::/64. The xCAT object definition commands support to use nicnetworks. as the sub attributes. - -\ **nicaliases**\ - + +\ **nicaliases**\ + Comma-separated list of hostname aliases for each NIC. Format: eth0!,eth1!| - For multiple aliases per nic use a space-separated list. + For multiple aliases per nic use a space-separated list. For example: eth0!moe larry curly,eth1!tom|jerry - -\ **nicextraparams**\ - + +\ **nicextraparams**\ + Comma-separated list of extra parameters that will be used for each NIC configuration. If only one ip address is associated with each NIC: !,!, for example, eth0!MTU=1500,ib0!MTU=65520 CONNECTED_MODE=yes. If multiple ip addresses are associated with each NIC: !|,!|, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes. The xCAT object definition commands support to use nicextraparams. as the sub attributes. - -\ **nicdevices**\ - + +\ **nicdevices**\ + Comma-separated list of NIC device per NIC, multiple ethernet devices can be bonded as bond device, these ethernet devices are separated by | . !|,!, e.g. bond0!eth0|eth2,br0!bond0. The xCAT object definition commands support to use nicdevices. as the sub attributes. - -\ **nicsadapter**\ - + +\ **nicsadapter**\ + Comma-separated list of NIC information collected by getadapter. !,!, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -155,5 +155,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 0056ba0e21ec578bc995b9bccd6637838f295ecc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0435/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/nimimage.5.rst --- .../references/man5/nimimage.5.rst | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/nimimage.5.rst b/docs/source/guides/admin-guides/references/man5/nimimage.5.rst index 575f05328..0829eb5f2 100644 --- a/docs/source/guides/admin-guides/references/man5/nimimage.5.rst +++ b/docs/source/guides/admin-guides/references/man5/nimimage.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **nimimage Attributes:**\ \ *imagename*\ , \ *nimtype*\ , \ *lpp_source*\ , \ *spot*\ , \ *root*\ , \ *dump*\ , \ *paging*\ , \ *resolv_conf*\ , \ *tmp*\ , \ *home*\ , \ *shared_home*\ , \ *res_group*\ , \ *nimmethod*\ , \ *script*\ , \ *bosinst_data*\ , \ *installp_bundle*\ , \ *mksysb*\ , \ *fb_script*\ , \ *shared_root*\ , \ *otherpkgs*\ , \ *image_data*\ , \ *configdump*\ , \ *comments*\ , \ *disable*\ +\ **nimimage Attributes:**\ \ *imagename*\ , \ *nimtype*\ , \ *lpp_source*\ , \ *spot*\ , \ *root*\ , \ *dump*\ , \ *paging*\ , \ *resolv_conf*\ , \ *tmp*\ , \ *home*\ , \ *shared_home*\ , \ *res_group*\ , \ *nimmethod*\ , \ *script*\ , \ *bosinst_data*\ , \ *installp_bundle*\ , \ *mksysb*\ , \ *fb_script*\ , \ *shared_root*\ , \ *otherpkgs*\ , \ *image_data*\ , \ *configdump*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,148 +36,148 @@ nimimage Attributes: -\ **imagename**\ - +\ **imagename**\ + User provided name of this xCAT OS image definition. - -\ **nimtype**\ - + +\ **nimtype**\ + The NIM client type- standalone, diskless, or dataless. - -\ **lpp_source**\ - + +\ **lpp_source**\ + The name of the NIM lpp_source resource. - -\ **spot**\ - + +\ **spot**\ + The name of the NIM SPOT resource. - -\ **root**\ - + +\ **root**\ + The name of the NIM root resource. - -\ **dump**\ - + +\ **dump**\ + The name of the NIM dump resource. - -\ **paging**\ - + +\ **paging**\ + The name of the NIM paging resource. - -\ **resolv_conf**\ - + +\ **resolv_conf**\ + The name of the NIM resolv_conf resource. - -\ **tmp**\ - + +\ **tmp**\ + The name of the NIM tmp resource. - -\ **home**\ - + +\ **home**\ + The name of the NIM home resource. - -\ **shared_home**\ - + +\ **shared_home**\ + The name of the NIM shared_home resource. - -\ **res_group**\ - + +\ **res_group**\ + The name of a NIM resource group. - -\ **nimmethod**\ - + +\ **nimmethod**\ + The NIM install method to use, (ex. rte, mksysb). - -\ **script**\ - + +\ **script**\ + The name of a NIM script resource. - -\ **bosinst_data**\ - + +\ **bosinst_data**\ + The name of a NIM bosinst_data resource. - -\ **installp_bundle**\ - + +\ **installp_bundle**\ + One or more comma separated NIM installp_bundle resources. - -\ **mksysb**\ - + +\ **mksysb**\ + The name of a NIM mksysb resource. - -\ **fb_script**\ - + +\ **fb_script**\ + The name of a NIM fb_script resource. - -\ **shared_root**\ - + +\ **shared_root**\ + A shared_root resource represents a directory that can be used as a / (root) directory by one or more diskless clients. - -\ **otherpkgs**\ - + +\ **otherpkgs**\ + One or more comma separated installp or rpm packages. The rpm packages must have a prefix of 'R:', (ex. R:foo.rpm) - -\ **image_data**\ - + +\ **image_data**\ + The name of a NIM image_data resource. - -\ **configdump**\ - + +\ **configdump**\ + Specifies the type of system dump to be collected. The values are selective, full, and none. The default is selective. - -\ **comments**\ - + +\ **comments**\ + Any user-provided notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -186,5 +186,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From fe3e217282dec519e045c838db701211fbf14c4d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0436/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/nodegroup.5.rst --- .../references/man5/nodegroup.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/nodegroup.5.rst b/docs/source/guides/admin-guides/references/man5/nodegroup.5.rst index 8d6d32ade..e255d03fd 100644 --- a/docs/source/guides/admin-guides/references/man5/nodegroup.5.rst +++ b/docs/source/guides/admin-guides/references/man5/nodegroup.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **nodegroup Attributes:**\ \ *groupname*\ , \ *grouptype*\ , \ *members*\ , \ *membergroups*\ , \ *wherevals*\ , \ *comments*\ , \ *disable*\ +\ **nodegroup Attributes:**\ \ *groupname*\ , \ *grouptype*\ , \ *members*\ , \ *membergroups*\ , \ *wherevals*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ nodegroup Attributes: -\ **groupname**\ - +\ **groupname**\ + Name of the group. - -\ **grouptype**\ - + +\ **grouptype**\ + The only current valid value is dynamic. We will be looking at having the object def commands working with static group definitions in the nodelist table. - -\ **members**\ - + +\ **members**\ + The value of the attribute is not used, but the attribute is necessary as a place holder for the object def commands. (The membership for static groups is stored in the nodelist table.) - -\ **membergroups**\ - + +\ **membergroups**\ + This attribute stores a comma-separated list of nodegroups that this nodegroup refers to. This attribute is only used by PCM. - -\ **wherevals**\ - + +\ **wherevals**\ + A list of "attr\*val" pairs that can be used to determine the members of a dynamic group, the delimiter is "::" and the operator \* can be ==, =~, != or !~. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 946983c8420785082613cc0114f50086ea42bf61 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0437/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/nodehm.5.rst --- .../admin-guides/references/man5/nodehm.5.rst | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/nodehm.5.rst b/docs/source/guides/admin-guides/references/man5/nodehm.5.rst index aa12ce4b2..879bf699e 100644 --- a/docs/source/guides/admin-guides/references/man5/nodehm.5.rst +++ b/docs/source/guides/admin-guides/references/man5/nodehm.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **nodehm Attributes:**\ \ *node*\ , \ *power*\ , \ *mgt*\ , \ *cons*\ , \ *termserver*\ , \ *termport*\ , \ *conserver*\ , \ *serialport*\ , \ *serialspeed*\ , \ *serialflow*\ , \ *getmac*\ , \ *cmdmapping*\ , \ *consoleondemand*\ , \ *consoleenabled*\ , \ *comments*\ , \ *disable*\ +\ **nodehm Attributes:**\ \ *node*\ , \ *power*\ , \ *mgt*\ , \ *cons*\ , \ *termserver*\ , \ *termport*\ , \ *conserver*\ , \ *serialport*\ , \ *serialspeed*\ , \ *serialflow*\ , \ *getmac*\ , \ *cmdmapping*\ , \ *consoleondemand*\ , \ *consoleenabled*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,100 +36,100 @@ nodehm Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **power**\ - + +\ **power**\ + The method to use to control the power of the node. If not set, the mgt attribute will be used. Valid values: ipmi, blade, hmc, ivm, fsp, kvm, esx, rhevm. If "ipmi", xCAT will search for this node in the ipmi table for more info. If "blade", xCAT will search for this node in the mp table. If "hmc", "ivm", or "fsp", xCAT will search for this node in the ppc table. - -\ **mgt**\ - + +\ **mgt**\ + The method to use to do general hardware management of the node. This attribute is used as the default if power or getmac is not set. Valid values: openbmc, ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm. See the power attribute for more details. - -\ **cons**\ - + +\ **cons**\ + The console method. If nodehm.serialport is set, this will default to the nodehm.mgt setting, otherwise it defaults to unused. Valid values: cyclades, mrv, or the values valid for the mgt attribute. - -\ **termserver**\ - + +\ **termserver**\ + The hostname of the terminal server. - -\ **termport**\ - + +\ **termport**\ + The port number on the terminal server that this node is connected to. - -\ **conserver**\ - + +\ **conserver**\ + The hostname of the machine where the conserver daemon is running. If not set, the default is the xCAT management node. - -\ **serialport**\ - + +\ **serialport**\ + The serial port for this node, in the linux numbering style (0=COM1/ttyS0, 1=COM2/ttyS1). For SOL on IBM blades, this is typically 1. For rackmount IBM servers, this is typically 0. - -\ **serialspeed**\ - + +\ **serialspeed**\ + The speed of the serial port for this node. For SOL this is typically 19200. - -\ **serialflow**\ - + +\ **serialflow**\ + The flow control value of the serial port for this node. For SOL this is typically 'hard'. - -\ **getmac**\ - + +\ **getmac**\ + The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used. Valid values: same as values for mgmt attribute. - -\ **cmdmapping**\ - + +\ **cmdmapping**\ + The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device. Only used by PCM. - -\ **consoleondemand**\ - + +\ **consoleondemand**\ + This overrides the value from site.consoleondemand. Set to 'yes', 'no', '1' (equivalent to 'yes'), or '0' (equivalent to 'no'). If not set, the default is the value from site.consoleondemand. - -\ **consoleenabled**\ - + +\ **consoleenabled**\ + A flag field to indicate whether the node is registered in the console server. If '1', console is enabled, if not set, console is not enabled. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -138,5 +138,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From ec05aebce3acd74350e99b19c10185c15996ee2b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0438/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/nodelist.5.rst --- .../references/man5/nodelist.5.rst | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/nodelist.5.rst b/docs/source/guides/admin-guides/references/man5/nodelist.5.rst index 7dbe45086..bbefb44bd 100644 --- a/docs/source/guides/admin-guides/references/man5/nodelist.5.rst +++ b/docs/source/guides/admin-guides/references/man5/nodelist.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **nodelist Attributes:**\ \ *node*\ , \ *groups*\ , \ *status*\ , \ *statustime*\ , \ *appstatus*\ , \ *appstatustime*\ , \ *primarysn*\ , \ *hidden*\ , \ *updatestatus*\ , \ *updatestatustime*\ , \ *zonename*\ , \ *comments*\ , \ *disable*\ +\ **nodelist Attributes:**\ \ *node*\ , \ *groups*\ , \ *status*\ , \ *statustime*\ , \ *appstatus*\ , \ *appstatustime*\ , \ *primarysn*\ , \ *hidden*\ , \ *updatestatus*\ , \ *updatestatustime*\ , \ *zonename*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,82 +36,82 @@ nodelist Attributes: -\ **node**\ - +\ **node**\ + The hostname of a node in the cluster. - -\ **groups**\ - + +\ **groups**\ + A comma-delimited list of groups this node is a member of. Group names are arbitrary, except all nodes should be part of the 'all' group. Internal group names are designated by using __. For example, __Unmanaged, could be the internal name for a group of nodes that is not managed by xCAT. Admins should avoid using the __ characters when defining their groups. - -\ **status**\ - + +\ **status**\ + The current status of this node. This attribute will be set by xCAT software. Valid values: defined, booting, netbooting, booted, discovering, configuring, installing, alive, standingby, powering-off, unreachable. If blank, defined is assumed. The possible status change sequences are: For installation: defined->[discovering]->[configuring]->[standingby]->installing->booting->[postbooting]->booted->[alive], For diskless deployment: defined->[discovering]->[configuring]->[standingby]->netbooting->[postbooting]->booted->[alive], For booting: [alive/unreachable]->booting->[postbooting]->booted->[alive], For powering off: [alive]->powering-off->[unreachable], For monitoring: alive->unreachable. Discovering and configuring are for x Series discovery process. Alive and unreachable are set only when there is a monitoring plug-in start monitor the node status for xCAT. Note that the status values will not reflect the real node status if you change the state of the node from outside of xCAT (i.e. power off the node using HMC GUI). - -\ **statustime**\ - + +\ **statustime**\ + The data and time when the status was updated. - -\ **appstatus**\ - + +\ **appstatus**\ + A comma-delimited list of application status. For example: 'sshd=up,ftp=down,ll=down' - -\ **appstatustime**\ - + +\ **appstatustime**\ + The date and time when appstatus was updated. - -\ **primarysn**\ - + +\ **primarysn**\ + Not used currently. The primary servicenode, used by this node. - -\ **hidden**\ - + +\ **hidden**\ + Used to hide fsp and bpa definitions, 1 means not show them when running lsdef and nodels - -\ **updatestatus**\ - + +\ **updatestatus**\ + The current node update status. Valid states are synced, out-of-sync,syncing,failed. - -\ **updatestatustime**\ - + +\ **updatestatustime**\ + The date and time when the updatestatus was updated. - -\ **zonename**\ - + +\ **zonename**\ + The name of the zone to which the node is currently assigned. If undefined, then it is not assigned to any zone. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -120,5 +120,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 783559518e041a8577b9f36cf26067f6f5832fbb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0439/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/nodepos.5.rst --- .../references/man5/nodepos.5.rst | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/nodepos.5.rst b/docs/source/guides/admin-guides/references/man5/nodepos.5.rst index 8a603d7ce..2c9969c81 100644 --- a/docs/source/guides/admin-guides/references/man5/nodepos.5.rst +++ b/docs/source/guides/admin-guides/references/man5/nodepos.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **nodepos Attributes:**\ \ *node*\ , \ *rack*\ , \ *u*\ , \ *chassis*\ , \ *slot*\ , \ *room*\ , \ *height*\ , \ *comments*\ , \ *disable*\ +\ **nodepos Attributes:**\ \ *node*\ , \ *rack*\ , \ *u*\ , \ *chassis*\ , \ *slot*\ , \ *room*\ , \ *height*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,58 +36,58 @@ nodepos Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **rack**\ - + +\ **rack**\ + The frame the node is in. - -\ **u**\ - + +\ **u**\ + The vertical position of the node in the frame - -\ **chassis**\ - + +\ **chassis**\ + The BladeCenter chassis the blade is in. - -\ **slot**\ - + +\ **slot**\ + The slot number of the blade in the chassis. For PCM, a comma-separated list of slot numbers is stored - -\ **room**\ - + +\ **room**\ + The room where the node is located. - -\ **height**\ - + +\ **height**\ + The server height in U(s). - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -96,5 +96,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 923d4c7597fd2f1e3a05b8a9fc071ea8808d91d5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0440/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/noderes.5.rst --- .../references/man5/noderes.5.rst | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/noderes.5.rst b/docs/source/guides/admin-guides/references/man5/noderes.5.rst index 98bc13b24..2381e4e81 100644 --- a/docs/source/guides/admin-guides/references/man5/noderes.5.rst +++ b/docs/source/guides/admin-guides/references/man5/noderes.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **noderes Attributes:**\ \ *node*\ , \ *servicenode*\ , \ *netboot*\ , \ *tftpserver*\ , \ *tftpdir*\ , \ *nfsserver*\ , \ *monserver*\ , \ *nfsdir*\ , \ *installnic*\ , \ *primarynic*\ , \ *discoverynics*\ , \ *cmdinterface*\ , \ *xcatmaster*\ , \ *current_osimage*\ , \ *next_osimage*\ , \ *nimserver*\ , \ *routenames*\ , \ *nameservers*\ , \ *proxydhcp*\ , \ *syslog*\ , \ *comments*\ , \ *disable*\ +\ **noderes Attributes:**\ \ *node*\ , \ *servicenode*\ , \ *netboot*\ , \ *tftpserver*\ , \ *tftpdir*\ , \ *nfsserver*\ , \ *monserver*\ , \ *nfsdir*\ , \ *installnic*\ , \ *primarynic*\ , \ *discoverynics*\ , \ *cmdinterface*\ , \ *xcatmaster*\ , \ *current_osimage*\ , \ *next_osimage*\ , \ *nimserver*\ , \ *routenames*\ , \ *nameservers*\ , \ *proxydhcp*\ , \ *syslog*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,147 +36,147 @@ noderes Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **servicenode**\ - + +\ **servicenode**\ + A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used. The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove. - -\ **netboot**\ - + +\ **netboot**\ + The type of network booting to use for this node. Valid values: - - + + .. code-block:: perl - + Arch OS valid netboot options x86, x86_64 ALL pxe, xnba ppc64 <=rhel6, <=sles11.3 yaboot ppc64 >=rhels7, >=sles11.4 grub2,grub2-http,grub2-tftp ppc64le NonVirtualize ALL petitboot ppc64le PowerKVM Guest ALL grub2,grub2-http,grub2-tftp - - -\ **tftpserver**\ - + + +\ **tftpserver**\ + The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver. - -\ **tftpdir**\ - + +\ **tftpdir**\ + The directory that roots this nodes contents from a tftp and related perspective. Used for NAS offload by using different mountpoints. - -\ **nfsserver**\ - + +\ **nfsserver**\ + The NFS or HTTP server for this node (as known by this node). - -\ **monserver**\ - + +\ **monserver**\ + The monitoring aggregation point for this node. The format is "x,y" where x is the ip address as known by the management node and y is the ip address as known by the node. - -\ **nfsdir**\ - + +\ **nfsdir**\ + The path that should be mounted from the NFS server. - -\ **installnic**\ - + +\ **installnic**\ + The network adapter on the node that will be used for OS deployment, the installnic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used. If not set, primarynic will be used. If primarynic is not set too, the keyword "mac" will be used as default. - -\ **primarynic**\ - + +\ **primarynic**\ + This attribute will be deprecated. All the used network interface will be determined by installnic. The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used. Default is eth0. - -\ **discoverynics**\ - + +\ **discoverynics**\ + If specified, force discovery to occur on specific network adapters only, regardless of detected connectivity. Syntax can be simply "eth2,eth3" to restrict discovery to whatever happens to come up as eth2 and eth3, or by driver name such as "bnx2:0,bnx2:1" to specify the first two adapters managed by the bnx2 driver - -\ **cmdinterface**\ - + +\ **cmdinterface**\ + Not currently used. - -\ **xcatmaster**\ - + +\ **xcatmaster**\ + The hostname of the xCAT service node (as known by this node). This acts as the default value for nfsserver and tftpserver, if they are not set. If xcatmaster is not set, the node will use whoever responds to its boot request as its master. For the directed bootp case for POWER, it will use the management node if xcatmaster is not set. - -\ **current_osimage**\ - + +\ **current_osimage**\ + Not currently used. The name of the osimage data object that represents the OS image currently deployed on this node. - -\ **next_osimage**\ - + +\ **next_osimage**\ + Not currently used. The name of the osimage data object that represents the OS image that will be installed on the node the next time it is deployed. - -\ **nimserver**\ - + +\ **nimserver**\ + Not used for now. The NIM server for this node (as known by this node). - -\ **routenames**\ - + +\ **routenames**\ + A comma separated list of route names that refer to rows in the routes table. These are the routes that should be defined on this node when it is deployed. - -\ **nameservers**\ - + +\ **nameservers**\ + An optional node/group specific override for name server list. Most people want to stick to site or network defined nameserver configuration. - -\ **proxydhcp**\ - + +\ **proxydhcp**\ + To specify whether the node supports proxydhcp protocol. Valid values: yes or 1, no or 0. Default value is yes. - -\ **syslog**\ - + +\ **syslog**\ + To configure how to configure syslog for compute node. Valid values:blank(not set), ignore. blank - run postscript syslog; ignore - do NOT run postscript syslog - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -185,5 +185,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 0cb364fe4087972844163a6c7863c24d4968423f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0441/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/nodetype.5.rst --- .../references/man5/nodetype.5.rst | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/nodetype.5.rst b/docs/source/guides/admin-guides/references/man5/nodetype.5.rst index 7d75e070c..820914581 100644 --- a/docs/source/guides/admin-guides/references/man5/nodetype.5.rst +++ b/docs/source/guides/admin-guides/references/man5/nodetype.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **nodetype Attributes:**\ \ *node*\ , \ *os*\ , \ *arch*\ , \ *profile*\ , \ *provmethod*\ , \ *supportedarchs*\ , \ *nodetype*\ , \ *comments*\ , \ *disable*\ +\ **nodetype Attributes:**\ \ *node*\ , \ *os*\ , \ *arch*\ , \ *profile*\ , \ *provmethod*\ , \ *supportedarchs*\ , \ *nodetype*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,58 +36,58 @@ nodetype Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **os**\ - + +\ **os**\ + The operating system deployed on this node. Valid values: AIX, rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #). As a special case, if this is set to "boottarget", then it will use the initrd/kernel/parameters specified in the row in the boottarget table in which boottarget.bprofile equals nodetype.profile. - -\ **arch**\ - + +\ **arch**\ + The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64. - -\ **profile**\ - + +\ **profile**\ + The string to use to locate a kickstart or autoyast template to use for OS deployment of this node. If the provmethod attribute is set to an osimage name, that takes precedence, and profile need not be defined. Otherwise, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat. - -\ **provmethod**\ - + +\ **provmethod**\ + The provisioning method for node deployment. The valid values are install, netboot, statelite or an os image name from the osimage table. If an image name is specified, the osimage definition stored in the osimage table and the linuximage table (for Linux) or nimimage table (for AIX) are used to locate the files for templates, pkglists, syncfiles, etc. On Linux, if install, netboot or statelite is specified, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat. - -\ **supportedarchs**\ - + +\ **supportedarchs**\ + Comma delimited list of architectures this node can execute. - -\ **nodetype**\ - + +\ **nodetype**\ + A comma-delimited list of characteristics of this node. Valid values: ppc, blade, vm (virtual machine), osi (OS image), mm, mn, rsa, switch. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -96,5 +96,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From c236f833edd69093d74a775d8d83c61b2e11712c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0442/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/notification.5.rst --- .../references/man5/notification.5.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/notification.5.rst b/docs/source/guides/admin-guides/references/man5/notification.5.rst index bd5027a74..795536bb9 100644 --- a/docs/source/guides/admin-guides/references/man5/notification.5.rst +++ b/docs/source/guides/admin-guides/references/man5/notification.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **notification Attributes:**\ \ *filename*\ , \ *tables*\ , \ *tableops*\ , \ *comments*\ , \ *disable*\ +\ **notification Attributes:**\ \ *filename*\ , \ *tables*\ , \ *tableops*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,34 +36,34 @@ notification Attributes: -\ **filename**\ - +\ **filename**\ + The path name of a file that implements the callback routine when the monitored table changes. Can be a perl module or a command. See the regnotif man page for details. - -\ **tables**\ - + +\ **tables**\ + Comma-separated list of xCAT database tables to monitor. - -\ **tableops**\ - + +\ **tableops**\ + Specifies the table operation to monitor for. Valid values: "d" (rows deleted), "a" (rows added), "u" (rows updated). - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -72,5 +72,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 20e1099b5dc9cb07ec90f4b8a23891634dcce531 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0443/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/openbmc.5.rst --- .../references/man5/openbmc.5.rst | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/openbmc.5.rst b/docs/source/guides/admin-guides/references/man5/openbmc.5.rst index 11bbee003..88dae91e3 100644 --- a/docs/source/guides/admin-guides/references/man5/openbmc.5.rst +++ b/docs/source/guides/admin-guides/references/man5/openbmc.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **openbmc Attributes:**\ \ *node*\ , \ *bmc*\ , \ *consport*\ , \ *taggedvlan*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ +\ **openbmc Attributes:**\ \ *node*\ , \ *bmc*\ , \ *consport*\ , \ *taggedvlan*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,52 +36,52 @@ openbmc Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **bmc**\ - + +\ **bmc**\ + The hostname of the BMC adapter. - -\ **consport**\ - + +\ **consport**\ + The console port for OpenBMC. - -\ **taggedvlan**\ - + +\ **taggedvlan**\ + bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified. - -\ **username**\ - + +\ **username**\ + The BMC userid. - -\ **password**\ - + +\ **password**\ + The BMC password. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -90,5 +90,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 43c6c6ed68e015f9dc939df69b7885e94c353c20 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0444/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/osdistro.5.rst --- .../references/man5/osdistro.5.rst | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/osdistro.5.rst b/docs/source/guides/admin-guides/references/man5/osdistro.5.rst index 8be247605..07045a5b2 100644 --- a/docs/source/guides/admin-guides/references/man5/osdistro.5.rst +++ b/docs/source/guides/admin-guides/references/man5/osdistro.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **osdistro Attributes:**\ \ *osdistroname*\ , \ *basename*\ , \ *majorversion*\ , \ *minorversion*\ , \ *arch*\ , \ *type*\ , \ *dirpaths*\ , \ *comments*\ , \ *disable*\ +\ **osdistro Attributes:**\ \ *osdistroname*\ , \ *basename*\ , \ *majorversion*\ , \ *minorversion*\ , \ *arch*\ , \ *type*\ , \ *dirpaths*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,58 +36,58 @@ osdistro Attributes: -\ **osdistroname**\ - +\ **osdistroname**\ + Unique name (e.g. rhels6.2-x86_64) - -\ **basename**\ - + +\ **basename**\ + The OS base name (e.g. rhels) - -\ **majorversion**\ - + +\ **majorversion**\ + The OS distro major version.(e.g. 6) - -\ **minorversion**\ - + +\ **minorversion**\ + The OS distro minor version. (e.g. 2) - -\ **arch**\ - + +\ **arch**\ + The OS distro arch (e.g. x86_64) - -\ **type**\ - + +\ **type**\ + Linux or AIX - -\ **dirpaths**\ - + +\ **dirpaths**\ + Directory paths where OS distro is store. There could be multiple paths if OS distro has more than one ISO image. (e.g. /install/rhels6.2/x86_64,...) - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -96,5 +96,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 0e145ef30ddd6f16bed9c3ce1e5030aadde1e7b7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0445/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst --- .../references/man5/osdistroupdate.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst b/docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst index 2d74cbd9c..99c05a153 100644 --- a/docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst +++ b/docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **osdistroupdate Attributes:**\ \ *osupdatename*\ , \ *osdistroname*\ , \ *dirpath*\ , \ *downloadtime*\ , \ *comments*\ , \ *disable*\ +\ **osdistroupdate Attributes:**\ \ *osupdatename*\ , \ *osdistroname*\ , \ *dirpath*\ , \ *downloadtime*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ osdistroupdate Attributes: -\ **osupdatename**\ - +\ **osupdatename**\ + Name of OS update. (e.g. rhn-update1) - -\ **osdistroname**\ - + +\ **osdistroname**\ + The OS distro name to update. (e.g. rhels) - -\ **dirpath**\ - + +\ **dirpath**\ + Path to where OS distro update is stored. (e.g. /install/osdistroupdates/rhels6.2-x86_64-20120716-update) - -\ **downloadtime**\ - + +\ **downloadtime**\ + The timestamp when OS distro update was downloaded.. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 14ae91fecbaf2adf818d21339f54e607bfa75b5a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0446/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/osimage.5.rst --- .../references/man5/osimage.5.rst | 130 +++++++++--------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/osimage.5.rst b/docs/source/guides/admin-guides/references/man5/osimage.5.rst index 968b2f443..4be9e16ee 100644 --- a/docs/source/guides/admin-guides/references/man5/osimage.5.rst +++ b/docs/source/guides/admin-guides/references/man5/osimage.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **osimage Attributes:**\ \ *imagename*\ , \ *groups*\ , \ *profile*\ , \ *imagetype*\ , \ *description*\ , \ *provmethod*\ , \ *rootfstype*\ , \ *osdistroname*\ , \ *osupdatename*\ , \ *cfmdir*\ , \ *osname*\ , \ *osvers*\ , \ *osarch*\ , \ *synclists*\ , \ *postscripts*\ , \ *postbootscripts*\ , \ *serverrole*\ , \ *isdeletable*\ , \ *kitcomponents*\ , \ *comments*\ , \ *disable*\ +\ **osimage Attributes:**\ \ *imagename*\ , \ *groups*\ , \ *profile*\ , \ *imagetype*\ , \ *description*\ , \ *provmethod*\ , \ *rootfstype*\ , \ *osdistroname*\ , \ *osupdatename*\ , \ *cfmdir*\ , \ *osname*\ , \ *osvers*\ , \ *osarch*\ , \ *synclists*\ , \ *postscripts*\ , \ *postbootscripts*\ , \ *serverrole*\ , \ *isdeletable*\ , \ *kitcomponents*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,130 +36,130 @@ osimage Attributes: -\ **imagename**\ - +\ **imagename**\ + The name of this xCAT OS image definition. - -\ **groups**\ - + +\ **groups**\ + A comma-delimited list of image groups of which this image is a member. Image groups can be used in the litefile and litetree table instead of a single image name. Group names are arbitrary. - -\ **profile**\ - + +\ **profile**\ + The node usage category. For example compute, service. - -\ **imagetype**\ - + +\ **imagetype**\ + The type of operating system image this definition represents (linux,AIX). - -\ **description**\ - + +\ **description**\ + OS Image Description - -\ **provmethod**\ - + +\ **provmethod**\ + The provisioning method for node deployment. The valid values are install, netboot,statelite,boottarget,dualboot,sysclone. If boottarget is set, you must set linuximage.boottarget to the name of the boottarget definition. It is not used by AIX. - -\ **rootfstype**\ - + +\ **rootfstype**\ + The filesystem type for the rootfs is used when the provmethod is statelite. The valid values are nfs or ramdisk. The default value is nfs - -\ **osdistroname**\ - + +\ **osdistroname**\ + The name of the OS distro definition. This attribute can be used to specify which OS distro to use, instead of using the osname,osvers,and osarch attributes. For \*kit commands, the attribute will be used to read the osdistro table for the osname, osvers, and osarch attributes. If defined, the osname, osvers, and osarch attributes defined in the osimage table will be ignored. - -\ **osupdatename**\ - + +\ **osupdatename**\ + A comma-separated list of OS distro updates to apply to this osimage. - -\ **cfmdir**\ - + +\ **cfmdir**\ + CFM directory name for PCM. Set to /install/osimages//cfmdir by PCM. - -\ **osname**\ - + +\ **osname**\ + Operating system name- AIX or Linux. - -\ **osvers**\ - + +\ **osvers**\ + The Linux operating system deployed on this node. Valid values: rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #). - -\ **osarch**\ - + +\ **osarch**\ + The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64. - -\ **synclists**\ - + +\ **synclists**\ + The fully qualified name of a file containing a list of files to synchronize on the nodes. Can be a comma separated list of multiple synclist files. The synclist generated by PCM named /install/osimages//synclist.cfm is reserved for use only by PCM and should not be edited by the admin. - -\ **postscripts**\ - + +\ **postscripts**\ + Comma separated list of scripts that should be run on this image after diskful installation or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute. For AIX, use the postbootscripts attribute. See the site table runbootscripts attribute. - -\ **postbootscripts**\ - + +\ **postbootscripts**\ + Comma separated list of scripts that should be run on this after diskful installation or diskless boot. On AIX these scripts are run during the processing of /etc/inittab. On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. See the site table runbootscripts attribute. - -\ **serverrole**\ - + +\ **serverrole**\ + The role of the server created by this osimage. Default roles: mgtnode, servicenode, compute, login, storage, utility. - -\ **isdeletable**\ - + +\ **isdeletable**\ + A flag to indicate whether this image profile can be deleted. This attribute is only used by PCM. - -\ **kitcomponents**\ - + +\ **kitcomponents**\ + List of Kit Component IDs assigned to this OS Image definition. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -168,5 +168,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 7f65181c1952113beb5d97578bdb347e583ca43c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0447/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/passwd.5.rst --- .../admin-guides/references/man5/passwd.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/passwd.5.rst b/docs/source/guides/admin-guides/references/man5/passwd.5.rst index 4123a9258..f36b52c44 100644 --- a/docs/source/guides/admin-guides/references/man5/passwd.5.rst +++ b/docs/source/guides/admin-guides/references/man5/passwd.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **passwd Attributes:**\ \ *key*\ , \ *username*\ , \ *password*\ , \ *cryptmethod*\ , \ *authdomain*\ , \ *comments*\ , \ *disable*\ +\ **passwd Attributes:**\ \ *key*\ , \ *username*\ , \ *password*\ , \ *cryptmethod*\ , \ *authdomain*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ passwd Attributes: -\ **key**\ - +\ **key**\ + The type of component this user/pw is for. Valid values: blade (management module), ipmi (BMC), system (nodes), omapi (DHCP), hmc, ivm, cec, frame, switch. - -\ **username**\ - + +\ **username**\ + The default userid for this type of component - -\ **password**\ - + +\ **password**\ + The default password for this type of component. On Linux, a crypted form could be provided. Hashes starting with $1$, $5$ and $6$ (md5, sha256 and sha512 respectively) are supported. - -\ **cryptmethod**\ - + +\ **cryptmethod**\ + Indicates the method to use to encrypt the password attribute. On AIX systems, if a value is provided for this attribute it indicates that the password attribute is encrypted. If the cryptmethod value is not set it indicates the password is a simple string value. On Linux systems, the cryptmethod can be set to md5, sha256 or sha512. If not set, sha256 will be used as default to encrypt plain-text passwords. - -\ **authdomain**\ - + +\ **authdomain**\ + The domain in which this entry has meaning, e.g. specifying different domain administrators per active directory domain - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 3a000e704350a7a25daca206e226c1dec650e158 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0448/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/pdu.5.rst --- .../admin-guides/references/man5/pdu.5.rst | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/pdu.5.rst b/docs/source/guides/admin-guides/references/man5/pdu.5.rst index c94edf9fe..e2293b772 100644 --- a/docs/source/guides/admin-guides/references/man5/pdu.5.rst +++ b/docs/source/guides/admin-guides/references/man5/pdu.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **pdu Attributes:**\ \ *node*\ , \ *nodetype*\ , \ *pdutype*\ , \ *outlet*\ , \ *username*\ , \ *password*\ , \ *snmpversion*\ , \ *community*\ , \ *snmpuser*\ , \ *authtype*\ , \ *authkey*\ , \ *privtype*\ , \ *privkey*\ , \ *seclevel*\ , \ *comments*\ , \ *disable*\ +\ **pdu Attributes:**\ \ *node*\ , \ *nodetype*\ , \ *pdutype*\ , \ *outlet*\ , \ *username*\ , \ *password*\ , \ *snmpversion*\ , \ *community*\ , \ *snmpuser*\ , \ *authtype*\ , \ *authkey*\ , \ *privtype*\ , \ *privkey*\ , \ *seclevel*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,100 +36,100 @@ pdu Attributes: -\ **node**\ - +\ **node**\ + The hostname/address of the pdu to which the settings apply - -\ **nodetype**\ - + +\ **nodetype**\ + The node type should be pdu - -\ **pdutype**\ - + +\ **pdutype**\ + The type of pdu - -\ **outlet**\ - + +\ **outlet**\ + The pdu outlet count - -\ **username**\ - + +\ **username**\ + The remote login user name - -\ **password**\ - + +\ **password**\ + The remote login password - -\ **snmpversion**\ - + +\ **snmpversion**\ + The version to use to communicate with switch. SNMPv1 is assumed by default. - -\ **community**\ - + +\ **community**\ + The community string to use for SNMPv1/v2 - -\ **snmpuser**\ - + +\ **snmpuser**\ + The username to use for SNMPv3 communication, ignored for SNMPv1 - -\ **authtype**\ - + +\ **authtype**\ + The authentication protocol(MD5|SHA) to use for SNMPv3. - -\ **authkey**\ - + +\ **authkey**\ + The authentication passphrase for SNMPv3 - -\ **privtype**\ - + +\ **privtype**\ + The privacy protocol(AES|DES) to use for SNMPv3. - -\ **privkey**\ - + +\ **privkey**\ + The privacy passphrase to use for SNMPv3. - -\ **seclevel**\ - + +\ **seclevel**\ + The Security Level(noAuthNoPriv|authNoPriv|authPriv) to use for SNMPv3. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -138,5 +138,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From de45b683df38d3504aa1b4032dd96ab3846ded4e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0449/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst --- .../references/man5/pduoutlet.5.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst b/docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst index cbed931c1..5d2f72bd4 100644 --- a/docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst +++ b/docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **pduoutlet Attributes:**\ \ *node*\ , \ *pdu*\ , \ *comments*\ , \ *disable*\ +\ **pduoutlet Attributes:**\ \ *node*\ , \ *pdu*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,28 +36,28 @@ pduoutlet Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **pdu**\ - + +\ **pdu**\ + a comma-separated list of outlet number for each PDU, ex: pdu1:outlet1,pdu2:outlet1 - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -66,5 +66,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From a8ad28d09f3d0bb18fc7c526c8e605321aaa6356 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0450/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/performance.5.rst --- .../references/man5/performance.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/performance.5.rst b/docs/source/guides/admin-guides/references/man5/performance.5.rst index 1af503424..c1e8afe31 100644 --- a/docs/source/guides/admin-guides/references/man5/performance.5.rst +++ b/docs/source/guides/admin-guides/references/man5/performance.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **performance Attributes:**\ \ *timestamp*\ , \ *node*\ , \ *attrname*\ , \ *attrvalue*\ , \ *comments*\ , \ *disable*\ +\ **performance Attributes:**\ \ *timestamp*\ , \ *node*\ , \ *attrname*\ , \ *attrvalue*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ performance Attributes: -\ **timestamp**\ - +\ **timestamp**\ + The time at which the metric was captured. - -\ **node**\ - + +\ **node**\ + The node name. - -\ **attrname**\ - + +\ **attrname**\ + The metric name. - -\ **attrvalue**\ - + +\ **attrvalue**\ + The metric value. - -\ **comments**\ - + +\ **comments**\ + Any user-provided notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 676e820ace4ee1f5eb4b34dbcd1c8e0e81832913 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0451/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/policy.5.rst --- .../admin-guides/references/man5/policy.5.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/policy.5.rst b/docs/source/guides/admin-guides/references/man5/policy.5.rst index 7b41a78db..f2a5357ad 100644 --- a/docs/source/guides/admin-guides/references/man5/policy.5.rst +++ b/docs/source/guides/admin-guides/references/man5/policy.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **policy Attributes:**\ \ *priority*\ , \ *name*\ , \ *host*\ , \ *commands*\ , \ *noderange*\ , \ *parameters*\ , \ *time*\ , \ *rule*\ , \ *comments*\ , \ *disable*\ +\ **policy Attributes:**\ \ *priority*\ , \ *name*\ , \ *host*\ , \ *commands*\ , \ *noderange*\ , \ *parameters*\ , \ *time*\ , \ *rule*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,64 +36,64 @@ policy Attributes: -\ **priority**\ - +\ **priority**\ + The priority value for this rule. This value is used to identify this policy data object (i.e. this rule) The table is sorted on this field with the lower the number the higher the priority. For example 1.0 is higher priority than 4.1 is higher than 4.9. - -\ **name**\ - + +\ **name**\ + The username that is allowed to perform the commands specified by this rule. Default is "\*" (all users). - -\ **host**\ - + +\ **host**\ + The host from which users may issue the commands specified by this rule. Default is "\*" (all hosts). Only all or one host is supported - -\ **commands**\ - + +\ **commands**\ + The list of commands that this rule applies to. Default is "\*" (all commands). - -\ **noderange**\ - + +\ **noderange**\ + The Noderange that this rule applies to. Default is "\*" (all nodes). Not supported with the \*def commands. - -\ **parameters**\ - + +\ **parameters**\ + A regular expression that matches the command parameters (everything except the noderange) that this rule applies to. Default is "\*" (all parameters). Not supported with the \*def commands. - -\ **time**\ - + +\ **time**\ + Time ranges that this command may be executed in. This is not supported. - -\ **rule**\ - + +\ **rule**\ + Specifies how this rule should be applied. Valid values are: allow, trusted. Allow will allow the user to run the commands. Any other value will deny the user access to the commands. Trusted means that once this client has been authenticated via the certificate, all other information that is sent (e.g. the username) is believed without question. This authorization should only be given to the xcatd on the management node at this time. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -102,5 +102,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From c3f56b3eb9da09c972c88a1e9ed41eea6c9493f7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0452/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/postscripts.5.rst --- .../references/man5/postscripts.5.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/postscripts.5.rst b/docs/source/guides/admin-guides/references/man5/postscripts.5.rst index 6bac116b9..c91b3d21e 100644 --- a/docs/source/guides/admin-guides/references/man5/postscripts.5.rst +++ b/docs/source/guides/admin-guides/references/man5/postscripts.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **postscripts Attributes:**\ \ *node*\ , \ *postscripts*\ , \ *postbootscripts*\ , \ *comments*\ , \ *disable*\ +\ **postscripts Attributes:**\ \ *node*\ , \ *postscripts*\ , \ *postbootscripts*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,34 +36,34 @@ postscripts Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **postscripts**\ - + +\ **postscripts**\ + Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". xCAT automatically adds the postscripts from the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute. For AIX, use the postbootscripts attribute. Please note that the postscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postscripts" attribute of a node with "chdef -m" command - -\ **postbootscripts**\ - + +\ **postbootscripts**\ + Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab. On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. Please note that the postbootscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postbootscripts" attribute of a node with "chdef -m" command - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -72,5 +72,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 132283afb846c69a4de3a7336fbf94bd7133ef84 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0453/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/ppc.5.rst --- .../admin-guides/references/man5/ppc.5.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/ppc.5.rst b/docs/source/guides/admin-guides/references/man5/ppc.5.rst index 3e6fed8cd..2dbcf6872 100644 --- a/docs/source/guides/admin-guides/references/man5/ppc.5.rst +++ b/docs/source/guides/admin-guides/references/man5/ppc.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **ppc Attributes:**\ \ *node*\ , \ *hcp*\ , \ *id*\ , \ *pprofile*\ , \ *parent*\ , \ *nodetype*\ , \ *supernode*\ , \ *sfp*\ , \ *comments*\ , \ *disable*\ +\ **ppc Attributes:**\ \ *node*\ , \ *hcp*\ , \ *id*\ , \ *pprofile*\ , \ *parent*\ , \ *nodetype*\ , \ *supernode*\ , \ *sfp*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,64 +36,64 @@ ppc Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **hcp**\ - + +\ **hcp**\ + The hardware control point for this node (HMC, IVM, Frame or CEC). Do not need to set for BPAs and FSPs. - -\ **id**\ - + +\ **id**\ + For LPARs: the LPAR numeric id; for CECs: the cage number; for Frames: the frame number. - -\ **pprofile**\ - + +\ **pprofile**\ + The LPAR profile that will be used the next time the LPAR is powered on with rpower. For DFM, the pprofile attribute should be set to blank - -\ **parent**\ - + +\ **parent**\ + For LPARs: the CEC; for FSPs: the CEC; for CEC: the frame (if one exists); for BPA: the frame; for frame: the building block number (which consists 1 or more service nodes and compute/storage nodes that are serviced by them - optional). - -\ **nodetype**\ - + +\ **nodetype**\ + The hardware type of the node. Only can be one of fsp, bpa, cec, frame, ivm, hmc and lpar - -\ **supernode**\ - + +\ **supernode**\ + Indicates the connectivity of this CEC in the HFI network. A comma separated list of 2 ids. The first one is the supernode number the CEC is part of. The second one is the logical location number (0-3) of this CEC within the supernode. - -\ **sfp**\ - + +\ **sfp**\ + The Service Focal Point of this Frame. This is the name of the HMC that is responsible for collecting hardware service events for this frame and all of the CECs within this frame. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -102,5 +102,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From a83cdb61ebcc76f20690f63d11624a1006038eaa Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0454/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst --- .../references/man5/ppcdirect.5.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst b/docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst index dd1002955..db01defb7 100644 --- a/docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst +++ b/docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **ppcdirect Attributes:**\ \ *hcp*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ +\ **ppcdirect Attributes:**\ \ *hcp*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,34 +36,34 @@ ppcdirect Attributes: -\ **hcp**\ - +\ **hcp**\ + Hostname of the FSPs/BPAs(for ASMI) and CECs/Frames(for DFM). - -\ **username**\ - + +\ **username**\ + Userid of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - -\ **password**\ - + +\ **password**\ + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -72,5 +72,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 5631fe8f80e97d9b5ab8fd172114e906eb8b520e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0455/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/ppchcp.5.rst --- .../admin-guides/references/man5/ppchcp.5.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/ppchcp.5.rst b/docs/source/guides/admin-guides/references/man5/ppchcp.5.rst index 80b3d3601..6b4ffa611 100644 --- a/docs/source/guides/admin-guides/references/man5/ppchcp.5.rst +++ b/docs/source/guides/admin-guides/references/man5/ppchcp.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **ppchcp Attributes:**\ \ *hcp*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ +\ **ppchcp Attributes:**\ \ *hcp*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,34 +36,34 @@ ppchcp Attributes: -\ **hcp**\ - +\ **hcp**\ + Hostname of the HMC or IVM. - -\ **username**\ - + +\ **username**\ + Userid of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is hscroot for HMCs and padmin for IVMs. - -\ **password**\ - + +\ **password**\ + Password of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is abc123 for HMCs and padmin for IVMs. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -72,5 +72,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 6b8550b86d75e45d9110b6033ff67eec68a04663 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0456/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/prescripts.5.rst --- .../references/man5/prescripts.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/prescripts.5.rst b/docs/source/guides/admin-guides/references/man5/prescripts.5.rst index 13f42e25c..4a865211f 100644 --- a/docs/source/guides/admin-guides/references/man5/prescripts.5.rst +++ b/docs/source/guides/admin-guides/references/man5/prescripts.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **prescripts Attributes:**\ \ *node*\ , \ *begin*\ , \ *end*\ , \ *comments*\ , \ *disable*\ +\ **prescripts Attributes:**\ \ *node*\ , \ *begin*\ , \ *end*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,21 +36,21 @@ prescripts Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **begin**\ - + +\ **begin**\ + The scripts to be run at the beginning of the nodeset(Linux), nimnodeset(AIX) or mkdsklsnode(AIX) command. The format is: [action1:]s1,s2...[| action2:s3,s4,s5...] where: - - action1 and action2 for Linux are the nodeset actions specified in the command. + - action1 and action2 for Linux are the nodeset actions specified in the command. For AIX, action1 and action1 can be 'diskless' for mkdsklsnode command' - and 'standalone for nimnodeset command. + and 'standalone for nimnodeset command. - s1 and s2 are the scripts to run for action1 in order. - s3, s4, and s5 are the scripts to run for actions2. If actions are omitted, the scripts apply to all actions. @@ -59,32 +59,32 @@ prescripts Attributes: diskless:myscript1,myscript2 (AIX) install:myscript1,myscript2|netboot:myscript3 (Linux) All the scripts should be copied to /install/prescripts directory. - The following two environment variables will be passed to each script: + The following two environment variables will be passed to each script: NODES a coma separated list of node names that need to run the script for ACTION current nodeset action. If '#xCAT setting:MAX_INSTANCE=number' is specified in the script, the script will get invoked for each node in parallel, but no more than number of instances will be invoked at at a time. If it is not specified, the script will be invoked once for all the nodes. - -\ **end**\ - + +\ **end**\ + The scripts to be run at the end of the nodeset(Linux), nimnodeset(AIX),or mkdsklsnode(AIX) command. The format is the same as the 'begin' column. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -93,5 +93,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From e0e7f5ff85e058c296c86a16f7f876347b783f5f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0457/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/prodkey.5.rst --- .../references/man5/prodkey.5.rst | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/prodkey.5.rst b/docs/source/guides/admin-guides/references/man5/prodkey.5.rst index 540cbfcce..e7e97f354 100644 --- a/docs/source/guides/admin-guides/references/man5/prodkey.5.rst +++ b/docs/source/guides/admin-guides/references/man5/prodkey.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **prodkey Attributes:**\ \ *node*\ , \ *product*\ , \ *key*\ , \ *comments*\ , \ *disable*\ +\ **prodkey Attributes:**\ \ *node*\ , \ *product*\ , \ *key*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,34 +36,34 @@ prodkey Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **product**\ - + +\ **product**\ + A string to identify the product (for OSes, the osname would be used, i.e. wink28 - -\ **key**\ - + +\ **key**\ + The product key relevant to the aforementioned node/group and product combination - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -72,5 +72,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 278ed518e1a2b7af6002d5c41ba47cb6d037c11a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0458/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/rack.5.rst --- .../admin-guides/references/man5/rack.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/rack.5.rst b/docs/source/guides/admin-guides/references/man5/rack.5.rst index 0784121a2..9d4767e9a 100644 --- a/docs/source/guides/admin-guides/references/man5/rack.5.rst +++ b/docs/source/guides/admin-guides/references/man5/rack.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **rack Attributes:**\ \ *rackname*\ , \ *displayname*\ , \ *num*\ , \ *height*\ , \ *room*\ , \ *comments*\ , \ *disable*\ +\ **rack Attributes:**\ \ *rackname*\ , \ *displayname*\ , \ *num*\ , \ *height*\ , \ *room*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ rack Attributes: -\ **rackname**\ - +\ **rackname**\ + The rack name. - -\ **displayname**\ - + +\ **displayname**\ + Alternative name for rack. Only used by PCM. - -\ **num**\ - + +\ **num**\ + The rack number. - -\ **height**\ - + +\ **height**\ + Number of units which can be stored in the rack. - -\ **room**\ - + +\ **room**\ + The room in which the rack is located. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 074fb3b5f0e5a2682281d41b38da59c6a575c348 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0459/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/routes.5.rst --- .../admin-guides/references/man5/routes.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/routes.5.rst b/docs/source/guides/admin-guides/references/man5/routes.5.rst index b84fa965a..8484ebc57 100644 --- a/docs/source/guides/admin-guides/references/man5/routes.5.rst +++ b/docs/source/guides/admin-guides/references/man5/routes.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **routes Attributes:**\ \ *routename*\ , \ *net*\ , \ *mask*\ , \ *gateway*\ , \ *ifname*\ , \ *comments*\ , \ *disable*\ +\ **routes Attributes:**\ \ *routename*\ , \ *net*\ , \ *mask*\ , \ *gateway*\ , \ *ifname*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ routes Attributes: -\ **routename**\ - +\ **routename**\ + Name used to identify this route. - -\ **net**\ - + +\ **net**\ + The network address. - -\ **mask**\ - + +\ **mask**\ + The network mask. - -\ **gateway**\ - + +\ **gateway**\ + The gateway that routes the ip traffic from the mn to the nodes. It is usually a service node. - -\ **ifname**\ - + +\ **ifname**\ + The interface name that facing the gateway. It is optional for IPv4 routes, but it is required for IPv6 routes. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 0bf3ad5aff66e2471c98e5a4c6b631ea6aac03b1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0460/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/servicenode.5.rst --- .../references/man5/servicenode.5.rst | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/servicenode.5.rst b/docs/source/guides/admin-guides/references/man5/servicenode.5.rst index a13cb606c..a79bc2105 100644 --- a/docs/source/guides/admin-guides/references/man5/servicenode.5.rst +++ b/docs/source/guides/admin-guides/references/man5/servicenode.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **servicenode Attributes:**\ \ *node*\ , \ *nameserver*\ , \ *dhcpserver*\ , \ *tftpserver*\ , \ *nfsserver*\ , \ *conserver*\ , \ *monserver*\ , \ *ldapserver*\ , \ *ntpserver*\ , \ *ftpserver*\ , \ *nimserver*\ , \ *ipforward*\ , \ *dhcpinterfaces*\ , \ *proxydhcp*\ , \ *comments*\ , \ *disable*\ +\ **servicenode Attributes:**\ \ *node*\ , \ *nameserver*\ , \ *dhcpserver*\ , \ *tftpserver*\ , \ *nfsserver*\ , \ *conserver*\ , \ *monserver*\ , \ *ldapserver*\ , \ *ntpserver*\ , \ *ftpserver*\ , \ *nimserver*\ , \ *ipforward*\ , \ *dhcpinterfaces*\ , \ *proxydhcp*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,100 +36,100 @@ servicenode Attributes: -\ **node**\ - +\ **node**\ + The hostname of the service node as known by the Management Node. - -\ **nameserver**\ - + +\ **nameserver**\ + Do we set up DNS on this service node? Valid values: 2, 1, or 0. If 2, creates named.conf as dns slave, using the management node as dns master, and starts named. If 1, creates named.conf file with forwarding to the management node and starts named. If 0, it does not change the current state of the service. - -\ **dhcpserver**\ - + +\ **dhcpserver**\ + Do we set up DHCP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, runs makedhcp -n. If 0, it does not change the current state of the service. - -\ **tftpserver**\ - + +\ **tftpserver**\ + Do we set up TFTP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, configures and starts atftp. If 0, it does not change the current state of the service. - -\ **nfsserver**\ - + +\ **nfsserver**\ + Do we set up file services (HTTP,FTP,or NFS) on this service node? For AIX will only setup NFS, not HTTP or FTP. Valid values:1 or 0.If 0, it does not change the current state of the service. - -\ **conserver**\ - + +\ **conserver**\ + Do we set up console service on this service node? Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon. - -\ **monserver**\ - + +\ **monserver**\ + Is this a monitoring event collection point? Valid values: 1 or 0. If 0, it does not change the current state of the service. - -\ **ldapserver**\ - + +\ **ldapserver**\ + Do we set up ldap caching proxy on this service node? Not supported on AIX. Valid values:1 or 0. If 0, it does not change the current state of the service. - -\ **ntpserver**\ - + +\ **ntpserver**\ + Not used. Use setupntp postscript to setup a ntp server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - -\ **ftpserver**\ - + +\ **ftpserver**\ + Do we set up a ftp server on this service node? Not supported on AIX Valid values:1 or 0. If 1, configure and start vsftpd. (You must manually install vsftpd on the service nodes before this.) If 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes - -\ **nimserver**\ - + +\ **nimserver**\ + Not used. Do we set up a NIM server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - -\ **ipforward**\ - + +\ **ipforward**\ + Do we set up ip forwarding on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - -\ **dhcpinterfaces**\ - + +\ **dhcpinterfaces**\ + The network interfaces DHCP server should listen on for the target node. This attribute can be used for management node and service nodes. If defined, it will override the values defined in site.dhcpinterfaces. This is a comma separated list of device names. !remote! indicates a non-local network for relay DHCP. For example: !remote!,eth0,eth1 - -\ **proxydhcp**\ - + +\ **proxydhcp**\ + Do we set up proxydhcp service on this node? valid values: 1 or 0. If 1, the proxydhcp daemon will be enabled on this node. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -138,5 +138,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 1a1ab55f4ebae23daae9ad7e65fa950e6b251801 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0461/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/site.5.rst --- .../admin-guides/references/man5/site.5.rst | 294 +++++++++--------- 1 file changed, 147 insertions(+), 147 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/site.5.rst b/docs/source/guides/admin-guides/references/man5/site.5.rst index b77143fd2..47c00f259 100644 --- a/docs/source/guides/admin-guides/references/man5/site.5.rst +++ b/docs/source/guides/admin-guides/references/man5/site.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **site Attributes:**\ \ *key*\ , \ *value*\ , \ *comments*\ , \ *disable*\ +\ **site Attributes:**\ \ *key*\ , \ *value*\ , \ *comments*\ , \ *disable*\ *********** @@ -27,9 +27,9 @@ DESCRIPTION *********** -Global settings for the whole cluster. This table is different from the -other tables in that each attribute is just named in the key column, rather -than having a separate column for each attribute. The following is a list of +Global settings for the whole cluster. This table is different from the +other tables in that each attribute is just named in the key column, rather +than having a separate column for each attribute. The following is a list of attributes currently used by xCAT organized into categories. @@ -39,23 +39,23 @@ site Attributes: -\ **key**\ - +\ **key**\ + Attribute Name: Description - - + + .. code-block:: perl - + ------------ AIX ATTRIBUTES ------------ nimprime : The name of NIM server, if not set default is the AIX MN. If Linux MN, then must be set for support of mixed cluster (TBD). - + useSSHonAIX: (yes/1 or no/0). Default is yes. The support for rsh/rcp is deprecated. useNFSv4onAIX: (yes/1 or no/0). If yes, NFSv4 will be used with NIM. If no, NFSv3 will be used with NIM. Default is no. - + ----------------- DATABASE ATTRIBUTES ----------------- @@ -67,78 +67,78 @@ site Attributes: 'ALL' means all cmds will be skipped. If attribute is null, all commands will be written. clienttype:web would skip all commands from the web client - For example: tabdump,nodels,clienttype:web + For example: tabdump,nodels,clienttype:web will not log tabdump, nodels or any web client commands. databaseloc: Directory where we create the db instance directory. Default is /var/lib. Only DB2 is currently supported. Do not use the directory in the site.installloc or installdir attribute. This attribute must not be changed once db2sqlsetup script has been run and DB2 has been setup. - + excludenodes: A set of comma separated nodes and/or groups that would automatically be subtracted from any noderange, it can be used for excluding some failed nodes for any xCAT commands. See the 'noderange' manpage for details on supported formats. - + nodestatus: If set to 'n', the nodelist.status column will not be updated during the node deployment, node discovery and power operations. The default is to update. - + skiptables: Comma separated list of tables to be skipped by dumpxCATdb - - skipvalidatelog: If set to 1, then getcredentials and getpostscripts calls will not + + skipvalidatelog: If set to 1, then getcredentials and getpostscripts calls will not be logged in syslog. - + ------------- DHCP ATTRIBUTES ------------- dhcpinterfaces: The network interfaces DHCP should listen on. If it is the same for all nodes, use a comma-separated list of the NICs. To specify different NICs - for different nodes, use the format: "xcatmn|eth1,eth2;service|bond0", - where xcatmn is the name of the management node, DHCP should listen on - the eth1 and eth2 interfaces. All the nodes in group 'service' should + for different nodes, use the format: "xcatmn|eth1,eth2;service|bond0", + where xcatmn is the name of the management node, DHCP should listen on + the eth1 and eth2 interfaces. All the nodes in group 'service' should listen on the 'bond0' interface. - + To disable the genesis kernel from being sent to specific interfaces, a ':noboot' option can be appended to the interface name. For example, if the management node has two interfaces, eth1 and eth2, disable genesis from being sent to eth1 using: "eth1:noboot,eth2". - + dhcpsetup: If set to 'n', it will skip the dhcp setup process in the nodeset cmd. - + dhcplease: The lease time for the dhcp client. The default value is 43200. - + disjointdhcps: If set to '1', the .leases file on a service node only contains the nodes it manages. And when 'sharedtftp' is disabled, nodeset handles boot loader configuration on a service node only for the nodes it manages. The default value is '0'. It means include all the nodes in the subnet. - + pruneservices: Whether to enable service pruning when noderm is run (i.e. removing DHCP entries when noderm is executed) - + managedaddressmode: The mode of networking configuration during node provision. - If set to 'static', the network configuration will be configured + If set to 'static', the network configuration will be configured in static mode based on the node and network definition on MN. If set to 'dhcp', the network will be configured with dhcp protocol. The default is 'dhcp'. - + ------------ DNS ATTRIBUTES ------------ dnshandler: Name of plugin that handles DNS setup for makedns. - + domain: The DNS domain name used for the cluster. - + forwarders: The DNS servers at your site that can provide names outside of the cluster. The makedns command will configure the DNS on the management node to forward requests it does not know to these servers. Note that the DNS servers on the - service nodes will ignore this value and always be configured to forward + service nodes will ignore this value and always be configured to forward to the management node. - - emptyzonesenable: (yes or no). This is to set empty-zones-enable value in named.conf options section. - + + emptyzonesenable: (yes or no). This is to set empty-zones-enable value in named.conf options section. + master: The hostname of the xCAT management node, as known by the nodes. - + nameservers: A comma delimited list of DNS servers that each node in the cluster should use. This value will end up in the nameserver settings of the /etc/resolv.conf on each node. It is common (but not required) to set @@ -148,172 +148,172 @@ site Attributes: "" to mean the DNS server for each node should be the node that is managing it (either its service node or the management node). - + externaldns: To specify that external dns is used. If externaldns is set to any value - then, makedns command will not start the local nameserver on xCAT MN. + then, makedns command will not start the local nameserver on xCAT MN. Default is to start the local nameserver. - + dnsupdaters: The value are ',' separated string which will be added to the zone config section. This is an interface for user to add configuration entries to the zone sections in named.conf. - + dnsinterfaces: The network interfaces DNS should listen on. If it is the same for all - nodes, use a simple comma-separated list of NICs. To specify different - NICs for different nodes, use the format: "xcatmn|eth1,eth2;service|bond0", + nodes, use a simple comma-separated list of NICs. To specify different + NICs for different nodes, use the format: "xcatmn|eth1,eth2;service|bond0", where xcatmn is the name of the management node, and DNS should listen on - the eth1 and eth2 interfaces. All the nods in group 'service' should + the eth1 and eth2 interfaces. All the nods in group 'service' should listen on the 'bond0' interface. - + NOTE: If using this attribute to block certain interfaces, make sure the IP maps to your hostname of xCAT MN is not blocked since xCAT needs to use this IP to communicate with the local NDS server on MN. - + ------------------------- HARDWARE CONTROL ATTRIBUTES ------------------------- blademaxp: The maximum number of concurrent processes for blade hardware control. - + ea_primary_hmc: The hostname of the HMC that the Integrated Switch Network Management Event Analysis should send hardware serviceable events to for processing and potentially sending to IBM. - + ea_backup_hmc: The hostname of the HMC that the Integrated Switch Network Management Event Analysis should send hardware serviceable events to if the primary HMC is down. - + enableASMI: (yes/1 or no/0). If yes, ASMI method will be used after fsp-api. If no, when fsp-api is used, ASMI method will not be used. Default is no. - + fsptimeout: The timeout, in milliseconds, to use when communicating with FSPs. - + hwctrldispatch: Whether or not to send hw control operations to the service node of the target nodes. Default is 'y'.(At present, this attribute is only used for IBM Flex System) - + ipmidispatch: Whether or not to send ipmi hw control operations to the service node of the target compute nodes. Default is 'y'. - + ipmimaxp: The max # of processes for ipmi hw ctrl. The default is 64. Currently, this is only used for HP hw control. - + ipmiretries: The # of retries to use when communicating with BMCs. Default is 3. - + ipmisdrcache: If set to 'no', then the xCAT IPMI support will not cache locally the target node's SDR cache to improve performance. - + ipmitimeout: The timeout to use when communicating with BMCs. Default is 2. This attribute is currently not used. - + maxssh: The max # of SSH connections at any one time to the hw ctrl point for PPC This parameter doesn't take effect on the rpower command. It takes effects on other PPC hardware control command getmacs/rnetboot/rbootseq and so on. Default is 8. - + syspowerinterval: For SystemP CECs, this is the number of seconds the rpower command will wait between performing the action for each CEC. For SystemX IPMI servers, this is the number of seconds the rpower command will wait between powering on nodes at a time. This - value is used to control the power on speed in large clusters. + value is used to control the power on speed in large clusters. Default is 0. - + syspowermaxnodes: The number of servers to power on at one time before waiting 'syspowerinterval' seconds to continue on to the next set of nodes. If the noderange given to rpower includes nodes served by different service nodes, it will try to spread each set of nodes across the service nodes evenly. Currently only used for IPMI servers and must be set if 'syspowerinterval' is set. - + powerinterval: The number of seconds the rpower command to LPARs will wait between performing the action for each LPAR. LPARs of different HCPs (HMCs or FSPs) are done in parallel. This is used to limit the cluster boot up speed in large clusters. Default is 0. This is currently only used for system p hardware. - + ppcmaxp: The max # of processes for PPC hw ctrl. If there are more than ppcmaxp hcps, this parameter will take effect. It will control the max number of processes for PPC hardware control commands. Default is 64. - + ppcretry: The max # of PPC hw connection attempts to HMC before failing. - It only takes effect on the hardware control commands through HMC. + It only takes effect on the hardware control commands through HMC. Default is 3. - + ppctimeout: The timeout, in milliseconds, to use when communicating with PPC hw through HMC. It only takes effect on the hardware control commands through HMC. Default is 0. - + snmpc: The snmp community string that xcat should use when communicating with the switches. - + --------------------------- INSTALL/DEPLOYMENT ATTRIBUTES --------------------------- cleanupxcatpost: (yes/1 or no/0). Set to 'yes' or '1' to clean up the /xcatpost directory on the stateless and statelite nodes after the postscripts are run. Default is no. - + db2installloc: The location which the service nodes should mount for the db2 code to install. Format is hostname:/path. If hostname is omitted, it defaults to the management node. Default is /mntdb2. - + defserialflow: The default serial flow - currently only used by the mknb command. - + defserialport: The default serial port - currently only used by mknb. - + defserialspeed: The default serial speed - currently only used by mknb. - + disablenodesetwarning: Allow the legacy xCAT non-osimage style nodeset to execute. - + genmacprefix: When generating mac addresses automatically, use this manufacturing prefix (e.g. 00:11:aa) - + genpasswords: Automatically generate random passwords for BMCs when configuring them. - + installdir: The local directory name used to hold the node deployment packages. - - installloc: The location from which the service nodes should mount the + + installloc: The location from which the service nodes should mount the deployment packages in the format hostname:/path. If hostname is omitted, it defaults to the management node. The path must match the path in the installdir attribute. - + iscsidir: The path to put the iscsi disks in on the mgmt node. - + mnroutenames: The name of the routes to be setup on the management node. It is a comma separated list of route names that are defined in the routes table. - + runbootscripts: If set to 'yes' the scripts listed in the postbootscripts attribute in the osimage and postscripts tables will be run during each reboot of stateful (diskful) nodes. This attribute has no effect on stateless and statelite nodes. Run the following - command after you change the value of this attribute: + command after you change the value of this attribute: 'updatenode -P setuppostbootscripts' - - precreatemypostscripts: (yes/1 or no/0). Default is no. If yes, it will + + precreatemypostscripts: (yes/1 or no/0). Default is no. If yes, it will instruct xCAT at nodeset and updatenode time to query the db once for all of the nodes passed into the cmd and create the mypostscript file for each node, and put them in a directory of tftpdir(such as: /tftpboot) If no, it will not generate the mypostscript file in the tftpdir. - + secureroot: If set to 1, xCAT will use secure mode to transfer root password hash during the installation. Default is 0. setinstallnic: Set the network configuration for installnic to be static. - + sharedtftp: Set to 0 or no, xCAT should not assume the directory in tftpdir is mounted on all on Service Nodes. Default is 1/yes. If value is set to a hostname, the directory in tftpdir will be mounted from that hostname on the SN - + sharedinstall: Indicates if a shared file system will be used for installation - resources. Possible values are: 'no', 'sns', or 'all'. 'no' + resources. Possible values are: 'no', 'sns', or 'all'. 'no' means a shared file system is not being used. 'sns' means a shared filesystem is being used across all service nodes. 'all' means that the management as well as the service nodes are all using a common shared filesystem. The default is 'no'. - + xcatconfdir: Where xCAT config data is (default /etc/xcat). - + xcatdebugmode: the xCAT debug level. xCAT provides a batch of techniques to help user debug problems while using xCAT, especially on OS provision, such as collecting logs of the whole installation process and accessing @@ -325,109 +325,109 @@ site Attributes: '2': enable expert debug mode For the details on 'basic debug mode' and 'expert debug mode', refer to xCAT documentation. - + -------------------- REMOTESHELL ATTRIBUTES -------------------- nodesyncfiledir: The directory on the node, where xdcp will rsync the files - + SNsyncfiledir: The directory on the Service Node, where xdcp will rsync the files from the MN that will eventually be rsync'd to the compute nodes. - + sshbetweennodes: Comma separated list of groups of compute nodes to enable passwordless root ssh to the nodes during install or running 'xdsh -K'. The default is ALLGROUPS. Set to NOGROUPS to disable. - + Service Nodes are not affected by this attribute as they are always configured with passwordless root access. If using the zone table, this attribute in not used. - + ----------------- SERVICES ATTRIBUTES ----------------- consoleondemand: When set to 'yes', conserver connects and creates the console output only when the user opens the console. Default is 'no' on Linux, 'yes' on AIX. - + httpport: The port number that the booting/installing nodes should contact the http server on the MN/SN on. It is your responsibility to configure the http server to listen on that port - xCAT will not do that. - - nmapoptions: Additional options for the nmap command. nmap is used in pping, - nodestat, xdsh -v and updatenode commands. Sometimes additional + + nmapoptions: Additional options for the nmap command. nmap is used in pping, + nodestat, xdsh -v and updatenode commands. Sometimes additional performance tuning may be needed for nmap due to network traffic. For example, if the network response time is too slow, nmap may not - give stable output. You can increase the timeout value by specifying - '--min-rtt-timeout 1s'. xCAT will append the options defined here to + give stable output. You can increase the timeout value by specifying + '--min-rtt-timeout 1s'. xCAT will append the options defined here to the nmap command. - + ntpservers: A comma delimited list of NTP servers for the service node and the compute node to sync with. The keyword means that the node's NTP server is the node that is managing it (either its service node or the management node). - + extntpservers: A comma delimited list of external NTP servers for the xCAT management node to sync with. If it is empty, the NTP server will use the management node's own hardware clock to calculate the system date and time - + svloglocal: If set to 1, syslog on the service node will not get forwarded to the management node. - + timezone: (e.g. America/New_York) - + tftpdir: The tftp directory path. Default is /tftpboot - - tftpflags: The flags that used to start tftpd. Default is '-v -l -s /tftpboot + + tftpflags: The flags that used to start tftpd. Default is '-v -l -s /tftpboot -m /etc/tftpmapfile4xcat.conf' if tftplfags is not set - + useNmapfromMN: When set to yes, nodestat command should obtain the node status using nmap (if available) from the management node instead of the service node. This will improve the performance in a flat network. - + vsftp: Default is 'n'. If set to 'y', xcatd on the management node will automatically start vsftpd. (vsftpd must be installed by the admin). This setting does not apply to service nodes. For service nodes, set servicenode.ftpserver=1. - - FQDNfirst: Fully Qualified Domain Name first. If set to 1/yes/enable, the /etc/hosts - entries generated by 'makehosts' will put the FQDN before the PQDN(Partially + + FQDNfirst: Fully Qualified Domain Name first. If set to 1/yes/enable, the /etc/hosts + entries generated by 'makehosts' will put the FQDN before the PQDN(Partially Qualified Domain Name). Otherwise, the original behavior will be performed. - + hierarchicalattrs: Table attributes(e.g. postscripts, postbootscripts) that will be included hierarchically. Attribute values for all the node's groups will be applied to the node in the groups' order except the repeat one. - dbtracelevel: The trace level for the database access log. To activate this setting, please. + dbtracelevel: The trace level for the database access log. To activate this setting, please. restart xcatd or send HUP signal to the 'xcatd: DB Access' process, Like: . - ps -ef | grep 'xcatd: DB Access' | grep -v grep | awk '{print $2}' | xargs kill -HUP - Currrent support values: - 0: disable the trace log for db - 1: trace the calls of database subroutines - 2: Besides the log from level 1, trace the event to build the cache for the table - 3: Besides the log from level 2, trace the event with cache hit - 4: Besides the log from level 3, trace the SQL statement for the db access - With this configuration, xcat will send the log to syslog very frequently, some of the - log may be lost if imjournal is enabled by rsyslog. + ps -ef | grep 'xcatd: DB Access' | grep -v grep | awk '{print $2}' | xargs kill -HUP + Currrent support values: + 0: disable the trace log for db + 1: trace the calls of database subroutines + 2: Besides the log from level 1, trace the event to build the cache for the table + 3: Besides the log from level 2, trace the event with cache hit + 4: Besides the log from level 3, trace the SQL statement for the db access + With this configuration, xcat will send the log to syslog very frequently, some of the + log may be lost if imjournal is enabled by rsyslog. Please see https://github.com/xcat2/xcat-core/issues/3910 for the detail. - + ----------------------- VIRTUALIZATION ATTRIBUTES ----------------------- usexhrm: Have xCAT execute the xHRM script when booting up KVM guests to configure the virtual network bridge. - + vcenterautojoin: When set to no, the VMWare plugin will not attempt to auto remove and add hypervisors while trying to perform operations. If users or tasks outside of xCAT perform the joining this assures xCAT will not interfere. - + vmwarereconfigonpower: When set to no, the VMWare plugin will make no effort to push vm.cpus/vm.memory updates from xCAT to VMWare. - + persistkvmguests: Keep the kvm definition on the kvm hypervisor when you power off - the kvm guest node. This is useful for you to manually change the + the kvm guest node. This is useful for you to manually change the kvm xml definition file in virsh for debugging. Set anything means enable. - + -------------------- XCAT DAEMON ATTRIBUTES -------------------- @@ -443,43 +443,43 @@ site Attributes: xcatd, and retry. The default is no. See the following document for details: Hints_and_Tips_for_Large_Scale_Clusters - + xcatmaxconnections: Number of concurrent xCAT protocol requests before requests begin queueing. This applies to both client command requests and node requests, e.g. to get postscripts. Default is 64. - + xcatmaxbatchconnections: Number of concurrent xCAT connections allowed from the nodes. Value must be less than xcatmaxconnections. Default is 50. - + xcatdport: The port used by the xcatd daemon for client/server communication. - + xcatiport: The port used by xcatd to receive install status updates from nodes. - + xcatlport: The port used by xcatd command log writer process to collect command output. - + xcatsslversion: The ssl version by xcatd. Default is SSLv3. - + xcatsslciphers: The ssl cipher by xcatd. Default is 3DES. - - -\ **value**\ - + + +\ **value**\ + The value of the attribute specified in the "key" column. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -488,5 +488,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 6e52467748680b9374062f53e13b4c9241b003e4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0462/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/statelite.5.rst --- .../references/man5/statelite.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/statelite.5.rst b/docs/source/guides/admin-guides/references/man5/statelite.5.rst index 3b9f6e1b0..ee7fc3860 100644 --- a/docs/source/guides/admin-guides/references/man5/statelite.5.rst +++ b/docs/source/guides/admin-guides/references/man5/statelite.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **statelite Attributes:**\ \ *node*\ , \ *image*\ , \ *statemnt*\ , \ *mntopts*\ , \ *comments*\ , \ *disable*\ +\ **statelite Attributes:**\ \ *node*\ , \ *image*\ , \ *statemnt*\ , \ *mntopts*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ statelite Attributes: -\ **node**\ - +\ **node**\ + The name of the node or group that will use this location. - -\ **image**\ - + +\ **image**\ + Reserved for future development, not used. - -\ **statemnt**\ - + +\ **statemnt**\ + The persistent read/write area where a node's persistent files will be written to, e.g: 10.0.0.1/state/. The node name will be automatically added to the pathname, so 10.0.0.1:/state, will become 10.0.0.1:/state/. - -\ **mntopts**\ - + +\ **mntopts**\ + A comma-separated list of options to use when mounting the persistent directory. (Ex. 'soft') The default is to do a 'hard' mount. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From f0a804b362fe10189d3aa88902761bba0937e697 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0463/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/storage.5.rst --- .../references/man5/storage.5.rst | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/storage.5.rst b/docs/source/guides/admin-guides/references/man5/storage.5.rst index dd48879bb..b0f6d4b17 100644 --- a/docs/source/guides/admin-guides/references/man5/storage.5.rst +++ b/docs/source/guides/admin-guides/references/man5/storage.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **storage Attributes:**\ \ *node*\ , \ *osvolume*\ , \ *size*\ , \ *state*\ , \ *storagepool*\ , \ *hypervisor*\ , \ *fcprange*\ , \ *volumetag*\ , \ *type*\ , \ *controller*\ , \ *comments*\ , \ *disable*\ +\ **storage Attributes:**\ \ *node*\ , \ *osvolume*\ , \ *size*\ , \ *state*\ , \ *storagepool*\ , \ *hypervisor*\ , \ *fcprange*\ , \ *volumetag*\ , \ *type*\ , \ *controller*\ , \ *comments*\ , \ *disable*\ *********** @@ -34,86 +34,86 @@ storage Attributes: -\ **node**\ - +\ **node**\ + The node name - -\ **osvolume**\ - + +\ **osvolume**\ + Specification of what storage to place the node OS image onto. Examples include: - - + + .. code-block:: perl - + localdisk (Install to first non-FC attached disk) usbdisk (Install to first USB mass storage device seen) wwn=0x50000393c813840c (Install to storage device with given WWN) - - -\ **size**\ - + + +\ **size**\ + Size of the volume. Examples include: 10G, 1024M. - -\ **state**\ - + +\ **state**\ + State of the volume. The valid values are: free, used, and allocated - -\ **storagepool**\ - + +\ **storagepool**\ + Name of storage pool where the volume is assigned. - -\ **hypervisor**\ - + +\ **hypervisor**\ + Name of the hypervisor where the volume is configured. - -\ **fcprange**\ - + +\ **fcprange**\ + A range of acceptable fibre channels that the volume can use. Examples include: 3B00-3C00;4B00-4C00. - -\ **volumetag**\ - + +\ **volumetag**\ + A specific tag used to identify the volume in the autoyast or kickstart template. - -\ **type**\ - + +\ **type**\ + The plugin used to drive storage configuration (e.g. svc) - -\ **controller**\ - + +\ **controller**\ + The management address to attach/detach new volumes. In the scenario involving multiple controllers, this data must be passed as argument rather than by table value - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -122,5 +122,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 5a39f12da6ab1af23bd7473f1bd26e806bbaf8bd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0464/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/switch.5.rst --- .../admin-guides/references/man5/switch.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/switch.5.rst b/docs/source/guides/admin-guides/references/man5/switch.5.rst index 9e6d9c099..28ff4499a 100644 --- a/docs/source/guides/admin-guides/references/man5/switch.5.rst +++ b/docs/source/guides/admin-guides/references/man5/switch.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **switch Attributes:**\ \ *node*\ , \ *switch*\ , \ *port*\ , \ *vlan*\ , \ *interface*\ , \ *comments*\ , \ *disable*\ +\ **switch Attributes:**\ \ *node*\ , \ *switch*\ , \ *port*\ , \ *vlan*\ , \ *interface*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ switch Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **switch**\ - + +\ **switch**\ + The switch hostname. - -\ **port**\ - + +\ **port**\ + The port number in the switch that this node is connected to. On a simple 1U switch, an administrator can generally enter the number as printed next to the ports, and xCAT will understand switch representation differences. On stacked switches or switches with line cards, administrators should usually use the CLI representation (i.e. 2/0/1 or 5/8). One notable exception is stacked SMC 8848M switches, in which you must add 56 for the proceeding switch, then the port number. For example, port 3 on the second switch in an SMC8848M stack would be 59 - -\ **vlan**\ - + +\ **vlan**\ + The ID for the tagged vlan that is created on this port using mkvlan and chvlan commands. - -\ **interface**\ - + +\ **interface**\ + The interface name from the node perspective. For example, eth0. For the primary nic, it can be empty, the word "primary" or "primary:ethx" where ethx is the interface name. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From bbf300ea26ce02b57b7ec8e42afee6c578c0221d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0465/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/switches.5.rst --- .../references/man5/switches.5.rst | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/switches.5.rst b/docs/source/guides/admin-guides/references/man5/switches.5.rst index 86b4ec0f7..37f7b677f 100644 --- a/docs/source/guides/admin-guides/references/man5/switches.5.rst +++ b/docs/source/guides/admin-guides/references/man5/switches.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **switches Attributes:**\ \ *switch*\ , \ *snmpversion*\ , \ *username*\ , \ *password*\ , \ *privacy*\ , \ *auth*\ , \ *linkports*\ , \ *sshusername*\ , \ *sshpassword*\ , \ *protocol*\ , \ *switchtype*\ , \ *comments*\ , \ *disable*\ +\ **switches Attributes:**\ \ *switch*\ , \ *snmpversion*\ , \ *username*\ , \ *password*\ , \ *privacy*\ , \ *auth*\ , \ *linkports*\ , \ *sshusername*\ , \ *sshpassword*\ , \ *protocol*\ , \ *switchtype*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,77 +36,77 @@ switches Attributes: -\ **switch**\ - +\ **switch**\ + The hostname/address of the switch to which the settings apply - -\ **snmpversion**\ - + +\ **snmpversion**\ + The version to use to communicate with switch. SNMPv1 is assumed by default. - -\ **username**\ - + +\ **username**\ + The username to use for SNMPv3 communication, ignored for SNMPv1 - -\ **password**\ - + +\ **password**\ + The password string for SNMPv3 or community string for SNMPv1/SNMPv2. Falls back to passwd table, and site snmpc value if using SNMPv1/SNMPv2. - -\ **privacy**\ - + +\ **privacy**\ + The privacy protocol to use for v3. xCAT will use authNoPriv if this is unspecified. DES is recommended to use if v3 enabled, as it is the most readily available. - -\ **auth**\ - + +\ **auth**\ + The authentication protocol to use for SNMPv3. SHA is assumed if v3 enabled and this is unspecified - -\ **linkports**\ - + +\ **linkports**\ + The ports that connect to other switches. Currently, this column is only used by vlan configuration. The format is: "port_number:switch,port_number:switch...". Refer to the switch table for details on how to specify the port numbers. - -\ **sshusername**\ - + +\ **sshusername**\ + The remote login user name. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. - -\ **sshpassword**\ - + +\ **sshpassword**\ + The remote login password. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. - -\ **protocol**\ - + +\ **protocol**\ + Protocol for running remote commands for the switch. The valid values are: ssh, telnet. ssh is the default. If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. The passwd.comments attribute is used for protocol. - -\ **switchtype**\ - + +\ **switchtype**\ + The type of switch. It is used to identify the file name that implements the functions for this switch. The valid values are: Mellanox, Cisco, BNT and Juniper. - - - -\ **comments**\ -\ **disable**\ +\ **comments**\ + + + +\ **disable**\ @@ -116,5 +116,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 8cf2a2d94651b4ef6b68be492548821b4c27ab57 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0466/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/taskstate.5.rst --- .../references/man5/taskstate.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/taskstate.5.rst b/docs/source/guides/admin-guides/references/man5/taskstate.5.rst index 1d7fc2e4f..2860e5573 100644 --- a/docs/source/guides/admin-guides/references/man5/taskstate.5.rst +++ b/docs/source/guides/admin-guides/references/man5/taskstate.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **taskstate Attributes:**\ \ *node*\ , \ *command*\ , \ *state*\ , \ *pid*\ , \ *reserve*\ , \ *disable*\ +\ **taskstate Attributes:**\ \ *node*\ , \ *command*\ , \ *state*\ , \ *pid*\ , \ *reserve*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ taskstate Attributes: -\ **node**\ - +\ **node**\ + The node name. - -\ **command**\ - + +\ **command**\ + Current command is running - -\ **state**\ - + +\ **state**\ + The task state(callback, running) for the node. - -\ **pid**\ - + +\ **pid**\ + The process id of the request process. - -\ **reserve**\ - + +\ **reserve**\ + used to lock the node - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 427db0e1cd787636cc06d7fd4328fb87fbcd5dc9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0467/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/token.5.rst --- .../admin-guides/references/man5/token.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/token.5.rst b/docs/source/guides/admin-guides/references/man5/token.5.rst index 5089aa16b..0351e5c41 100644 --- a/docs/source/guides/admin-guides/references/man5/token.5.rst +++ b/docs/source/guides/admin-guides/references/man5/token.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **token Attributes:**\ \ *tokenid*\ , \ *username*\ , \ *expire*\ , \ *created*\ , \ *access*\ , \ *comments*\ , \ *disable*\ +\ **token Attributes:**\ \ *tokenid*\ , \ *username*\ , \ *expire*\ , \ *created*\ , \ *access*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ token Attributes: -\ **tokenid**\ - +\ **tokenid**\ + It is a UUID as an unified identify for the user. - -\ **username**\ - + +\ **username**\ + The user name. - -\ **expire**\ - + +\ **expire**\ + The expire time for this token. - -\ **created**\ - + +\ **created**\ + Creation time for this token. - -\ **access**\ - + +\ **access**\ + Last access time for this token. - -\ **comments**\ - + +\ **comments**\ + Any user-provided notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From d26c172cefaf5958e849ed2868f7a96091e83737 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0468/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/virtsd.5.rst --- .../admin-guides/references/man5/virtsd.5.rst | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/virtsd.5.rst b/docs/source/guides/admin-guides/references/man5/virtsd.5.rst index 9ff5547de..410b81968 100644 --- a/docs/source/guides/admin-guides/references/man5/virtsd.5.rst +++ b/docs/source/guides/admin-guides/references/man5/virtsd.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **virtsd Attributes:**\ \ *node*\ , \ *sdtype*\ , \ *stype*\ , \ *location*\ , \ *host*\ , \ *cluster*\ , \ *datacenter*\ , \ *comments*\ , \ *disable*\ +\ **virtsd Attributes:**\ \ *node*\ , \ *sdtype*\ , \ *stype*\ , \ *location*\ , \ *host*\ , \ *cluster*\ , \ *datacenter*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,53 +36,53 @@ virtsd Attributes: -\ **node**\ - +\ **node**\ + The name of the storage domain - -\ **sdtype**\ - + +\ **sdtype**\ + The type of storage domain. Valid values: data, iso, export - -\ **stype**\ - + +\ **stype**\ + The type of storge. Valid values: nfs, fcp, iscsi, localfs - -\ **location**\ - + +\ **location**\ + The path of the storage - -\ **host**\ - + +\ **host**\ + For rhev, a hypervisor host needs to be specified to manage the storage domain as SPM (Storage Pool Manager). But the SPM role will be failed over to another host when this host down. - -\ **cluster**\ - + +\ **cluster**\ + A cluster of hosts - -\ **datacenter**\ - + +\ **datacenter**\ + A collection for all host, vm that will shared the same storages, networks. - - - -\ **comments**\ -\ **disable**\ +\ **comments**\ + + + +\ **disable**\ @@ -92,5 +92,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 4e466ba4098922c338ef00ae78e00a0b459d8844 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0469/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/vm.5.rst --- .../admin-guides/references/man5/vm.5.rst | 190 +++++++++--------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/vm.5.rst b/docs/source/guides/admin-guides/references/man5/vm.5.rst index 74cf3b400..167ade986 100644 --- a/docs/source/guides/admin-guides/references/man5/vm.5.rst +++ b/docs/source/guides/admin-guides/references/man5/vm.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **vm Attributes:**\ \ *node*\ , \ *mgr*\ , \ *host*\ , \ *migrationdest*\ , \ *storage*\ , \ *storagemodel*\ , \ *storagecache*\ , \ *storageformat*\ , \ *cfgstore*\ , \ *memory*\ , \ *cpus*\ , \ *nics*\ , \ *nicmodel*\ , \ *bootorder*\ , \ *clockoffset*\ , \ *virtflags*\ , \ *master*\ , \ *vncport*\ , \ *textconsole*\ , \ *powerstate*\ , \ *beacon*\ , \ *datacenter*\ , \ *cluster*\ , \ *guestostype*\ , \ *othersettings*\ , \ *physlots*\ , \ *vidmodel*\ , \ *vidproto*\ , \ *vidpassword*\ , \ *comments*\ , \ *disable*\ +\ **vm Attributes:**\ \ *node*\ , \ *mgr*\ , \ *host*\ , \ *migrationdest*\ , \ *storage*\ , \ *storagemodel*\ , \ *storagecache*\ , \ *storageformat*\ , \ *cfgstore*\ , \ *memory*\ , \ *cpus*\ , \ *nics*\ , \ *nicmodel*\ , \ *bootorder*\ , \ *clockoffset*\ , \ *virtflags*\ , \ *master*\ , \ *vncport*\ , \ *textconsole*\ , \ *powerstate*\ , \ *beacon*\ , \ *datacenter*\ , \ *cluster*\ , \ *guestostype*\ , \ *othersettings*\ , \ *physlots*\ , \ *vidmodel*\ , \ *vidproto*\ , \ *vidpassword*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,99 +36,99 @@ vm Attributes: -\ **node**\ - +\ **node**\ + The node or static group name - -\ **mgr**\ - + +\ **mgr**\ + The function manager for the virtual machine - -\ **host**\ - + +\ **host**\ + The system that currently hosts the VM - -\ **migrationdest**\ - + +\ **migrationdest**\ + A noderange representing candidate destinations for migration (i.e. similar systems, same SAN, or other criteria that xCAT can use - -\ **storage**\ - + +\ **storage**\ + A list of storage files or devices to be used. i.e. dir:///cluster/vm/ or nfs:///path/to/folder/ - -\ **storagemodel**\ - + +\ **storagemodel**\ + Model of storage devices to provide to guest - -\ **storagecache**\ - + +\ **storagecache**\ + Select caching scheme to employ. E.g. KVM understands 'none', 'writethrough' and 'writeback' - -\ **storageformat**\ - + +\ **storageformat**\ + Select disk format to use by default (e.g. raw versus qcow2) - -\ **cfgstore**\ - + +\ **cfgstore**\ + Optional location for persistent storage separate of emulated hard drives for virtualization solutions that require persistent store to place configuration data - -\ **memory**\ - + +\ **memory**\ + Megabytes of memory the VM currently should be set to. - -\ **cpus**\ - + +\ **cpus**\ + Number of CPUs the node should see. - -\ **nics**\ - + +\ **nics**\ + Network configuration parameters. Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan. physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches. hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible. - -\ **nicmodel**\ - + +\ **nicmodel**\ + Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc) - -\ **bootorder**\ - + +\ **bootorder**\ + Boot sequence (i.e. net,hd) - -\ **clockoffset**\ - + +\ **clockoffset**\ + Whether to have guest RTC synced to "localtime" or "utc" If not populated, xCAT will guess based on the nodetype.os contents. - -\ **virtflags**\ - - General flags used by the virtualization method. + +\ **virtflags**\ + + General flags used by the virtualization method. For example, in Xen it could, among other things, specify paravirtualized setup, or direct kernel boot. For a hypervisor/dom0 entry, it is the virtualization method (i.e. "xen"). For KVM, the following flag=value pairs are recognized: imageformat=[raw|fullraw|qcow2] raw is a generic sparse file that allocates storage on demand @@ -136,94 +136,94 @@ vm Attributes: qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level clonemethod=[qemu-img|reflink] qemu-img allows use of qcow2 to generate virtualization layer copy-on-write - reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs + reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs placement_affinity=[migratable|user_migratable|pinned] - -\ **master**\ - + +\ **master**\ + The name of a master image, if any, this virtual machine is linked to. This is generally set by clonevm and indicates the deletion of a master that would invalidate the storage of this virtual machine - -\ **vncport**\ - + +\ **vncport**\ + Tracks the current VNC display port (currently not meant to be set - -\ **textconsole**\ - + +\ **textconsole**\ + Tracks the Psuedo-TTY that maps to the serial port or console of a VM - -\ **powerstate**\ - + +\ **powerstate**\ + This flag is used by xCAT to track the last known power state of the VM. - -\ **beacon**\ - + +\ **beacon**\ + This flag is used by xCAT to track the state of the identify LED with respect to the VM. - -\ **datacenter**\ - + +\ **datacenter**\ + Optionally specify a datacenter for the VM to exist in (only applicable to VMWare) - -\ **cluster**\ - + +\ **cluster**\ + Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor. - -\ **guestostype**\ - + +\ **guestostype**\ + This allows administrator to specify an identifier for OS to pass through to virtualization stack. Normally this should be ignored as xCAT will translate from nodetype.os rather than requiring this field be used - -\ **othersettings**\ - + +\ **othersettings**\ + This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\ on the host. - -\ **physlots**\ - + +\ **physlots**\ + Specify the physical slots drc index that will assigned to the partition, the delimiter is ',', and the drc index must started with '0x'. For more details, reference manpage for 'lsvm'. - -\ **vidmodel**\ - + +\ **vidmodel**\ + Model of video adapter to provide to guest. For example, qxl in KVM - -\ **vidproto**\ - + +\ **vidproto**\ + Request a specific protocol for remote video access be set up. For example, spice in KVM. - -\ **vidpassword**\ - + +\ **vidpassword**\ + Password to use instead of temporary random tokens for VNC and SPICE access - - - -\ **comments**\ -\ **disable**\ +\ **comments**\ + + + +\ **disable**\ @@ -233,5 +233,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 1466b0bee51e6a7eb1c5cd86ce80721502a793d1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0470/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/vmmaster.5.rst --- .../references/man5/vmmaster.5.rst | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/vmmaster.5.rst b/docs/source/guides/admin-guides/references/man5/vmmaster.5.rst index cdceff5db..e974898a8 100644 --- a/docs/source/guides/admin-guides/references/man5/vmmaster.5.rst +++ b/docs/source/guides/admin-guides/references/man5/vmmaster.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **vmmaster Attributes:**\ \ *name*\ , \ *os*\ , \ *arch*\ , \ *profile*\ , \ *storage*\ , \ *storagemodel*\ , \ *nics*\ , \ *vintage*\ , \ *originator*\ , \ *virttype*\ , \ *specializeparameters*\ , \ *comments*\ , \ *disable*\ +\ **vmmaster Attributes:**\ \ *name*\ , \ *os*\ , \ *arch*\ , \ *profile*\ , \ *storage*\ , \ *storagemodel*\ , \ *nics*\ , \ *vintage*\ , \ *originator*\ , \ *virttype*\ , \ *specializeparameters*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,77 +36,77 @@ vmmaster Attributes: -\ **name**\ - +\ **name**\ + The name of a master - -\ **os**\ - + +\ **os**\ + The value of nodetype.os at the time the master was captured - -\ **arch**\ - + +\ **arch**\ + The value of nodetype.arch at the time of capture - -\ **profile**\ - + +\ **profile**\ + The value of nodetype.profile at time of capture - -\ **storage**\ - + +\ **storage**\ + The storage location of bulk master information - -\ **storagemodel**\ - + +\ **storagemodel**\ + The default storage style to use when modifying a vm cloned from this master - -\ **nics**\ - + +\ **nics**\ + The nic configuration and relationship to vlans/bonds/etc - -\ **vintage**\ - + +\ **vintage**\ + When this image was created - -\ **originator**\ - + +\ **originator**\ + The user who created the image - -\ **virttype**\ - + +\ **virttype**\ + The type of virtualization this image pertains to (e.g. vmware, kvm, etc) - -\ **specializeparameters**\ - + +\ **specializeparameters**\ + Implementation specific arguments, currently only "autoLogonCount= Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0471/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/vpd.5.rst --- .../admin-guides/references/man5/vpd.5.rst | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/vpd.5.rst b/docs/source/guides/admin-guides/references/man5/vpd.5.rst index eabf05441..4b14c4793 100644 --- a/docs/source/guides/admin-guides/references/man5/vpd.5.rst +++ b/docs/source/guides/admin-guides/references/man5/vpd.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **vpd Attributes:**\ \ *node*\ , \ *serial*\ , \ *mtm*\ , \ *side*\ , \ *asset*\ , \ *uuid*\ , \ *comments*\ , \ *disable*\ +\ **vpd Attributes:**\ \ *node*\ , \ *serial*\ , \ *mtm*\ , \ *side*\ , \ *asset*\ , \ *uuid*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,52 +36,52 @@ vpd Attributes: -\ **node**\ - +\ **node**\ + The node name or group name. - -\ **serial**\ - + +\ **serial**\ + The serial number of the node. - -\ **mtm**\ - + +\ **mtm**\ + The machine type and model number of the node. E.g. 7984-6BU - -\ **side**\ - + +\ **side**\ + - or -. The side information for the BPA/FSP. The side attribute refers to which BPA/FSP, A or B, which is determined by the slot value returned from lsslp command. It also lists the physical port within each BPA/FSP which is determined by the IP address order from the lsslp response. This information is used internally when communicating with the BPAs/FSPs - -\ **asset**\ - + +\ **asset**\ + A field for administrators to use to correlate inventory numbers they may have to accommodate - -\ **uuid**\ - + +\ **uuid**\ + The UUID applicable to the node - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -90,5 +90,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 3ffb12bdd5c8129428660824716296b5062ac514 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0472/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/websrv.5.rst --- .../admin-guides/references/man5/websrv.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/websrv.5.rst b/docs/source/guides/admin-guides/references/man5/websrv.5.rst index 437e45619..1146aaa7f 100644 --- a/docs/source/guides/admin-guides/references/man5/websrv.5.rst +++ b/docs/source/guides/admin-guides/references/man5/websrv.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **websrv Attributes:**\ \ *node*\ , \ *port*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ +\ **websrv Attributes:**\ \ *node*\ , \ *port*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ websrv Attributes: -\ **node**\ - +\ **node**\ + The web service hostname. - -\ **port**\ - + +\ **port**\ + The port of the web service. - -\ **username**\ - + +\ **username**\ + Userid to use to access the web service. - -\ **password**\ - + +\ **password**\ + Password to use to access the web service. - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 2bbd9b4c7281bd77b091ebf8a730aea564efe057 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0473/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/winimage.5.rst --- .../references/man5/winimage.5.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/winimage.5.rst b/docs/source/guides/admin-guides/references/man5/winimage.5.rst index 073521acf..cc0c1c8ae 100644 --- a/docs/source/guides/admin-guides/references/man5/winimage.5.rst +++ b/docs/source/guides/admin-guides/references/man5/winimage.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **winimage Attributes:**\ \ *imagename*\ , \ *template*\ , \ *installto*\ , \ *partitionfile*\ , \ *winpepath*\ , \ *comments*\ , \ *disable*\ +\ **winimage Attributes:**\ \ *imagename*\ , \ *template*\ , \ *installto*\ , \ *partitionfile*\ , \ *winpepath*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,46 +36,46 @@ winimage Attributes: -\ **imagename**\ - +\ **imagename**\ + The name of this xCAT OS image definition. - -\ **template**\ - + +\ **template**\ + The fully qualified name of the template file that is used to create the windows unattend.xml file for diskful installation. - -\ **installto**\ - + +\ **installto**\ + The disk and partition that the Windows will be deployed to. The valid format is :. If not set, default value is 0:1 for bios boot mode(legacy) and 0:3 for uefi boot mode; If setting to 1, it means 1:1 for bios boot and 1:3 for uefi boot - -\ **partitionfile**\ - + +\ **partitionfile**\ + The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file can include both configurations if you need to support both bios and uefi mode. Either way, you must specify the boot mode in the configuration. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section like [INSTALLTO]0:1 - -\ **winpepath**\ - + +\ **winpepath**\ + The path of winpe which will be used to boot this image. If the real path is /tftpboot/winboot/winpe1/, the value for winpepath should be set to winboot/winpe1 - -\ **comments**\ - + +\ **comments**\ + Any user-written notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -84,5 +84,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From bd21d86c4e60cc89a230b044947353d0160de764 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0474/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/xcatdb.5.rst --- .../admin-guides/references/man5/xcatdb.5.rst | 368 +++++++++--------- 1 file changed, 184 insertions(+), 184 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst b/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst index 58a39fed8..414872f75 100644 --- a/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst +++ b/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst @@ -33,7 +33,7 @@ xCAT allows the use of different database applications, depending on the needs o The default database is SQLite, which is a daemonless, zero-config database. But you could instead choose to use something like postgresql for greater scalability and remote access in the hierarchical/service node case. To use a different database or a different location, create -the file /etc/xcat/cfgloc. See the appropriate xCAT docuementation for the format of the file for the database you choose. +the file /etc/xcat/cfgloc. See the appropriate xCAT docuementation for the format of the file for the database you choose. The following example /etc/xcat/cfgloc file is for PostgreSQL: @@ -115,18 +115,18 @@ node names are cmm01, cmm02, etc., then you might have an mp table like: Before you panic, let me explain each column: -\ **blade**\ - +\ **blade**\ + This is a group name. In this example, we are assuming that all of your blades belong to this group. Each time the xCAT software accesses the \ **mp**\ table to get the management module and slot number of a specific blade (e.g. \ **node20**\ ), this row will match (because \ **node20**\ is in the \ **blade**\ group). Once this row is matched for \ **node20**\ , then the processing described in the following items will take place. - -\ **|\D+(\d+)|cmm(sprintf('%02d',($1-1)/14+1))|**\ - + +\ **|\D+(\d+)|cmm(sprintf('%02d',($1-1)/14+1))|**\ + This is a perl substitution pattern that will produce the value for the second column of the table (the management module hostname). The text \ **\D+(\d+)**\ between the 1st two vertical bars is a regular expression that matches the node @@ -141,17 +141,17 @@ Before you panic, let me explain each column: zero, if necessary, to always make the number two digits. Lastly the string \ **cmm**\ is added to the beginning, making the resulting string \ **cmm02**\ , which will be used as the hostname of the management module. - -\ **|\D+(\d+)|(($1-1)%14+1)|**\ - + +\ **|\D+(\d+)|(($1-1)%14+1)|**\ + This item is similar to the one above. This substituion pattern will produce the value for the 3rd column (the chassis slot number for this blade). Because this row was the match for \ **node20**\ , the parentheses within the 1st set of vertical bars will set $1 to 20. Since % means modulo division, the expression \ **($1-1)%14+1**\ will evaluate to \ **6**\ . - + See http://www.perl.com/doc/manual/html/pod/perlre.html for information on perl regular expressions. @@ -173,34 +173,34 @@ Regular Expression Helper Functions xCAT provides several functions that can simplify regular expressions. -\ **a2idx**\ - +\ **a2idx**\ + ASCII Character to Index - -\ **a2zidx**\ - + +\ **a2zidx**\ + ASCII Character to 0-Index - -\ **dim2idx**\ - + +\ **dim2idx**\ + Dimensions to Index - -\ **skip**\ - + +\ **skip**\ + Skip indices - -\ **ipadd**\ - + +\ **ipadd**\ + Add to an IP address - + http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/basic_concepts/xcat_db/regexp_db.html#regular-expression-helper-functions @@ -235,35 +235,35 @@ In plain English, an object name is in \ **xCAT Object Name Format**\ if starti \* - + one or more alpha characters of any case and any number of "-" in any combination - + \* - + followed by one or more numbers - + \* - + then optionally followed by one alpha character of any case or "-" - + \* - + followed by any combination of case mixed alphanumerics and "-" - -\ **Object Types**\ + +\ **Object Types**\ ==================== -To run man for any of the object definitions below, use section 7. For example: \ **man 7 node**\ +To run man for any of the object definitions below, use section 7. For example: \ **man 7 node**\ The object types are: @@ -370,366 +370,366 @@ TABLES To manipulate the tables directly, use \ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ , \ **nodeadd(8)**\ , \ **nodech(1)**\ . -To run man for any of the table descriptions below, use section 5. For example: \ **man 5 nodehm**\ +To run man for any of the table descriptions below, use section 5. For example: \ **man 5 nodehm**\ The tables are: auditlog(5)|auditlog.5 - + Audit Data log. - + bootparams(5)|bootparams.5 - + Current boot settings to be sent to systems attempting network boot for deployment, stateless, or other reasons. Mostly automatically manipulated by xCAT. - + boottarget(5)|boottarget.5 - + Specify non-standard initrd, kernel, and parameters that should be used for a given profile. - + cfgmgt(5)|cfgmgt.5 - + Configuration management data for nodes used by non-xCAT osimage management services to install and configure software on a node. - + chain(5)|chain.5 - + Controls what operations are done (and it what order) when a node is discovered and deployed. - + deps(5)|deps.5 - + Describes dependencies some nodes have on others. This can be used, e.g., by rpower -d to power nodes on or off in the correct order. - + discoverydata(5)|discoverydata.5 - + Discovery data which sent from genesis. - + domain(5)|domain.5 - + Mapping of nodes to domain attributes - + eventlog(5)|eventlog.5 - + Stores the events occurred. - + firmware(5)|firmware.5 - + Maps node to firmware values to be used for setup at node discovery or later - + hosts(5)|hosts.5 - + IP addresses and hostnames of nodes. This info is optional and is only used to populate /etc/hosts and DNS via makehosts and makedns. Using regular expressions in this table can be a quick way to populate /etc/hosts. - + hwinv(5)|hwinv.5 - + The hareware inventory for the node. - + hypervisor(5)|hypervisor.5 - + Hypervisor parameters - + ipmi(5)|ipmi.5 - + Settings for nodes that are controlled by an on-board BMC via IPMI. - + iscsi(5)|iscsi.5 - + Contains settings that control how to boot a node from an iSCSI target - + kit(5)|kit.5 - + This table stores all kits added to the xCAT cluster. - + kitcomponent(5)|kitcomponent.5 - + This table stores all kit components added to the xCAT cluster. - + kitrepo(5)|kitrepo.5 - + This table stores all kits added to the xCAT cluster. - + kvm_masterdata(5)|kvm_masterdata.5 - + Persistent store for KVM plugin for masters - + kvm_nodedata(5)|kvm_nodedata.5 - + Persistent store for KVM plugin, not intended for manual modification. - + linuximage(5)|linuximage.5 - + Information about a Linux operating system image that can be used to deploy cluster nodes. - + litefile(5)|litefile.5 - + The litefile table specifies the directories and files on the statelite nodes that should be readwrite, persistent, or readonly overlay. All other files in the statelite nodes come from the readonly statelite image. - + litetree(5)|litetree.5 - + Directory hierarchy to traverse to get the initial contents of node files. The files that are specified in the litefile table are searched for in the directories specified in this table. - + mac(5)|mac.5 - + The MAC address of the node's install adapter. Normally this table is populated by getmacs or node discovery, but you can also add entries to it manually. - + mic(5)|mic.5 - + The host, slot id and configuration of the mic (Many Integrated Core). - + monitoring(5)|monitoring.5 - + Controls what external monitoring tools xCAT sets up and uses. Entries should be added and removed from this table using the provided xCAT commands monstart and monstop. - + monsetting(5)|monsetting.5 - + Specifies the monitoring plug-in specific settings. These settings will be used by the monitoring plug-in to customize the behavior such as event filter, sample interval, responses etc. Entries should be added, removed or modified by chtab command. Entries can also be added or modified by the monstart command when a monitoring plug-in is brought up. - + mp(5)|mp.5 - + Contains the hardware control info specific to blades. This table also refers to the mpa table, which contains info about each Management Module. - + mpa(5)|mpa.5 - + Contains info about each Management Module and how to access it. - + networks(5)|networks.5 - + Describes the networks in the cluster and info necessary to set up nodes on that network. - + nics(5)|nics.5 - + Stores NIC details. - + nimimage(5)|nimimage.5 - + All the info that specifies a particular AIX operating system image that can be used to deploy AIX nodes. - + nodegroup(5)|nodegroup.5 - + Contains group definitions, whose membership is dynamic depending on characteristics of the node. - + nodehm(5)|nodehm.5 - + Settings that control how each node's hardware is managed. Typically, an additional table that is specific to the hardware type of the node contains additional info. E.g. the ipmi, mp, and ppc tables. - + nodelist(5)|nodelist.5 - + The list of all the nodes in the cluster, including each node's current status and what groups it is in. - + nodepos(5)|nodepos.5 - + Contains info about the physical location of each node. Currently, this info is not used by xCAT, and therefore can be in whatevery format you want. It will likely be used in xCAT in the future. - + noderes(5)|noderes.5 - + Resources and settings to use when installing nodes. - + nodetype(5)|nodetype.5 - + A few hardware and software characteristics of the nodes. - + notification(5)|notification.5 - + Contains registrations to be notified when a table in the xCAT database changes. Users can add entries to have additional software notified of changes. Add and remove entries using the provided xCAT commands regnotif and unregnotif. - + openbmc(5)|openbmc.5 - + Setting for nodes that are controlled by an on-board OpenBMC. - + osdistro(5)|osdistro.5 - + Information about all the OS distros in the xCAT cluster - + osdistroupdate(5)|osdistroupdate.5 - + Information about the OS distro updates in the xCAT cluster - + osimage(5)|osimage.5 - + Basic information about an operating system image that can be used to deploy cluster nodes. - + passwd(5)|passwd.5 - + Contains default userids and passwords for xCAT to access cluster components. In most cases, xCAT will also actually set the userid/password in the relevant component when it is being configured or installed. Userids/passwords for specific cluster components can be overidden in other tables, e.g. mpa, ipmi, ppchcp, etc. - + pdu(5)|pdu.5 - + Parameters to use when interrogating pdus - + pduoutlet(5)|pduoutlet.5 - + Contains list of outlet numbers on the pdu each node is connected to. - + performance(5)|performance.5 - + Describes the system performance every interval unit of time. - + policy(5)|policy.5 - + The policy table in the xCAT database controls who has authority to run specific xCAT operations. It is basically the Access Control List (ACL) for xCAT. It is sorted on the priority field before evaluating. - + postscripts(5)|postscripts.5 - + The scripts that should be run on each node after installation or diskless boot. - + ppc(5)|ppc.5 - + List of system p hardware: HMCs, IVMs, FSPs, BPCs, CECs, Frames. - + ppcdirect(5)|ppcdirect.5 - + Info necessary to use FSPs/BPAs to control system p CECs/Frames. - + ppchcp(5)|ppchcp.5 - + Info necessary to use HMCs and IVMs as hardware control points for LPARs. - + prescripts(5)|prescripts.5 - + The scripts that will be run at the beginning and the end of the nodeset(Linux), nimnodeset(AIX) or mkdsklsnode(AIX) command. - + prodkey(5)|prodkey.5 - + Specify product keys for products that require them - + rack(5)|rack.5 - + Rack information. - + routes(5)|routes.5 - + Describes the additional routes needed to be setup in the os routing table. These routes usually are used to connect the management node to the compute node using the service node as gateway. - + servicenode(5)|servicenode.5 - + List of all Service Nodes and services that will be set up on the Service Node. - + site(5)|site.5 - - Global settings for the whole cluster. This table is different from the - other tables in that each attribute is just named in the key column, rather - than having a separate column for each attribute. The following is a list of + + Global settings for the whole cluster. This table is different from the + other tables in that each attribute is just named in the key column, rather + than having a separate column for each attribute. The following is a list of attributes currently used by xCAT organized into categories. - + statelite(5)|statelite.5 - + The location on an NFS server where a nodes persistent files are stored. Any file marked persistent in the litefile table will be stored in the location specified in this table for that node. - + storage(5)|storage.5 @@ -737,81 +737,81 @@ storage(5)|storage.5 switch(5)|switch.5 - + Contains what switch port numbers each node is connected to. - + switches(5)|switches.5 - + Parameters to use when interrogating switches - + taskstate(5)|taskstate.5 - + The task state for the node. - + token(5)|token.5 - + The token of users for authentication. - + virtsd(5)|virtsd.5 - + The parameters which used to create the Storage Domain - + vm(5)|vm.5 - + Virtualization parameters - + vmmaster(5)|vmmaster.5 - + Inventory of virtualization images for use with clonevm. Manual intervention in this table is not intended. - + vpd(5)|vpd.5 - + The Machine type, Model, and Serial numbers of each node. - + websrv(5)|websrv.5 - + Web service parameters - + winimage(5)|winimage.5 - + Information about a Windows operating system image that can be used to deploy cluster nodes. - + zone(5)|zone.5 - + Defines a cluster zone for nodes that share root ssh key access to each other. - + zvm(5)|zvm.5 - + List of z/VM virtual servers. - + zvmivp(5)|zvmivp.5 - + List of z/VM Installation Verification Procedures (IVPs) to be periodically run. - + @@ -820,5 +820,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ , \ **lsdef(1)**\ , \ **mkdef(1)**\ , \ **chdef(1)**\ , \ **rmdef(1)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ , \ **lsdef(1)**\ , \ **mkdef(1)**\ , \ **chdef(1)**\ , \ **rmdef(1)**\ From db1d70628206d80354d2f95cf3eeb799b7104a5a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0475/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst --- .../references/man5/xcatstanzafile.5.rst | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst b/docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst index b8cb9d33e..7618912c9 100644 --- a/docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst +++ b/docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst @@ -23,75 +23,75 @@ A stanza file contains information that can be used to create xCAT data object d \* - + An object stanza header consists of the object name followed by a colon, (":"). - + \* - + Attribute lines must take the form of Attribute=Value. - + \* - + Attribute name might include the character dot ("."), like passwd.HMC and nicips.eth0. - + \* - + Only one stanza can exist for each object name. - + \* - + All stanzas except for default stanzas must have a value set for "objtype". - + \* - + Comments beginning with the "#" pound sign may be added to the file. A comment must be on a separate line. - + \* - + When parsing the file, tab characters and spaces are ignored. - + \* - + Each line of the file can have no more than one header or attribute definition. - + \* - + If the header name is "default-:" the attribute values in the stanza are considered default values for subsequent definitions in the file that are the same object type. - + \* - + Default stanzas can be specified multiple times and at any point in a stanza file. The values apply to all definitions following the default stanzas in a file. The default values are cumulative; a default attribute value will remain set until it is explicitly unset or changed. - + \* - + To turn off a default value, use another default stanza to set the attribute to have no value using a blank space. - + \* - + When a specific value for an attribute is provided in the stanza, it takes priority over any default value that had been set. - + The format of a stanza file should look similar to the following. @@ -103,13 +103,13 @@ The format of a stanza file should look similar to the following. attr=val attr=val . . . - + : objtype= attr=val attr=val . . . - + : objtype= attr=val @@ -125,47 +125,47 @@ EXAMPLES 1) - + Sample stanza file: - - + + .. code-block:: perl - + mysite: objtype=site rsh=/bin/rsh rcp=/bin/rcp installdir=/xcatinstall domain=ppd.pok.ibm.com - + MSnet01: objtype=network gateway=1.2.3.4 netmask=255.255.255.0 nameserver=5.6.7.8 - + default-node: next_osimage=aix61 network=MSnet01 groups=all,compute - + node01: objtype=node MAC=A2E26002C003 xcatmaster=MS02.ppd.pok.com nfsserver=IS227.ppd.pok.com - + node02: objtype=node MAC=A2E26002B004 xcatmaster=MS01.ppd.pok.com nfsserver=IS127.ppd.pok.com - + grp01: objtype=group members=node1,node2,node3 - - + + From 46fe343dcd0c9d06c19c78fca3ad0f7044df9844 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0476/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/zone.5.rst --- .../admin-guides/references/man5/zone.5.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/zone.5.rst b/docs/source/guides/admin-guides/references/man5/zone.5.rst index b4183e642..878c949be 100644 --- a/docs/source/guides/admin-guides/references/man5/zone.5.rst +++ b/docs/source/guides/admin-guides/references/man5/zone.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **zone Attributes:**\ \ *zonename*\ , \ *sshkeydir*\ , \ *sshbetweennodes*\ , \ *defaultzone*\ , \ *comments*\ , \ *disable*\ +\ **zone Attributes:**\ \ *zonename*\ , \ *sshkeydir*\ , \ *sshbetweennodes*\ , \ *defaultzone*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,40 +36,40 @@ zone Attributes: -\ **zonename**\ - +\ **zonename**\ + The name of the zone. - -\ **sshkeydir**\ - + +\ **sshkeydir**\ + Directory containing the shared root ssh RSA keys. - -\ **sshbetweennodes**\ - + +\ **sshbetweennodes**\ + Indicates whether passwordless ssh will be setup between the nodes of this zone. Values are yes/1 or no/0. Default is yes. - -\ **defaultzone**\ - + +\ **defaultzone**\ + If nodes are not assigned to any other zone, they will default to this zone. If value is set to yes or 1. - -\ **comments**\ - + +\ **comments**\ + Any user-provided notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - + @@ -78,5 +78,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 5777bbbe4cfa4585fea283c17222206cd3630af8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0477/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/zvm.5.rst --- .../admin-guides/references/man5/zvm.5.rst | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/zvm.5.rst b/docs/source/guides/admin-guides/references/man5/zvm.5.rst index 249977d9b..9e7c8d2fb 100644 --- a/docs/source/guides/admin-guides/references/man5/zvm.5.rst +++ b/docs/source/guides/admin-guides/references/man5/zvm.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **zvm Attributes:**\ \ *node*\ , \ *hcp*\ , \ *userid*\ , \ *nodetype*\ , \ *parent*\ , \ *comments*\ , \ *disable*\ , \ *discovered*\ , \ *status*\ +\ **zvm Attributes:**\ \ *node*\ , \ *hcp*\ , \ *userid*\ , \ *nodetype*\ , \ *parent*\ , \ *comments*\ , \ *disable*\ , \ *discovered*\ , \ *status*\ *********** @@ -36,58 +36,58 @@ zvm Attributes: -\ **node**\ - +\ **node**\ + The node name. - -\ **hcp**\ - + +\ **hcp**\ + The hardware control point for this node. - -\ **userid**\ - + +\ **userid**\ + The z/VM userID of this node. - -\ **nodetype**\ - + +\ **nodetype**\ + The node type. Valid values: cec (Central Electronic Complex), lpar (logical partition), zvm (z/VM host operating system), and vm (virtual machine). - -\ **parent**\ - + +\ **parent**\ + The parent node. For LPAR, this specifies the CEC. For z/VM, this specifies the LPAR. For VM, this specifies the z/VM host operating system. - -\ **comments**\ - + +\ **comments**\ + Any user provided notes. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to comment out this row. - -\ **discovered**\ - + +\ **discovered**\ + Set to '1' to indicate this node was discovered. - -\ **status**\ - + +\ **status**\ + The processing status. Key value pairs (key=value) indicating status of the node. Multiple pairs are separated by semi-colons. Keys include: CLONING, CLONE_ONLY. - + @@ -96,5 +96,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 6ab6c0815bad2adc0606086f704ae2b4240e2e30 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0478/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man5/zvmivp.5.rst --- .../admin-guides/references/man5/zvmivp.5.rst | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/zvmivp.5.rst b/docs/source/guides/admin-guides/references/man5/zvmivp.5.rst index 04e5714ba..b41bd902c 100644 --- a/docs/source/guides/admin-guides/references/man5/zvmivp.5.rst +++ b/docs/source/guides/admin-guides/references/man5/zvmivp.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **zvmivp Attributes:**\ \ *id*\ , \ *ip*\ , \ *schedule*\ , \ *last_run*\ , \ *type_of_run*\ , \ *access_user*\ , \ *orch_parms*\ , \ *prep_parms*\ , \ *main_ivp_parms*\ , \ *comments*\ , \ *disable*\ +\ **zvmivp Attributes:**\ \ *id*\ , \ *ip*\ , \ *schedule*\ , \ *last_run*\ , \ *type_of_run*\ , \ *access_user*\ , \ *orch_parms*\ , \ *prep_parms*\ , \ *main_ivp_parms*\ , \ *comments*\ , \ *disable*\ *********** @@ -36,70 +36,70 @@ zvmivp Attributes: -\ **id**\ - +\ **id**\ + Unique identifier associated with the IVP run, e.g. 1. - -\ **ip**\ - + +\ **ip**\ + IP address of the target system, either the IP of the OpenStack compute node or the xCAT management node. - -\ **schedule**\ - + +\ **schedule**\ + The hours (0-24) that the IVP should be run. Multiple hours are separated by a blank. - -\ **last_run**\ - + +\ **last_run**\ + The last time the IVP was run specified as a set of 3 blank delimeted words: year, Julian date, and hour (in 24 hour format). - -\ **type_of_run**\ - + +\ **type_of_run**\ + The type of run requested, 'fullivp' or 'basicivp'. - -\ **access_user**\ - + +\ **access_user**\ + User on the OpenStack node that is used to: push the IVP preparation script to the OpenStack system, drive the preparation script to validate the OpenStack configuration files, and return the created driver script to the xCAT MN system for the next part of the IVP. This user should be able to access the OpenStack configuration files that are scanned by the IVP. - -\ **orch_parms**\ - + +\ **orch_parms**\ + Parameters to pass to the IVP orchestrator script, verifynode. - -\ **prep_parms**\ - + +\ **prep_parms**\ + Parameters to pass to the phase 1 IVP preparation script. - -\ **main_ivp_parms**\ - + +\ **main_ivp_parms**\ + Parameters to pass to the main IVP script. - -\ **comments**\ - + +\ **comments**\ + Any user provided notes or description of the run. - -\ **disable**\ - + +\ **disable**\ + Set to 'yes' or '1' to disable this IVP run. - + @@ -108,5 +108,5 @@ SEE ALSO ******** -\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ +\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ From 057f1079ef089c932702c345bf3a7ba21fbfeef4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0479/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/auditlog.7.rst --- .../references/man7/auditlog.7.rst | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/auditlog.7.rst b/docs/source/guides/admin-guides/references/man7/auditlog.7.rst index e6e270384..833d7a18f 100644 --- a/docs/source/guides/admin-guides/references/man7/auditlog.7.rst +++ b/docs/source/guides/admin-guides/references/man7/auditlog.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **auditlog Attributes:**\ \ *args*\ , \ *audittime*\ , \ *clientname*\ , \ *clienttype*\ , \ *command*\ , \ *comments*\ , \ *disable*\ , \ *noderange*\ , \ *recid*\ , \ *status*\ , \ *userid*\ +\ **auditlog Attributes:**\ \ *args*\ , \ *audittime*\ , \ *clientname*\ , \ *clienttype*\ , \ *command*\ , \ *comments*\ , \ *disable*\ , \ *noderange*\ , \ *recid*\ , \ *status*\ , \ *userid*\ *********** @@ -40,69 +40,69 @@ auditlog Attributes: \ **args**\ (auditlog.args) - + The command argument list. - + \ **audittime**\ (auditlog.audittime) - + The timestamp for the audit entry. - + \ **clientname**\ (auditlog.clientname) - + The client machine, where the command originated. - + \ **clienttype**\ (auditlog.clienttype) - + Type of command: cli, java, webui, other. - + \ **command**\ (auditlog.command) - + Command executed. See auditskipcmds site table attribute to control which commands get logged. - + \ **comments**\ (auditlog.comments) - + Any user-provided notes. - + \ **disable**\ (auditlog.disable) - + Do not use. tabprune will not work if set to yes or 1 - + \ **noderange**\ (auditlog.noderange) - + The noderange on which the command was run. - + \ **recid**\ (auditlog.recid) - + The record id. - + \ **status**\ (auditlog.status) - + Allowed or Denied. - + \ **userid**\ (auditlog.userid) - + The user running the command. - + @@ -111,5 +111,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 4ba21e215fef5d7f94bcb85eab81ba7202de5281 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0480/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/boottarget.7.rst --- .../references/man7/boottarget.7.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/boottarget.7.rst b/docs/source/guides/admin-guides/references/man7/boottarget.7.rst index be767a2fc..3895b5ff4 100644 --- a/docs/source/guides/admin-guides/references/man7/boottarget.7.rst +++ b/docs/source/guides/admin-guides/references/man7/boottarget.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **boottarget Attributes:**\ \ *bprofile*\ , \ *comments*\ , \ *initrd*\ , \ *kcmdline*\ , \ *kernel*\ +\ **boottarget Attributes:**\ \ *bprofile*\ , \ *comments*\ , \ *initrd*\ , \ *kcmdline*\ , \ *kernel*\ *********** @@ -40,33 +40,33 @@ boottarget Attributes: \ **bprofile**\ (boottarget.bprofile) - + All nodes with a nodetype.profile value equal to this value and nodetype.os set to "boottarget", will use the associated kernel, initrd, and kcmdline. - + \ **comments**\ (boottarget.comments) - + Any user-written notes. - + \ **initrd**\ (boottarget.initrd) - + The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel) - + \ **kcmdline**\ (boottarget.kcmdline) - + Arguments to be passed to the kernel - + \ **kernel**\ (boottarget.kernel) - + The kernel that network boot actions should currently acquire and use. Note this could be a chained boot loader such as memdisk or a non-linux boot loader - + @@ -75,5 +75,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From d402d46ca6d67fccb213305f916a6749cb5a7b33 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0481/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/eventlog.7.rst --- .../references/man7/eventlog.7.rst | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/eventlog.7.rst b/docs/source/guides/admin-guides/references/man7/eventlog.7.rst index ff31cbe01..2a97b9988 100644 --- a/docs/source/guides/admin-guides/references/man7/eventlog.7.rst +++ b/docs/source/guides/admin-guides/references/man7/eventlog.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **eventlog Attributes:**\ \ *application*\ , \ *comments*\ , \ *component*\ , \ *disable*\ , \ *eventtime*\ , \ *eventtype*\ , \ *id*\ , \ *message*\ , \ *monitor*\ , \ *monnode*\ , \ *node*\ , \ *rawdata*\ , \ *recid*\ , \ *severity*\ +\ **eventlog Attributes:**\ \ *application*\ , \ *comments*\ , \ *component*\ , \ *disable*\ , \ *eventtime*\ , \ *eventtype*\ , \ *id*\ , \ *message*\ , \ *monitor*\ , \ *monnode*\ , \ *node*\ , \ *rawdata*\ , \ *recid*\ , \ *severity*\ *********** @@ -40,87 +40,87 @@ eventlog Attributes: \ **application**\ (eventlog.application) - + The application that reports the event. - + \ **comments**\ (eventlog.comments) - + Any user-provided notes. - + \ **component**\ (eventlog.component) - + The component where the event occurred. - + \ **disable**\ (eventlog.disable) - + Do not use. tabprune will not work if set to yes or 1 - + \ **eventtime**\ (eventlog.eventtime) - + The timestamp for the event. - + \ **eventtype**\ (eventlog.eventtype) - + The type of the event. - + \ **id**\ (eventlog.id) - + The location or the resource name where the event occurred. - + \ **message**\ (eventlog.message) - + The full description of the event. - + \ **monitor**\ (eventlog.monitor) - + The name of the monitor that monitors this event. - + \ **monnode**\ (eventlog.monnode) - + The node that monitors this event. - + \ **node**\ (eventlog.node) - + The node where the event occurred. - + \ **rawdata**\ (eventlog.rawdata) - + The data that associated with the event. - + \ **recid**\ (eventlog.recid) - + The record id. - + \ **severity**\ (eventlog.severity) - + The severity of the event. Valid values are: informational, warning, critical. - + @@ -129,5 +129,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From d866313bfadb5129387cf6ca528a922e74b7ac87 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0482/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/firmware.7.rst --- .../admin-guides/references/man7/firmware.7.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/firmware.7.rst b/docs/source/guides/admin-guides/references/man7/firmware.7.rst index 43a6da7cc..2c8ee454d 100644 --- a/docs/source/guides/admin-guides/references/man7/firmware.7.rst +++ b/docs/source/guides/admin-guides/references/man7/firmware.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **firmware Attributes:**\ \ *cfgfile*\ , \ *comments*\ , \ *disable*\ +\ **firmware Attributes:**\ \ *cfgfile*\ , \ *comments*\ , \ *disable*\ *********** @@ -40,21 +40,21 @@ firmware Attributes: \ **cfgfile**\ (firmware.cfgfile) - + The file to use. - + \ **comments**\ (firmware.comments) - + Any user-written notes. - + \ **disable**\ (firmware.disable) - + Set to 'yes' or '1' to comment out this row. - + @@ -63,5 +63,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 9a74e667312f37a98a42cb67ee6b204242928be3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0483/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/group.7.rst --- .../admin-guides/references/man7/group.7.rst | 952 +++++++++--------- 1 file changed, 476 insertions(+), 476 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/group.7.rst b/docs/source/guides/admin-guides/references/man7/group.7.rst index f4507f8e8..c4d1849d7 100644 --- a/docs/source/guides/admin-guides/references/man7/group.7.rst +++ b/docs/source/guides/admin-guides/references/man7/group.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **group Attributes:**\ \ *addkcmdline*\ , \ *arch*\ , \ *authdomain*\ , \ *authkey*\ , \ *authtype*\ , \ *bmc*\ , \ *bmcpassword*\ , \ *bmcport*\ , \ *bmcusername*\ , \ *bmcvlantag*\ , \ *cfgmgr*\ , \ *cfgmgtroles*\ , \ *cfgserver*\ , \ *chain*\ , \ *chassis*\ , \ *cmdmapping*\ , \ *community*\ , \ *cons*\ , \ *conserver*\ , \ *consoleenabled*\ , \ *consoleondemand*\ , \ *consport*\ , \ *cpucount*\ , \ *cputype*\ , \ *currchain*\ , \ *currstate*\ , \ *dhcpinterfaces*\ , \ *disksize*\ , \ *displayname*\ , \ *dockercpus*\ , \ *dockerflag*\ , \ *dockerhost*\ , \ *dockermemory*\ , \ *dockernics*\ , \ *domainadminpassword*\ , \ *domainadminuser*\ , \ *domaintype*\ , \ *getmac*\ , \ *groupname*\ , \ *grouptype*\ , \ *hcp*\ , \ *height*\ , \ *hostcluster*\ , \ *hostinterface*\ , \ *hostmanager*\ , \ *hostnames*\ , \ *hosttype*\ , \ *hwtype*\ , \ *id*\ , \ *initrd*\ , \ *installnic*\ , \ *interface*\ , \ *ip*\ , \ *iscsipassword*\ , \ *iscsiserver*\ , \ *iscsitarget*\ , \ *iscsiuserid*\ , \ *kcmdline*\ , \ *kernel*\ , \ *linkports*\ , \ *mac*\ , \ *membergroups*\ , \ *members*\ , \ *memory*\ , \ *mgt*\ , \ *micbridge*\ , \ *michost*\ , \ *micid*\ , \ *miconboot*\ , \ *micpowermgt*\ , \ *micvlog*\ , \ *migrationdest*\ , \ *monserver*\ , \ *mpa*\ , \ *mtm*\ , \ *nameservers*\ , \ *netboot*\ , \ *nfsdir*\ , \ *nfsserver*\ , \ *nicaliases*\ , \ *niccustomscripts*\ , \ *nicdevices*\ , \ *nicextraparams*\ , \ *nichostnameprefixes*\ , \ *nichostnamesuffixes*\ , \ *nicips*\ , \ *nicnetworks*\ , \ *nicsadapter*\ , \ *nictypes*\ , \ *nimserver*\ , \ *nodetype*\ , \ *ondiscover*\ , \ *os*\ , \ *osvolume*\ , \ *otherinterfaces*\ , \ *ou*\ , \ *outlet*\ , \ *parent*\ , \ *passwd.HMC*\ , \ *passwd.admin*\ , \ *passwd.celogin*\ , \ *passwd.general*\ , \ *passwd.hscroot*\ , \ *password*\ , \ *pdu*\ , \ *pdutype*\ , \ *postbootscripts*\ , \ *postscripts*\ , \ *power*\ , \ *pprofile*\ , \ *prescripts-begin*\ , \ *prescripts-end*\ , \ *primarynic*\ , \ *privkey*\ , \ *privtype*\ , \ *productkey*\ , \ *profile*\ , \ *protocol*\ , \ *provmethod*\ , \ *rack*\ , \ *room*\ , \ *routenames*\ , \ *seclevel*\ , \ *serial*\ , \ *serialflow*\ , \ *serialport*\ , \ *serialspeed*\ , \ *servicenode*\ , \ *setupconserver*\ , \ *setupdhcp*\ , \ *setupftp*\ , \ *setupipforward*\ , \ *setupldap*\ , \ *setupnameserver*\ , \ *setupnfs*\ , \ *setupnim*\ , \ *setupntp*\ , \ *setupproxydhcp*\ , \ *setuptftp*\ , \ *sfp*\ , \ *side*\ , \ *slot*\ , \ *slotid*\ , \ *slots*\ , \ *snmpauth*\ , \ *snmppassword*\ , \ *snmpprivacy*\ , \ *snmpuser*\ , \ *snmpusername*\ , \ *snmpversion*\ , \ *storagcontroller*\ , \ *storagetype*\ , \ *supernode*\ , \ *supportedarchs*\ , \ *supportproxydhcp*\ , \ *switch*\ , \ *switchinterface*\ , \ *switchport*\ , \ *switchtype*\ , \ *switchvlan*\ , \ *syslog*\ , \ *termport*\ , \ *termserver*\ , \ *tftpdir*\ , \ *tftpserver*\ , \ *unit*\ , \ *urlpath*\ , \ *usercomment*\ , \ *userid*\ , \ *username*\ , \ *vmbeacon*\ , \ *vmbootorder*\ , \ *vmcfgstore*\ , \ *vmcluster*\ , \ *vmcpus*\ , \ *vmhost*\ , \ *vmmanager*\ , \ *vmmaster*\ , \ *vmmemory*\ , \ *vmnicnicmodel*\ , \ *vmnics*\ , \ *vmothersetting*\ , \ *vmphyslots*\ , \ *vmstorage*\ , \ *vmstoragecache*\ , \ *vmstorageformat*\ , \ *vmstoragemodel*\ , \ *vmtextconsole*\ , \ *vmvirtflags*\ , \ *vmvncport*\ , \ *webport*\ , \ *wherevals*\ , \ *xcatmaster*\ +\ **group Attributes:**\ \ *addkcmdline*\ , \ *arch*\ , \ *authdomain*\ , \ *authkey*\ , \ *authtype*\ , \ *bmc*\ , \ *bmcpassword*\ , \ *bmcport*\ , \ *bmcusername*\ , \ *bmcvlantag*\ , \ *cfgmgr*\ , \ *cfgmgtroles*\ , \ *cfgserver*\ , \ *chain*\ , \ *chassis*\ , \ *cmdmapping*\ , \ *community*\ , \ *cons*\ , \ *conserver*\ , \ *consoleenabled*\ , \ *consoleondemand*\ , \ *consport*\ , \ *cpucount*\ , \ *cputype*\ , \ *currchain*\ , \ *currstate*\ , \ *dhcpinterfaces*\ , \ *disksize*\ , \ *displayname*\ , \ *dockercpus*\ , \ *dockerflag*\ , \ *dockerhost*\ , \ *dockermemory*\ , \ *dockernics*\ , \ *domainadminpassword*\ , \ *domainadminuser*\ , \ *domaintype*\ , \ *getmac*\ , \ *groupname*\ , \ *grouptype*\ , \ *hcp*\ , \ *height*\ , \ *hostcluster*\ , \ *hostinterface*\ , \ *hostmanager*\ , \ *hostnames*\ , \ *hosttype*\ , \ *hwtype*\ , \ *id*\ , \ *initrd*\ , \ *installnic*\ , \ *interface*\ , \ *ip*\ , \ *iscsipassword*\ , \ *iscsiserver*\ , \ *iscsitarget*\ , \ *iscsiuserid*\ , \ *kcmdline*\ , \ *kernel*\ , \ *linkports*\ , \ *mac*\ , \ *membergroups*\ , \ *members*\ , \ *memory*\ , \ *mgt*\ , \ *micbridge*\ , \ *michost*\ , \ *micid*\ , \ *miconboot*\ , \ *micpowermgt*\ , \ *micvlog*\ , \ *migrationdest*\ , \ *monserver*\ , \ *mpa*\ , \ *mtm*\ , \ *nameservers*\ , \ *netboot*\ , \ *nfsdir*\ , \ *nfsserver*\ , \ *nicaliases*\ , \ *niccustomscripts*\ , \ *nicdevices*\ , \ *nicextraparams*\ , \ *nichostnameprefixes*\ , \ *nichostnamesuffixes*\ , \ *nicips*\ , \ *nicnetworks*\ , \ *nicsadapter*\ , \ *nictypes*\ , \ *nimserver*\ , \ *nodetype*\ , \ *ondiscover*\ , \ *os*\ , \ *osvolume*\ , \ *otherinterfaces*\ , \ *ou*\ , \ *outlet*\ , \ *parent*\ , \ *passwd.HMC*\ , \ *passwd.admin*\ , \ *passwd.celogin*\ , \ *passwd.general*\ , \ *passwd.hscroot*\ , \ *password*\ , \ *pdu*\ , \ *pdutype*\ , \ *postbootscripts*\ , \ *postscripts*\ , \ *power*\ , \ *pprofile*\ , \ *prescripts-begin*\ , \ *prescripts-end*\ , \ *primarynic*\ , \ *privkey*\ , \ *privtype*\ , \ *productkey*\ , \ *profile*\ , \ *protocol*\ , \ *provmethod*\ , \ *rack*\ , \ *room*\ , \ *routenames*\ , \ *seclevel*\ , \ *serial*\ , \ *serialflow*\ , \ *serialport*\ , \ *serialspeed*\ , \ *servicenode*\ , \ *setupconserver*\ , \ *setupdhcp*\ , \ *setupftp*\ , \ *setupipforward*\ , \ *setupldap*\ , \ *setupnameserver*\ , \ *setupnfs*\ , \ *setupnim*\ , \ *setupntp*\ , \ *setupproxydhcp*\ , \ *setuptftp*\ , \ *sfp*\ , \ *side*\ , \ *slot*\ , \ *slotid*\ , \ *slots*\ , \ *snmpauth*\ , \ *snmppassword*\ , \ *snmpprivacy*\ , \ *snmpuser*\ , \ *snmpusername*\ , \ *snmpversion*\ , \ *storagcontroller*\ , \ *storagetype*\ , \ *supernode*\ , \ *supportedarchs*\ , \ *supportproxydhcp*\ , \ *switch*\ , \ *switchinterface*\ , \ *switchport*\ , \ *switchtype*\ , \ *switchvlan*\ , \ *syslog*\ , \ *termport*\ , \ *termserver*\ , \ *tftpdir*\ , \ *tftpserver*\ , \ *unit*\ , \ *urlpath*\ , \ *usercomment*\ , \ *userid*\ , \ *username*\ , \ *vmbeacon*\ , \ *vmbootorder*\ , \ *vmcfgstore*\ , \ *vmcluster*\ , \ *vmcpus*\ , \ *vmhost*\ , \ *vmmanager*\ , \ *vmmaster*\ , \ *vmmemory*\ , \ *vmnicnicmodel*\ , \ *vmnics*\ , \ *vmothersetting*\ , \ *vmphyslots*\ , \ *vmstorage*\ , \ *vmstoragecache*\ , \ *vmstorageformat*\ , \ *vmstoragemodel*\ , \ *vmtextconsole*\ , \ *vmvirtflags*\ , \ *vmvncport*\ , \ *webport*\ , \ *wherevals*\ , \ *xcatmaster*\ *********** @@ -40,824 +40,824 @@ group Attributes: \ **addkcmdline**\ (bootparams.addkcmdline) - + User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ") - + \ **arch**\ (nodetype.arch) - + The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64. - + \ **authdomain**\ (domain.authdomain) - + If a node should participate in an AD domain or Kerberos realm distinct from domain indicated in site, this field can be used to specify that - + \ **authkey**\ (pdu.authkey) - + The authentication passphrase for SNMPv3 - + \ **authtype**\ (pdu.authtype) - + The authentication protocol(MD5|SHA) to use for SNMPv3. - + \ **bmc**\ (ipmi.bmc, openbmc.bmc) - + The hostname of the BMC adapter. - + or - + The hostname of the BMC adapter. - + \ **bmcpassword**\ (ipmi.password, openbmc.password) - + The BMC password. If not specified, the key=ipmi row in the passwd table is used as the default. - + or - + The BMC password. - + \ **bmcport**\ (ipmi.bmcport) - + In systems with selectable shared/dedicated ethernet ports, this parameter can be used to specify the preferred port. 0 means use the shared port, 1 means dedicated, blank is to not assign. - - + + .. code-block:: perl - + The following special cases exist for IBM System x servers: - + For x3755 M3 systems, 0 means use the dedicated port, 1 means shared, blank is to not assign. - + For certain systems which have a mezzaine or ML2 adapter, there is a second value to include: - - + + For x3750 M4 (Model 8722): - - + + 0 2 1st 1Gbps interface for LOM - + 0 0 1st 10Gbps interface for LOM - + 0 3 2nd 1Gbps interface for LOM - + 0 1 2nd 10Gbps interface for LOM - - + + For x3750 M4 (Model 8752), x3850/3950 X6, dx360 M4, x3550 M4, and x3650 M4: - - + + 0 Shared (1st onboard interface) - + 1 Dedicated - + 2 0 First interface on ML2 or mezzanine adapter - + 2 1 Second interface on ML2 or mezzanine adapter - + 2 2 Third interface on ML2 or mezzanine adapter - + 2 3 Fourth interface on ML2 or mezzanine adapter - - + + \ **bmcusername**\ (ipmi.username, openbmc.username) - + The BMC userid. If not specified, the key=ipmi row in the passwd table is used as the default. - + or - + The BMC userid. - + \ **bmcvlantag**\ (ipmi.taggedvlan, openbmc.taggedvlan) - + bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified. - + or - + bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified. - + \ **cfgmgr**\ (cfgmgt.cfgmgr) - + The name of the configuration manager service. Currently 'chef' and 'puppet' are supported services. - + \ **cfgmgtroles**\ (cfgmgt.roles) - + The roles associated with this node as recognized by the cfgmgr for the software that is to be installed and configured. These role names map to chef recipes or puppet manifest classes that should be used for this node. For example, chef OpenStack cookbooks have roles such as mysql-master,keystone, glance, nova-controller, nova-conductor, cinder-all. - + \ **cfgserver**\ (cfgmgt.cfgserver) - + The xCAT node name of the chef server or puppet master - + \ **chain**\ (chain.chain) - + A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.) The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell. - + \ **chassis**\ (nodepos.chassis) - + The BladeCenter chassis the blade is in. - + \ **cmdmapping**\ (nodehm.cmdmapping) - + The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device. Only used by PCM. - + \ **community**\ (pdu.community) - + The community string to use for SNMPv1/v2 - + \ **cons**\ (nodehm.cons) - + The console method. If nodehm.serialport is set, this will default to the nodehm.mgt setting, otherwise it defaults to unused. Valid values: cyclades, mrv, or the values valid for the mgt attribute. - + \ **conserver**\ (nodehm.conserver) - + The hostname of the machine where the conserver daemon is running. If not set, the default is the xCAT management node. - + \ **consoleenabled**\ (nodehm.consoleenabled) - + A flag field to indicate whether the node is registered in the console server. If '1', console is enabled, if not set, console is not enabled. - + \ **consoleondemand**\ (nodehm.consoleondemand) - + This overrides the value from site.consoleondemand. Set to 'yes', 'no', '1' (equivalent to 'yes'), or '0' (equivalent to 'no'). If not set, the default is the value from site.consoleondemand. - + \ **consport**\ (openbmc.consport) - + The console port for OpenBMC. - + \ **cpucount**\ (hwinv.cpucount) - + The number of cpus for the node. - + \ **cputype**\ (hwinv.cputype) - + The cpu model name for the node. - + \ **currchain**\ (chain.currchain) - + The chain steps still left to do for this node. This attribute will be automatically adjusted by xCAT while xCAT-genesis is running on the node (either during node discovery or a special operation like firmware update). During node discovery, this attribute is initialized from the chain attribute and updated as the chain steps are executed. - + \ **currstate**\ (chain.currstate) - + The current or next chain step to be executed on this node by xCAT-genesis. Set by xCAT during node discovery or as a result of nodeset. - + \ **dhcpinterfaces**\ (servicenode.dhcpinterfaces) - + The network interfaces DHCP server should listen on for the target node. This attribute can be used for management node and service nodes. If defined, it will override the values defined in site.dhcpinterfaces. This is a comma separated list of device names. !remote! indicates a non-local network for relay DHCP. For example: !remote!,eth0,eth1 - + \ **disksize**\ (hwinv.disksize) - + The size of the disks for the node in GB. - + \ **displayname**\ (mpa.displayname) - + Alternative name for BladeCenter chassis. Only used by PCM. - + \ **dockercpus**\ (vm.cpus) - + Number of CPUs the node should see. - + \ **dockerflag**\ (vm.othersettings) - + This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\ on the host. - + \ **dockerhost**\ (vm.host) - + The system that currently hosts the VM - + \ **dockermemory**\ (vm.memory) - + Megabytes of memory the VM currently should be set to. - + \ **dockernics**\ (vm.nics) - + Network configuration parameters. Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan. physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches. hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible. - + \ **domainadminpassword**\ (domain.adminpassword) - + Allow a node specific indication of Administrative user password for the domain. Most will want to ignore this in favor of passwd table. - + \ **domainadminuser**\ (domain.adminuser) - + Allow a node specific indication of Administrative user. Most will want to just use passwd table to indicate this once rather than by node. - + \ **domaintype**\ (domain.type) - + Type, if any, of authentication domain to manipulate. The only recognized value at the moment is activedirectory. - + \ **getmac**\ (nodehm.getmac) - + The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used. Valid values: same as values for mgmt attribute. - + \ **groupname**\ (nodegroup.groupname) - + Name of the group. - + \ **grouptype**\ (nodegroup.grouptype) - + The only current valid value is dynamic. We will be looking at having the object def commands working with static group definitions in the nodelist table. - + \ **hcp**\ (ppc.hcp, zvm.hcp) - + The hardware control point for this node (HMC, IVM, Frame or CEC). Do not need to set for BPAs and FSPs. - + or - + The hardware control point for this node. - + \ **height**\ (nodepos.height) - + The server height in U(s). - + \ **hostcluster**\ (hypervisor.cluster) - + Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor. - + \ **hostinterface**\ (hypervisor.interface) - + The definition of interfaces for the hypervisor. The format is [networkname:interfacename:bootprotocol:IP:netmask:gateway] that split with | for each interface - + \ **hostmanager**\ (hypervisor.mgr) - + The virtualization specific manager of this hypervisor when applicable - + \ **hostnames**\ (hosts.hostnames) - + Hostname aliases added to /etc/hosts for this node. Comma or blank separated list. - + \ **hosttype**\ (hypervisor.type) - + The plugin associated with hypervisor specific commands such as revacuate - + \ **hwtype**\ (ppc.nodetype, zvm.nodetype, mp.nodetype, mic.nodetype) - + The hardware type of the node. Only can be one of fsp, bpa, cec, frame, ivm, hmc and lpar - + or - + The node type. Valid values: cec (Central Electronic Complex), lpar (logical partition), zvm (z/VM host operating system), and vm (virtual machine). - + or - + The hardware type for mp node. Valid values: mm,cmm, blade. - + or - + The hardware type of the mic node. Generally, it is mic. - + \ **id**\ (ppc.id, mp.id) - + For LPARs: the LPAR numeric id; for CECs: the cage number; for Frames: the frame number. - + or - + The slot number of this blade in the BladeCenter chassis. - + \ **initrd**\ (bootparams.initrd) - + The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel) - + \ **installnic**\ (noderes.installnic) - + The network adapter on the node that will be used for OS deployment, the installnic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used. If not set, primarynic will be used. If primarynic is not set too, the keyword "mac" will be used as default. - + \ **interface**\ (mac.interface) - + The adapter interface name that will be used to install and manage the node. E.g. eth0 (for linux) or en0 (for AIX).) - + \ **ip**\ (hosts.ip) - + The IP address of the node. This is only used in makehosts. The rest of xCAT uses system name resolution to resolve node names to IP addresses. - + \ **iscsipassword**\ (iscsi.passwd) - + The password for the iscsi server containing the boot device for this node. - + \ **iscsiserver**\ (iscsi.server) - + The server containing the iscsi boot device for this node. - + \ **iscsitarget**\ (iscsi.target) - + The iscsi disk used for the boot device for this node. Filled in by xCAT. - + \ **iscsiuserid**\ (iscsi.userid) - + The userid of the iscsi server containing the boot device for this node. - + \ **kcmdline**\ (bootparams.kcmdline) - + Arguments to be passed to the kernel - + \ **kernel**\ (bootparams.kernel) - + The kernel that network boot actions should currently acquire and use. Note this could be a chained boot loader such as memdisk or a non-linux boot loader - + \ **linkports**\ (switches.linkports) - + The ports that connect to other switches. Currently, this column is only used by vlan configuration. The format is: "port_number:switch,port_number:switch...". Refer to the switch table for details on how to specify the port numbers. - + \ **mac**\ (mac.mac) - + The mac address or addresses for which xCAT will manage static bindings for this node. This may be simply a mac address, which would be bound to the node name (such as "01:02:03:04:05:0E"). This may also be a "|" delimited string of "mac address!hostname" format (such as "01:02:03:04:05:0E!node5|01:02:03:04:05:0F!node6-eth1"). If there are multiple nics connected to Management Network(usually for bond), in order to make sure the OS deployment finished successfully, the macs of those nics must be able to resolve to same IP address. First, users have to create alias of the node for each mac in the Management Network through either: 1. adding the alias into /etc/hosts for the node directly or: 2. setting the alias to the "hostnames" attribute and then run "makehost" against the node. Then, configure the "mac" attribute of the node like "mac1!node|mac2!node-alias". For the first mac address (mac1 in the example) set in "mac" attribute, do not need to set a "node name" string for it since the nodename of the node will be used for it by default. - + \ **membergroups**\ (nodegroup.membergroups) - + This attribute stores a comma-separated list of nodegroups that this nodegroup refers to. This attribute is only used by PCM. - + \ **members**\ (nodegroup.members) - + The value of the attribute is not used, but the attribute is necessary as a place holder for the object def commands. (The membership for static groups is stored in the nodelist table.) - + \ **memory**\ (hwinv.memory) - + The size of the memory for the node in MB. - + \ **mgt**\ (nodehm.mgt) - + The method to use to do general hardware management of the node. This attribute is used as the default if power or getmac is not set. Valid values: openbmc, ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm. See the power attribute for more details. - + \ **micbridge**\ (mic.bridge) - + The virtual bridge on the host node which the mic connected to. - + \ **michost**\ (mic.host) - + The host node which the mic card installed on. - + \ **micid**\ (mic.id) - + The device id of the mic node. - + \ **miconboot**\ (mic.onboot) - + Set mic to autoboot when mpss start. Valid values: yes|no. Default is yes. - + \ **micpowermgt**\ (mic.powermgt) - + Set the Power Management for mic node. This attribute is used to set the power management state that mic may get into when it is idle. Four states can be set: cpufreq, corec6, pc3 and pc6. The valid value for powermgt attribute should be [cpufreq=]![corec6=]![pc3=]![pc6=]. e.g. cpufreq=on!corec6=off!pc3=on!pc6=off. Refer to the doc of mic to get more information for power management. - + \ **micvlog**\ (mic.vlog) - + Set the Verbose Log to console. Valid values: yes|no. Default is no. - + \ **migrationdest**\ (vm.migrationdest) - + A noderange representing candidate destinations for migration (i.e. similar systems, same SAN, or other criteria that xCAT can use - + \ **monserver**\ (noderes.monserver) - + The monitoring aggregation point for this node. The format is "x,y" where x is the ip address as known by the management node and y is the ip address as known by the node. - + \ **mpa**\ (mp.mpa) - + The management module used to control this blade. - + \ **mtm**\ (vpd.mtm) - + The machine type and model number of the node. E.g. 7984-6BU - + \ **nameservers**\ (noderes.nameservers) - + An optional node/group specific override for name server list. Most people want to stick to site or network defined nameserver configuration. - + \ **netboot**\ (noderes.netboot) - + The type of network booting to use for this node. Valid values: - - + + .. code-block:: perl - + Arch OS valid netboot options x86, x86_64 ALL pxe, xnba ppc64 <=rhel6, <=sles11.3 yaboot ppc64 >=rhels7, >=sles11.4 grub2,grub2-http,grub2-tftp ppc64le NonVirtualize ALL petitboot ppc64le PowerKVM Guest ALL grub2,grub2-http,grub2-tftp - - + + \ **nfsdir**\ (noderes.nfsdir) - + The path that should be mounted from the NFS server. - + \ **nfsserver**\ (noderes.nfsserver) - + The NFS or HTTP server for this node (as known by this node). - + \ **nicaliases**\ (nics.nicaliases) - + Comma-separated list of hostname aliases for each NIC. Format: eth0!,eth1!| - For multiple aliases per nic use a space-separated list. + For multiple aliases per nic use a space-separated list. For example: eth0!moe larry curly,eth1!tom|jerry - + \ **niccustomscripts**\ (nics.niccustomscripts) - + Comma-separated list of custom scripts per NIC. !,!, e.g. eth0!configeth eth0, ib0!configib ib0. The xCAT object definition commands support to use niccustomscripts. as the sub attribute . - + \ **nicdevices**\ (nics.nicdevices) - + Comma-separated list of NIC device per NIC, multiple ethernet devices can be bonded as bond device, these ethernet devices are separated by | . !|,!, e.g. bond0!eth0|eth2,br0!bond0. The xCAT object definition commands support to use nicdevices. as the sub attributes. - + \ **nicextraparams**\ (nics.nicextraparams) - + Comma-separated list of extra parameters that will be used for each NIC configuration. If only one ip address is associated with each NIC: !,!, for example, eth0!MTU=1500,ib0!MTU=65520 CONNECTED_MODE=yes. If multiple ip addresses are associated with each NIC: !|,!|, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes. The xCAT object definition commands support to use nicextraparams. as the sub attributes. - + \ **nichostnameprefixes**\ (nics.nichostnameprefixes) - - Comma-separated list of hostname prefixes per NIC. + + Comma-separated list of hostname prefixes per NIC. If only one ip address is associated with each NIC: !,!,..., for example, eth0!eth0-,ib0!ib- If multiple ip addresses are associated with each NIC: - !|,!|,..., for example, eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. - The xCAT object definition commands support to use nichostnameprefixes. as the sub attributes. + !|,!|,..., for example, eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. + The xCAT object definition commands support to use nichostnameprefixes. as the sub attributes. Note: According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnameprefixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention - + \ **nichostnamesuffixes**\ (nics.nichostnamesuffixes) - - Comma-separated list of hostname suffixes per NIC. + + Comma-separated list of hostname suffixes per NIC. If only one ip address is associated with each NIC: !,!,..., for example, eth0!-eth0,ib0!-ib0 If multiple ip addresses are associated with each NIC: - !|,!|,..., for example, eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. + !|,!|,..., for example, eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. The xCAT object definition commands support to use nichostnamesuffixes. as the sub attributes. - - + + .. code-block:: perl - + Note: According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnamesuffixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention - - + + \ **nicips**\ (nics.nicips) - - Comma-separated list of IP addresses per NIC. + + Comma-separated list of IP addresses per NIC. To specify one ip address per NIC: !,!,..., for example, eth0!10.0.0.100,ib0!11.0.0.100 To specify multiple ip addresses per NIC: !|,!|,..., for example, eth0!10.0.0.100|fd55::214:5eff:fe15:849b,ib0!11.0.0.100|2001::214:5eff:fe15:849a. The xCAT object definition commands support to use nicips. as the sub attributes. Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address. - + \ **nicnetworks**\ (nics.nicnetworks) - + Comma-separated list of networks connected to each NIC. If only one ip address is associated with each NIC: !,!, for example, eth0!10_0_0_0-255_255_0_0, ib0!11_0_0_0-255_255_0_0 If multiple ip addresses are associated with each NIC: !|,!|, for example, eth0!10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64,ib0!11_0_0_0-255_255_0_0|2001:db8:1:0::/64. The xCAT object definition commands support to use nicnetworks. as the sub attributes. - + \ **nicsadapter**\ (nics.nicsadapter) - + Comma-separated list of NIC information collected by getadapter. !,!, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face - + \ **nictypes**\ (nics.nictypes) - + Comma-separated list of NIC types per NIC. !,!, e.g. eth0!Ethernet,ib0!Infiniband. The xCAT object definition commands support to use nictypes. as the sub attributes. - + \ **nimserver**\ (noderes.nimserver) - + Not used for now. The NIM server for this node (as known by this node). - + \ **nodetype**\ (nodetype.nodetype, pdu.nodetype) - + A comma-delimited list of characteristics of this node. Valid values: ppc, blade, vm (virtual machine), osi (OS image), mm, mn, rsa, switch. - + or - + The node type should be pdu - + \ **ondiscover**\ (chain.ondiscover) - + This attribute is currently not used by xCAT. The "nodediscover" operation is always done during node discovery. - + \ **os**\ (nodetype.os) - + The operating system deployed on this node. Valid values: AIX, rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #). As a special case, if this is set to "boottarget", then it will use the initrd/kernel/parameters specified in the row in the boottarget table in which boottarget.bprofile equals nodetype.profile. - + \ **osvolume**\ (storage.osvolume) - + Specification of what storage to place the node OS image onto. Examples include: - - + + .. code-block:: perl - + localdisk (Install to first non-FC attached disk) usbdisk (Install to first USB mass storage device seen) wwn=0x50000393c813840c (Install to storage device with given WWN) - - + + \ **otherinterfaces**\ (hosts.otherinterfaces) - + Other IP addresses to add for this node. Format: -:,:,... - + \ **ou**\ (domain.ou) - + For an LDAP described machine account (i.e. Active Directory), the organizational unit to place the system. If not set, defaults to cn=Computers,dc=your,dc=domain - + \ **outlet**\ (pdu.outlet) - + The pdu outlet count - + \ **parent**\ (ppc.parent) - + For LPARs: the CEC; for FSPs: the CEC; for CEC: the frame (if one exists); for BPA: the frame; for frame: the building block number (which consists 1 or more service nodes and compute/storage nodes that are serviced by them - optional). - + \ **passwd.HMC**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **passwd.admin**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **passwd.celogin**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **passwd.general**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **passwd.hscroot**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **password**\ (ppchcp.password, mpa.password, websrv.password, pdu.password, switches.sshpassword) - + Password of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is abc123 for HMCs and padmin for IVMs. - + or - + Password to use to access the management module. If not specified, the key=blade row in the passwd table is used as the default. - + or - + Password to use to access the web service. - + or - + The remote login password - + or - + The remote login password. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. - + \ **pdu**\ (pduoutlet.pdu) - + a comma-separated list of outlet number for each PDU, ex: pdu1:outlet1,pdu2:outlet1 - + \ **pdutype**\ (pdu.pdutype) - + The type of pdu - + \ **postbootscripts**\ (postscripts.postbootscripts) - + Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab. On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. Please note that the postbootscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postbootscripts" attribute of a node with "chdef -m" command - + \ **postscripts**\ (postscripts.postscripts) - + Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". xCAT automatically adds the postscripts from the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute. For AIX, use the postbootscripts attribute. Please note that the postscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postscripts" attribute of a node with "chdef -m" command - + \ **power**\ (nodehm.power) - + The method to use to control the power of the node. If not set, the mgt attribute will be used. Valid values: ipmi, blade, hmc, ivm, fsp, kvm, esx, rhevm. If "ipmi", xCAT will search for this node in the ipmi table for more info. If "blade", xCAT will search for this node in the mp table. If "hmc", "ivm", or "fsp", xCAT will search for this node in the ppc table. - + \ **pprofile**\ (ppc.pprofile) - + The LPAR profile that will be used the next time the LPAR is powered on with rpower. For DFM, the pprofile attribute should be set to blank - + \ **prescripts-begin**\ (prescripts.begin) - + The scripts to be run at the beginning of the nodeset(Linux), nimnodeset(AIX) or mkdsklsnode(AIX) command. The format is: [action1:]s1,s2...[| action2:s3,s4,s5...] where: - - action1 and action2 for Linux are the nodeset actions specified in the command. + - action1 and action2 for Linux are the nodeset actions specified in the command. For AIX, action1 and action1 can be 'diskless' for mkdsklsnode command' - and 'standalone for nimnodeset command. + and 'standalone for nimnodeset command. - s1 and s2 are the scripts to run for action1 in order. - s3, s4, and s5 are the scripts to run for actions2. If actions are omitted, the scripts apply to all actions. @@ -866,511 +866,511 @@ group Attributes: diskless:myscript1,myscript2 (AIX) install:myscript1,myscript2|netboot:myscript3 (Linux) All the scripts should be copied to /install/prescripts directory. - The following two environment variables will be passed to each script: + The following two environment variables will be passed to each script: NODES a coma separated list of node names that need to run the script for ACTION current nodeset action. If '#xCAT setting:MAX_INSTANCE=number' is specified in the script, the script will get invoked for each node in parallel, but no more than number of instances will be invoked at at a time. If it is not specified, the script will be invoked once for all the nodes. - + \ **prescripts-end**\ (prescripts.end) - + The scripts to be run at the end of the nodeset(Linux), nimnodeset(AIX),or mkdsklsnode(AIX) command. The format is the same as the 'begin' column. - + \ **primarynic**\ (noderes.primarynic) - + This attribute will be deprecated. All the used network interface will be determined by installnic. The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used. Default is eth0. - + \ **privkey**\ (pdu.privkey) - + The privacy passphrase to use for SNMPv3. - + \ **privtype**\ (pdu.privtype) - + The privacy protocol(AES|DES) to use for SNMPv3. - + \ **productkey**\ (prodkey.key) - + The product key relevant to the aforementioned node/group and product combination - + \ **profile**\ (nodetype.profile) - + The string to use to locate a kickstart or autoyast template to use for OS deployment of this node. If the provmethod attribute is set to an osimage name, that takes precedence, and profile need not be defined. Otherwise, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat. - + \ **protocol**\ (switches.protocol) - + Protocol for running remote commands for the switch. The valid values are: ssh, telnet. ssh is the default. If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. The passwd.comments attribute is used for protocol. - + \ **provmethod**\ (nodetype.provmethod) - + The provisioning method for node deployment. The valid values are install, netboot, statelite or an os image name from the osimage table. If an image name is specified, the osimage definition stored in the osimage table and the linuximage table (for Linux) or nimimage table (for AIX) are used to locate the files for templates, pkglists, syncfiles, etc. On Linux, if install, netboot or statelite is specified, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat. - + \ **rack**\ (nodepos.rack) - + The frame the node is in. - + \ **room**\ (nodepos.room) - + The room where the node is located. - + \ **routenames**\ (noderes.routenames) - + A comma separated list of route names that refer to rows in the routes table. These are the routes that should be defined on this node when it is deployed. - + \ **seclevel**\ (pdu.seclevel) - + The Security Level(noAuthNoPriv|authNoPriv|authPriv) to use for SNMPv3. - + \ **serial**\ (vpd.serial) - + The serial number of the node. - + \ **serialflow**\ (nodehm.serialflow) - + The flow control value of the serial port for this node. For SOL this is typically 'hard'. - + \ **serialport**\ (nodehm.serialport) - + The serial port for this node, in the linux numbering style (0=COM1/ttyS0, 1=COM2/ttyS1). For SOL on IBM blades, this is typically 1. For rackmount IBM servers, this is typically 0. - + \ **serialspeed**\ (nodehm.serialspeed) - + The speed of the serial port for this node. For SOL this is typically 19200. - + \ **servicenode**\ (noderes.servicenode) - + A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used. The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove. - + \ **setupconserver**\ (servicenode.conserver) - + Do we set up console service on this service node? Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon. - + \ **setupdhcp**\ (servicenode.dhcpserver) - + Do we set up DHCP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, runs makedhcp -n. If 0, it does not change the current state of the service. - + \ **setupftp**\ (servicenode.ftpserver) - + Do we set up a ftp server on this service node? Not supported on AIX Valid values:1 or 0. If 1, configure and start vsftpd. (You must manually install vsftpd on the service nodes before this.) If 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes - + \ **setupipforward**\ (servicenode.ipforward) - + Do we set up ip forwarding on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - + \ **setupldap**\ (servicenode.ldapserver) - + Do we set up ldap caching proxy on this service node? Not supported on AIX. Valid values:1 or 0. If 0, it does not change the current state of the service. - + \ **setupnameserver**\ (servicenode.nameserver) - + Do we set up DNS on this service node? Valid values: 2, 1, or 0. If 2, creates named.conf as dns slave, using the management node as dns master, and starts named. If 1, creates named.conf file with forwarding to the management node and starts named. If 0, it does not change the current state of the service. - + \ **setupnfs**\ (servicenode.nfsserver) - + Do we set up file services (HTTP,FTP,or NFS) on this service node? For AIX will only setup NFS, not HTTP or FTP. Valid values:1 or 0.If 0, it does not change the current state of the service. - + \ **setupnim**\ (servicenode.nimserver) - + Not used. Do we set up a NIM server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - + \ **setupntp**\ (servicenode.ntpserver) - + Not used. Use setupntp postscript to setup a ntp server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - + \ **setupproxydhcp**\ (servicenode.proxydhcp) - + Do we set up proxydhcp service on this node? valid values: 1 or 0. If 1, the proxydhcp daemon will be enabled on this node. - + \ **setuptftp**\ (servicenode.tftpserver) - + Do we set up TFTP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, configures and starts atftp. If 0, it does not change the current state of the service. - + \ **sfp**\ (ppc.sfp) - + The Service Focal Point of this Frame. This is the name of the HMC that is responsible for collecting hardware service events for this frame and all of the CECs within this frame. - + \ **side**\ (vpd.side) - + - or -. The side information for the BPA/FSP. The side attribute refers to which BPA/FSP, A or B, which is determined by the slot value returned from lsslp command. It also lists the physical port within each BPA/FSP which is determined by the IP address order from the lsslp response. This information is used internally when communicating with the BPAs/FSPs - + \ **slot**\ (nodepos.slot) - + The slot number of the blade in the chassis. For PCM, a comma-separated list of slot numbers is stored - + \ **slotid**\ (mp.id) - + The slot number of this blade in the BladeCenter chassis. - + \ **slots**\ (mpa.slots) - + The number of available slots in the chassis. For PCM, this attribute is used to store the number of slots in the following format: ,, Where: - - + + .. code-block:: perl - + = number of rows of slots in chassis = number of columns of slots in chassis = set to 0 if slots are vertical, and set to 1 if slots of horizontal - - + + \ **snmpauth**\ (switches.auth) - + The authentication protocol to use for SNMPv3. SHA is assumed if v3 enabled and this is unspecified - + \ **snmppassword**\ (switches.password) - + The password string for SNMPv3 or community string for SNMPv1/SNMPv2. Falls back to passwd table, and site snmpc value if using SNMPv1/SNMPv2. - + \ **snmpprivacy**\ (switches.privacy) - + The privacy protocol to use for v3. xCAT will use authNoPriv if this is unspecified. DES is recommended to use if v3 enabled, as it is the most readily available. - + \ **snmpuser**\ (pdu.snmpuser) - + The username to use for SNMPv3 communication, ignored for SNMPv1 - + \ **snmpusername**\ (switches.username) - + The username to use for SNMPv3 communication, ignored for SNMPv1 - + \ **snmpversion**\ (pdu.snmpversion, switches.snmpversion) - + The version to use to communicate with switch. SNMPv1 is assumed by default. - + or - + The version to use to communicate with switch. SNMPv1 is assumed by default. - + \ **storagcontroller**\ (storage.controller) - + The management address to attach/detach new volumes. In the scenario involving multiple controllers, this data must be passed as argument rather than by table value - + \ **storagetype**\ (storage.type) - + The plugin used to drive storage configuration (e.g. svc) - + \ **supernode**\ (ppc.supernode) - + Indicates the connectivity of this CEC in the HFI network. A comma separated list of 2 ids. The first one is the supernode number the CEC is part of. The second one is the logical location number (0-3) of this CEC within the supernode. - + \ **supportedarchs**\ (nodetype.supportedarchs) - + Comma delimited list of architectures this node can execute. - + \ **supportproxydhcp**\ (noderes.proxydhcp) - + To specify whether the node supports proxydhcp protocol. Valid values: yes or 1, no or 0. Default value is yes. - + \ **switch**\ (switch.switch) - + The switch hostname. - + \ **switchinterface**\ (switch.interface) - + The interface name from the node perspective. For example, eth0. For the primary nic, it can be empty, the word "primary" or "primary:ethx" where ethx is the interface name. - + \ **switchport**\ (switch.port) - + The port number in the switch that this node is connected to. On a simple 1U switch, an administrator can generally enter the number as printed next to the ports, and xCAT will understand switch representation differences. On stacked switches or switches with line cards, administrators should usually use the CLI representation (i.e. 2/0/1 or 5/8). One notable exception is stacked SMC 8848M switches, in which you must add 56 for the proceeding switch, then the port number. For example, port 3 on the second switch in an SMC8848M stack would be 59 - + \ **switchtype**\ (switches.switchtype) - + The type of switch. It is used to identify the file name that implements the functions for this switch. The valid values are: Mellanox, Cisco, BNT and Juniper. - + \ **switchvlan**\ (switch.vlan) - + The ID for the tagged vlan that is created on this port using mkvlan and chvlan commands. - + \ **syslog**\ (noderes.syslog) - + To configure how to configure syslog for compute node. Valid values:blank(not set), ignore. blank - run postscript syslog; ignore - do NOT run postscript syslog - + \ **termport**\ (nodehm.termport) - + The port number on the terminal server that this node is connected to. - + \ **termserver**\ (nodehm.termserver) - + The hostname of the terminal server. - + \ **tftpdir**\ (noderes.tftpdir) - + The directory that roots this nodes contents from a tftp and related perspective. Used for NAS offload by using different mountpoints. - + \ **tftpserver**\ (noderes.tftpserver) - + The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver. - + \ **unit**\ (nodepos.u) - + The vertical position of the node in the frame - + \ **urlpath**\ (mpa.urlpath) - + URL path for the Chassis web interface. The full URL is built as follows: / - + \ **usercomment**\ (nodegroup.comments) - + Any user-written notes. - + \ **userid**\ (zvm.userid) - + The z/VM userID of this node. - + \ **username**\ (ppchcp.username, mpa.username, websrv.username, pdu.username, switches.sshusername) - + Userid of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is hscroot for HMCs and padmin for IVMs. - + or - + Userid to use to access the management module. - + or - + Userid to use to access the web service. - + or - + The remote login user name - + or - + The remote login user name. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. - + \ **vmbeacon**\ (vm.beacon) - + This flag is used by xCAT to track the state of the identify LED with respect to the VM. - + \ **vmbootorder**\ (vm.bootorder) - + Boot sequence (i.e. net,hd) - + \ **vmcfgstore**\ (vm.cfgstore) - + Optional location for persistent storage separate of emulated hard drives for virtualization solutions that require persistent store to place configuration data - + \ **vmcluster**\ (vm.cluster) - + Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor. - + \ **vmcpus**\ (vm.cpus) - + Number of CPUs the node should see. - + \ **vmhost**\ (vm.host) - + The system that currently hosts the VM - + \ **vmmanager**\ (vm.mgr) - + The function manager for the virtual machine - + \ **vmmaster**\ (vm.master) - + The name of a master image, if any, this virtual machine is linked to. This is generally set by clonevm and indicates the deletion of a master that would invalidate the storage of this virtual machine - + \ **vmmemory**\ (vm.memory) - + Megabytes of memory the VM currently should be set to. - + \ **vmnicnicmodel**\ (vm.nicmodel) - + Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc) - + \ **vmnics**\ (vm.nics) - + Network configuration parameters. Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan. physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches. hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible. - + \ **vmothersetting**\ (vm.othersettings) - + This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\ on the host. - + \ **vmphyslots**\ (vm.physlots) - + Specify the physical slots drc index that will assigned to the partition, the delimiter is ',', and the drc index must started with '0x'. For more details, reference manpage for 'lsvm'. - + \ **vmstorage**\ (vm.storage) - + A list of storage files or devices to be used. i.e. dir:///cluster/vm/ or nfs:///path/to/folder/ - + \ **vmstoragecache**\ (vm.storagecache) - + Select caching scheme to employ. E.g. KVM understands 'none', 'writethrough' and 'writeback' - + \ **vmstorageformat**\ (vm.storageformat) - + Select disk format to use by default (e.g. raw versus qcow2) - + \ **vmstoragemodel**\ (vm.storagemodel) - + Model of storage devices to provide to guest - + \ **vmtextconsole**\ (vm.textconsole) - + Tracks the Psuedo-TTY that maps to the serial port or console of a VM - + \ **vmvirtflags**\ (vm.virtflags) - - General flags used by the virtualization method. + + General flags used by the virtualization method. For example, in Xen it could, among other things, specify paravirtualized setup, or direct kernel boot. For a hypervisor/dom0 entry, it is the virtualization method (i.e. "xen"). For KVM, the following flag=value pairs are recognized: imageformat=[raw|fullraw|qcow2] raw is a generic sparse file that allocates storage on demand @@ -1378,33 +1378,33 @@ group Attributes: qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level clonemethod=[qemu-img|reflink] qemu-img allows use of qcow2 to generate virtualization layer copy-on-write - reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs + reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs placement_affinity=[migratable|user_migratable|pinned] - + \ **vmvncport**\ (vm.vncport) - + Tracks the current VNC display port (currently not meant to be set - + \ **webport**\ (websrv.port) - + The port of the web service. - + \ **wherevals**\ (nodegroup.wherevals) - + A list of "attr\*val" pairs that can be used to determine the members of a dynamic group, the delimiter is "::" and the operator \* can be ==, =~, != or !~. - + \ **xcatmaster**\ (noderes.xcatmaster) - + The hostname of the xCAT service node (as known by this node). This acts as the default value for nfsserver and tftpserver, if they are not set. If xcatmaster is not set, the node will use whoever responds to its boot request as its master. For the directed bootp case for POWER, it will use the management node if xcatmaster is not set. - + @@ -1413,5 +1413,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 9b142d5f34a3d848391705948affca0ed2e5b355 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0484/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/kit.7.rst --- .../admin-guides/references/man7/kit.7.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/kit.7.rst b/docs/source/guides/admin-guides/references/man7/kit.7.rst index e6062763f..d5626623d 100644 --- a/docs/source/guides/admin-guides/references/man7/kit.7.rst +++ b/docs/source/guides/admin-guides/references/man7/kit.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **kit Attributes:**\ \ *basename*\ , \ *description*\ , \ *isinternal*\ , \ *kitdeployparams*\ , \ *kitdir*\ , \ *kitname*\ , \ *ostype*\ , \ *release*\ , \ *version*\ +\ **kit Attributes:**\ \ *basename*\ , \ *description*\ , \ *isinternal*\ , \ *kitdeployparams*\ , \ *kitdir*\ , \ *kitname*\ , \ *ostype*\ , \ *release*\ , \ *version*\ *********** @@ -40,57 +40,57 @@ kit Attributes: \ **basename**\ (kit.basename) - + The kit base name - + \ **description**\ (kit.description) - + The Kit description. - + \ **isinternal**\ (kit.isinternal) - + A flag to indicated if the Kit is internally used. When set to 1, the Kit is internal. If 0 or undefined, the kit is not internal. - + \ **kitdeployparams**\ (kit.kitdeployparams) - + The file containing the default deployment parameters for this Kit. These parameters are added to the OS Image definition.s list of deployment parameters when one or more Kit Components from this Kit are added to the OS Image. - + \ **kitdir**\ (kit.kitdir) - + The path to Kit Installation directory on the Mgt Node. - + \ **kitname**\ (kit.kitname) - + The unique generated kit name, when kit is added to the cluster. - + \ **ostype**\ (kit.ostype) - + The kit OS type. Linux or AIX. - + \ **release**\ (kit.release) - + The kit release - + \ **version**\ (kit.version) - + The kit version - + @@ -99,5 +99,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 528b8faae35b5558bc9bbd621dcaca485bfa5cf3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0485/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst --- .../references/man7/kitcomponent.7.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst b/docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst index a5d222d13..6ab65f5aa 100644 --- a/docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst +++ b/docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **kitcomponent Attributes:**\ \ *basename*\ , \ *description*\ , \ *driverpacks*\ , \ *exlist*\ , \ *genimage_postinstall*\ , \ *kitcompdeps*\ , \ *kitcompname*\ , \ *kitname*\ , \ *kitpkgdeps*\ , \ *kitreponame*\ , \ *postbootscripts*\ , \ *prerequisite*\ , \ *release*\ , \ *serverroles*\ , \ *version*\ +\ **kitcomponent Attributes:**\ \ *basename*\ , \ *description*\ , \ *driverpacks*\ , \ *exlist*\ , \ *genimage_postinstall*\ , \ *kitcompdeps*\ , \ *kitcompname*\ , \ *kitname*\ , \ *kitpkgdeps*\ , \ *kitreponame*\ , \ *postbootscripts*\ , \ *prerequisite*\ , \ *release*\ , \ *serverroles*\ , \ *version*\ *********** @@ -40,93 +40,93 @@ kitcomponent Attributes: \ **basename**\ (kitcomponent.basename) - + Kit Component basename. - + \ **description**\ (kitcomponent.description) - + The Kit component description. - + \ **driverpacks**\ (kitcomponent.driverpacks) - + Comma-separated List of driver package names. These must be full names like: pkg1-1.0-1.x86_64.rpm. - + \ **exlist**\ (kitcomponent.exlist) - + Exclude list file containing the files/directories to exclude when building a diskless image. - + \ **genimage_postinstall**\ (kitcomponent.genimage_postinstall) - + Comma-separated list of postinstall scripts that will run during the genimage. - + \ **kitcompdeps**\ (kitcomponent.kitcompdeps) - + Comma-separated list of kit components that this kit component depends on. - + \ **kitcompname**\ (kitcomponent.kitcompname) - + The unique Kit Component name. It is auto-generated when the parent Kit is added to the cluster. - + \ **kitname**\ (kitcomponent.kitname) - + The Kit name which this Kit Component belongs to. - + \ **kitpkgdeps**\ (kitcomponent.kitpkgdeps) - + Comma-separated list of packages that this kit component depends on. - + \ **kitreponame**\ (kitcomponent.kitreponame) - + The Kit Package Repository name which this Kit Component belongs to. - + \ **postbootscripts**\ (kitcomponent.postbootscripts) - + Comma-separated list of postbootscripts that will run during the node boot. - + \ **prerequisite**\ (kitcomponent.prerequisite) - + Prerequisite for this kit component, the prerequisite includes ospkgdeps,preinstall,preupgrade,preuninstall scripts - + \ **release**\ (kitcomponent.release) - + Kit Component release. - + \ **serverroles**\ (kitcomponent.serverroles) - + The types of servers that this Kit Component can install on. Valid types are: mgtnode, servicenode, compute - + \ **version**\ (kitcomponent.version) - + Kit Component version. - + @@ -135,5 +135,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 553dda9b5ca1d69ba12e74f95a10b03b6b098a0a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0486/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/kitrepo.7.rst --- .../references/man7/kitrepo.7.rst | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/kitrepo.7.rst b/docs/source/guides/admin-guides/references/man7/kitrepo.7.rst index e5bf6c359..4abf1a4bf 100644 --- a/docs/source/guides/admin-guides/references/man7/kitrepo.7.rst +++ b/docs/source/guides/admin-guides/references/man7/kitrepo.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **kitrepo Attributes:**\ \ *compat_osbasenames*\ , \ *kitname*\ , \ *kitrepodir*\ , \ *kitreponame*\ , \ *osarch*\ , \ *osbasename*\ , \ *osmajorversion*\ , \ *osminorversion*\ +\ **kitrepo Attributes:**\ \ *compat_osbasenames*\ , \ *kitname*\ , \ *kitrepodir*\ , \ *kitreponame*\ , \ *osarch*\ , \ *osbasename*\ , \ *osmajorversion*\ , \ *osminorversion*\ *********** @@ -40,51 +40,51 @@ kitrepo Attributes: \ **compat_osbasenames**\ (kitrepo.compat_osbasenames) - + List of compatible OS base names. - + \ **kitname**\ (kitrepo.kitname) - + The Kit name which this Kit Package Repository belongs to. - + \ **kitrepodir**\ (kitrepo.kitrepodir) - + The path to Kit Repository directory on the Mgt Node. - + \ **kitreponame**\ (kitrepo.kitreponame) - + The unique generated kit repo package name, when kit is added to the cluster. - + \ **osarch**\ (kitrepo.osarch) - + The OS distro arch which this repository is based on. - + \ **osbasename**\ (kitrepo.osbasename) - + The OS distro name which this repository is based on. - + \ **osmajorversion**\ (kitrepo.osmajorversion) - + The OS distro major version which this repository is based on. - + \ **osminorversion**\ (kitrepo.osminorversion) - + The OS distro minor version which this repository is based on. If this attribute is not set, it means that this repo applies to all minor versions. - + @@ -93,5 +93,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From e3e0f6267dc56f870f73594731554bcb11e684d7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0487/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/monitoring.7.rst --- .../references/man7/monitoring.7.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/monitoring.7.rst b/docs/source/guides/admin-guides/references/man7/monitoring.7.rst index 8c7953e7f..478824ad7 100644 --- a/docs/source/guides/admin-guides/references/man7/monitoring.7.rst +++ b/docs/source/guides/admin-guides/references/man7/monitoring.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **monitoring Attributes:**\ \ *comments*\ , \ *disable*\ , \ *name*\ , \ *nodestatmon*\ +\ **monitoring Attributes:**\ \ *comments*\ , \ *disable*\ , \ *name*\ , \ *nodestatmon*\ *********** @@ -40,27 +40,27 @@ monitoring Attributes: \ **comments**\ (monitoring.comments) - + Any user-written notes. - + \ **disable**\ (monitoring.disable) - + Set to 'yes' or '1' to comment out this row. - + \ **name**\ (monitoring.name) - + The name of the monitoring plug-in module. The plug-in must be put in /lib/perl/xCAT_monitoring/. See the man page for monstart for details. - + \ **nodestatmon**\ (monitoring.nodestatmon) - + Specifies if the monitoring plug-in is used to feed the node status to the xCAT cluster. Any one of the following values indicates "yes": y, Y, yes, Yes, YES, 1. Any other value or blank (default), indicates "no". - + @@ -69,5 +69,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From f5cab4c8e3230eca6cb0a354be2e22edc6697a99 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0488/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/network.7.rst --- .../references/man7/network.7.rst | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/network.7.rst b/docs/source/guides/admin-guides/references/man7/network.7.rst index 593a52fb0..9702cc574 100644 --- a/docs/source/guides/admin-guides/references/man7/network.7.rst +++ b/docs/source/guides/admin-guides/references/man7/network.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **network Attributes:**\ \ *ddnsdomain*\ , \ *dhcpserver*\ , \ *domain*\ , \ *dynamicrange*\ , \ *gateway*\ , \ *logservers*\ , \ *mask*\ , \ *mgtifname*\ , \ *mtu*\ , \ *nameservers*\ , \ *net*\ , \ *netname*\ , \ *nodehostname*\ , \ *ntpservers*\ , \ *staticrange*\ , \ *staticrangeincrement*\ , \ *tftpserver*\ , \ *usercomment*\ , \ *vlanid*\ +\ **network Attributes:**\ \ *ddnsdomain*\ , \ *dhcpserver*\ , \ *domain*\ , \ *dynamicrange*\ , \ *gateway*\ , \ *logservers*\ , \ *mask*\ , \ *mgtifname*\ , \ *mtu*\ , \ *nameservers*\ , \ *net*\ , \ *netname*\ , \ *nodehostname*\ , \ *ntpservers*\ , \ *staticrange*\ , \ *staticrangeincrement*\ , \ *tftpserver*\ , \ *usercomment*\ , \ *vlanid*\ *********** @@ -40,93 +40,93 @@ network Attributes: \ **ddnsdomain**\ (networks.ddnsdomain) - + A domain to be combined with nodename to construct FQDN for DDNS updates induced by DHCP. This is not passed down to the client as "domain" - + \ **dhcpserver**\ (networks.dhcpserver) - + The DHCP server that is servicing this network. Required to be explicitly set for pooled service node operation. - + \ **domain**\ (networks.domain) - + The DNS domain name (ex. cluster.com). - + \ **dynamicrange**\ (networks.dynamicrange) - + The IP address range used by DHCP to assign dynamic IP addresses for requests on this network. This should not overlap with entities expected to be configured with static host declarations, i.e. anything ever expected to be a node with an address registered in the mac table. - + \ **gateway**\ (networks.gateway) - + The network gateway. It can be set to an ip address or the keyword , the keyword indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network. - + \ **logservers**\ (networks.logservers) - + The log servers for this network. Used in creating the DHCP network definition. Assumed to be the DHCP server if not set. - + \ **mask**\ (networks.mask) - + The network mask. - + \ **mgtifname**\ (networks.mgtifname) - + The interface name of the management/service node facing this network. !remote! indicates a non-local network on a specific nic for relay DHCP. - + \ **mtu**\ (networks.mtu) - + The default MTU for the network, If multiple networks are applied to the same nic on the SN and/or CN, the MTU shall be the same for those networks. - + \ **nameservers**\ (networks.nameservers) - + A comma delimited list of DNS servers that each node in this network should use. This value will end up in the nameserver settings of the /etc/resolv.conf on each node in this network. If this attribute value is set to the IP address of an xCAT node, make sure DNS is running on it. In a hierarchical cluster, you can also set this attribute to "" to mean the DNS server for each node in this network should be the node that is managing it (either its service node or the management node). Used in creating the DHCP network definition, and DNS configuration. - + \ **net**\ (networks.net) - + The network address. - + \ **netname**\ (networks.netname) - + Name used to identify this network definition. - + \ **nodehostname**\ (networks.nodehostname) - + A regular expression used to specify node name to network-specific hostname. i.e. "/\z/-secondary/" would mean that the hostname of "n1" would be n1-secondary on this network. By default, the nodename is assumed to equal the hostname, followed by nodename-interfacename. - + \ **ntpservers**\ (networks.ntpservers) - + The ntp servers for this network. Used in creating the DHCP network definition. Assumed to be the DHCP server if not set. - + \ **staticrange**\ (networks.staticrange) - + The IP address range used to dynamically assign static IPs to newly discovered nodes. This should not overlap with the dynamicrange nor overlap with entities that were manually assigned static IPs. The format for the attribute value is: -. - + \ **staticrangeincrement**\ (networks.staticrangeincrement) @@ -134,21 +134,21 @@ network Attributes: \ **tftpserver**\ (networks.tftpserver) - + The TFTP server that is servicing this network. If not set, the DHCP server is assumed. - + \ **usercomment**\ (networks.comments) - + Any user-written notes. - + \ **vlanid**\ (networks.vlanid) - + The vlan ID if this network is within a vlan. - + @@ -157,5 +157,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 44385aa008b10ad38b6d03089438e7b644d4617a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0489/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/node.7.rst --- .../admin-guides/references/man7/node.7.rst | 976 +++++++++--------- 1 file changed, 488 insertions(+), 488 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/node.7.rst b/docs/source/guides/admin-guides/references/man7/node.7.rst index 985dadec3..0a57e2ceb 100644 --- a/docs/source/guides/admin-guides/references/man7/node.7.rst +++ b/docs/source/guides/admin-guides/references/man7/node.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **node Attributes:**\ \ *addkcmdline*\ , \ *appstatus*\ , \ *appstatustime*\ , \ *arch*\ , \ *authdomain*\ , \ *authkey*\ , \ *authtype*\ , \ *bmc*\ , \ *bmcpassword*\ , \ *bmcport*\ , \ *bmcusername*\ , \ *bmcvlantag*\ , \ *cfgmgr*\ , \ *cfgmgtroles*\ , \ *cfgserver*\ , \ *chain*\ , \ *chassis*\ , \ *cmdmapping*\ , \ *community*\ , \ *cons*\ , \ *conserver*\ , \ *consoleenabled*\ , \ *consoleondemand*\ , \ *consport*\ , \ *cpucount*\ , \ *cputype*\ , \ *currchain*\ , \ *currstate*\ , \ *dhcpinterfaces*\ , \ *disksize*\ , \ *displayname*\ , \ *dockercpus*\ , \ *dockerflag*\ , \ *dockerhost*\ , \ *dockermemory*\ , \ *dockernics*\ , \ *domainadminpassword*\ , \ *domainadminuser*\ , \ *domaintype*\ , \ *getmac*\ , \ *groups*\ , \ *hcp*\ , \ *height*\ , \ *hidden*\ , \ *hostcluster*\ , \ *hostinterface*\ , \ *hostmanager*\ , \ *hostnames*\ , \ *hosttype*\ , \ *hwtype*\ , \ *id*\ , \ *initrd*\ , \ *installnic*\ , \ *interface*\ , \ *ip*\ , \ *iscsipassword*\ , \ *iscsiserver*\ , \ *iscsitarget*\ , \ *iscsiuserid*\ , \ *kcmdline*\ , \ *kernel*\ , \ *linkports*\ , \ *mac*\ , \ *memory*\ , \ *mgt*\ , \ *micbridge*\ , \ *michost*\ , \ *micid*\ , \ *miconboot*\ , \ *micpowermgt*\ , \ *micvlog*\ , \ *migrationdest*\ , \ *monserver*\ , \ *mpa*\ , \ *mtm*\ , \ *nameservers*\ , \ *netboot*\ , \ *nfsdir*\ , \ *nfsserver*\ , \ *nicaliases*\ , \ *niccustomscripts*\ , \ *nicdevices*\ , \ *nicextraparams*\ , \ *nichostnameprefixes*\ , \ *nichostnamesuffixes*\ , \ *nicips*\ , \ *nicnetworks*\ , \ *nicsadapter*\ , \ *nictypes*\ , \ *nimserver*\ , \ *node*\ , \ *nodetype*\ , \ *ondiscover*\ , \ *os*\ , \ *osvolume*\ , \ *otherinterfaces*\ , \ *ou*\ , \ *outlet*\ , \ *parent*\ , \ *passwd.HMC*\ , \ *passwd.admin*\ , \ *passwd.celogin*\ , \ *passwd.general*\ , \ *passwd.hscroot*\ , \ *password*\ , \ *pdu*\ , \ *pdutype*\ , \ *postbootscripts*\ , \ *postscripts*\ , \ *power*\ , \ *pprofile*\ , \ *prescripts-begin*\ , \ *prescripts-end*\ , \ *primarynic*\ , \ *primarysn*\ , \ *privkey*\ , \ *privtype*\ , \ *productkey*\ , \ *profile*\ , \ *protocol*\ , \ *provmethod*\ , \ *rack*\ , \ *room*\ , \ *routenames*\ , \ *seclevel*\ , \ *serial*\ , \ *serialflow*\ , \ *serialport*\ , \ *serialspeed*\ , \ *servicenode*\ , \ *setupconserver*\ , \ *setupdhcp*\ , \ *setupftp*\ , \ *setupipforward*\ , \ *setupldap*\ , \ *setupnameserver*\ , \ *setupnfs*\ , \ *setupnim*\ , \ *setupntp*\ , \ *setupproxydhcp*\ , \ *setuptftp*\ , \ *sfp*\ , \ *side*\ , \ *slot*\ , \ *slotid*\ , \ *slots*\ , \ *snmpauth*\ , \ *snmppassword*\ , \ *snmpprivacy*\ , \ *snmpuser*\ , \ *snmpusername*\ , \ *snmpversion*\ , \ *status*\ , \ *statustime*\ , \ *storagcontroller*\ , \ *storagetype*\ , \ *supernode*\ , \ *supportedarchs*\ , \ *supportproxydhcp*\ , \ *switch*\ , \ *switchinterface*\ , \ *switchport*\ , \ *switchtype*\ , \ *switchvlan*\ , \ *syslog*\ , \ *termport*\ , \ *termserver*\ , \ *tftpdir*\ , \ *tftpserver*\ , \ *unit*\ , \ *updatestatus*\ , \ *updatestatustime*\ , \ *urlpath*\ , \ *usercomment*\ , \ *userid*\ , \ *username*\ , \ *vmbeacon*\ , \ *vmbootorder*\ , \ *vmcfgstore*\ , \ *vmcluster*\ , \ *vmcpus*\ , \ *vmhost*\ , \ *vmmanager*\ , \ *vmmaster*\ , \ *vmmemory*\ , \ *vmnicnicmodel*\ , \ *vmnics*\ , \ *vmothersetting*\ , \ *vmphyslots*\ , \ *vmstorage*\ , \ *vmstoragecache*\ , \ *vmstorageformat*\ , \ *vmstoragemodel*\ , \ *vmtextconsole*\ , \ *vmvirtflags*\ , \ *vmvncport*\ , \ *webport*\ , \ *xcatmaster*\ , \ *zonename*\ +\ **node Attributes:**\ \ *addkcmdline*\ , \ *appstatus*\ , \ *appstatustime*\ , \ *arch*\ , \ *authdomain*\ , \ *authkey*\ , \ *authtype*\ , \ *bmc*\ , \ *bmcpassword*\ , \ *bmcport*\ , \ *bmcusername*\ , \ *bmcvlantag*\ , \ *cfgmgr*\ , \ *cfgmgtroles*\ , \ *cfgserver*\ , \ *chain*\ , \ *chassis*\ , \ *cmdmapping*\ , \ *community*\ , \ *cons*\ , \ *conserver*\ , \ *consoleenabled*\ , \ *consoleondemand*\ , \ *consport*\ , \ *cpucount*\ , \ *cputype*\ , \ *currchain*\ , \ *currstate*\ , \ *dhcpinterfaces*\ , \ *disksize*\ , \ *displayname*\ , \ *dockercpus*\ , \ *dockerflag*\ , \ *dockerhost*\ , \ *dockermemory*\ , \ *dockernics*\ , \ *domainadminpassword*\ , \ *domainadminuser*\ , \ *domaintype*\ , \ *getmac*\ , \ *groups*\ , \ *hcp*\ , \ *height*\ , \ *hidden*\ , \ *hostcluster*\ , \ *hostinterface*\ , \ *hostmanager*\ , \ *hostnames*\ , \ *hosttype*\ , \ *hwtype*\ , \ *id*\ , \ *initrd*\ , \ *installnic*\ , \ *interface*\ , \ *ip*\ , \ *iscsipassword*\ , \ *iscsiserver*\ , \ *iscsitarget*\ , \ *iscsiuserid*\ , \ *kcmdline*\ , \ *kernel*\ , \ *linkports*\ , \ *mac*\ , \ *memory*\ , \ *mgt*\ , \ *micbridge*\ , \ *michost*\ , \ *micid*\ , \ *miconboot*\ , \ *micpowermgt*\ , \ *micvlog*\ , \ *migrationdest*\ , \ *monserver*\ , \ *mpa*\ , \ *mtm*\ , \ *nameservers*\ , \ *netboot*\ , \ *nfsdir*\ , \ *nfsserver*\ , \ *nicaliases*\ , \ *niccustomscripts*\ , \ *nicdevices*\ , \ *nicextraparams*\ , \ *nichostnameprefixes*\ , \ *nichostnamesuffixes*\ , \ *nicips*\ , \ *nicnetworks*\ , \ *nicsadapter*\ , \ *nictypes*\ , \ *nimserver*\ , \ *node*\ , \ *nodetype*\ , \ *ondiscover*\ , \ *os*\ , \ *osvolume*\ , \ *otherinterfaces*\ , \ *ou*\ , \ *outlet*\ , \ *parent*\ , \ *passwd.HMC*\ , \ *passwd.admin*\ , \ *passwd.celogin*\ , \ *passwd.general*\ , \ *passwd.hscroot*\ , \ *password*\ , \ *pdu*\ , \ *pdutype*\ , \ *postbootscripts*\ , \ *postscripts*\ , \ *power*\ , \ *pprofile*\ , \ *prescripts-begin*\ , \ *prescripts-end*\ , \ *primarynic*\ , \ *primarysn*\ , \ *privkey*\ , \ *privtype*\ , \ *productkey*\ , \ *profile*\ , \ *protocol*\ , \ *provmethod*\ , \ *rack*\ , \ *room*\ , \ *routenames*\ , \ *seclevel*\ , \ *serial*\ , \ *serialflow*\ , \ *serialport*\ , \ *serialspeed*\ , \ *servicenode*\ , \ *setupconserver*\ , \ *setupdhcp*\ , \ *setupftp*\ , \ *setupipforward*\ , \ *setupldap*\ , \ *setupnameserver*\ , \ *setupnfs*\ , \ *setupnim*\ , \ *setupntp*\ , \ *setupproxydhcp*\ , \ *setuptftp*\ , \ *sfp*\ , \ *side*\ , \ *slot*\ , \ *slotid*\ , \ *slots*\ , \ *snmpauth*\ , \ *snmppassword*\ , \ *snmpprivacy*\ , \ *snmpuser*\ , \ *snmpusername*\ , \ *snmpversion*\ , \ *status*\ , \ *statustime*\ , \ *storagcontroller*\ , \ *storagetype*\ , \ *supernode*\ , \ *supportedarchs*\ , \ *supportproxydhcp*\ , \ *switch*\ , \ *switchinterface*\ , \ *switchport*\ , \ *switchtype*\ , \ *switchvlan*\ , \ *syslog*\ , \ *termport*\ , \ *termserver*\ , \ *tftpdir*\ , \ *tftpserver*\ , \ *unit*\ , \ *updatestatus*\ , \ *updatestatustime*\ , \ *urlpath*\ , \ *usercomment*\ , \ *userid*\ , \ *username*\ , \ *vmbeacon*\ , \ *vmbootorder*\ , \ *vmcfgstore*\ , \ *vmcluster*\ , \ *vmcpus*\ , \ *vmhost*\ , \ *vmmanager*\ , \ *vmmaster*\ , \ *vmmemory*\ , \ *vmnicnicmodel*\ , \ *vmnics*\ , \ *vmothersetting*\ , \ *vmphyslots*\ , \ *vmstorage*\ , \ *vmstoragecache*\ , \ *vmstorageformat*\ , \ *vmstoragemodel*\ , \ *vmtextconsole*\ , \ *vmvirtflags*\ , \ *vmvncport*\ , \ *webport*\ , \ *xcatmaster*\ , \ *zonename*\ *********** @@ -40,830 +40,830 @@ node Attributes: \ **addkcmdline**\ (bootparams.addkcmdline) - + User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ") - + \ **appstatus**\ (nodelist.appstatus) - + A comma-delimited list of application status. For example: 'sshd=up,ftp=down,ll=down' - + \ **appstatustime**\ (nodelist.appstatustime) - + The date and time when appstatus was updated. - + \ **arch**\ (nodetype.arch) - + The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64. - + \ **authdomain**\ (domain.authdomain) - + If a node should participate in an AD domain or Kerberos realm distinct from domain indicated in site, this field can be used to specify that - + \ **authkey**\ (pdu.authkey) - + The authentication passphrase for SNMPv3 - + \ **authtype**\ (pdu.authtype) - + The authentication protocol(MD5|SHA) to use for SNMPv3. - + \ **bmc**\ (ipmi.bmc, openbmc.bmc) - + The hostname of the BMC adapter. - + or - + The hostname of the BMC adapter. - + \ **bmcpassword**\ (ipmi.password, openbmc.password) - + The BMC password. If not specified, the key=ipmi row in the passwd table is used as the default. - + or - + The BMC password. - + \ **bmcport**\ (ipmi.bmcport) - + In systems with selectable shared/dedicated ethernet ports, this parameter can be used to specify the preferred port. 0 means use the shared port, 1 means dedicated, blank is to not assign. - - + + .. code-block:: perl - + The following special cases exist for IBM System x servers: - + For x3755 M3 systems, 0 means use the dedicated port, 1 means shared, blank is to not assign. - + For certain systems which have a mezzaine or ML2 adapter, there is a second value to include: - - + + For x3750 M4 (Model 8722): - - + + 0 2 1st 1Gbps interface for LOM - + 0 0 1st 10Gbps interface for LOM - + 0 3 2nd 1Gbps interface for LOM - + 0 1 2nd 10Gbps interface for LOM - - + + For x3750 M4 (Model 8752), x3850/3950 X6, dx360 M4, x3550 M4, and x3650 M4: - - + + 0 Shared (1st onboard interface) - + 1 Dedicated - + 2 0 First interface on ML2 or mezzanine adapter - + 2 1 Second interface on ML2 or mezzanine adapter - + 2 2 Third interface on ML2 or mezzanine adapter - + 2 3 Fourth interface on ML2 or mezzanine adapter - - + + \ **bmcusername**\ (ipmi.username, openbmc.username) - + The BMC userid. If not specified, the key=ipmi row in the passwd table is used as the default. - + or - + The BMC userid. - + \ **bmcvlantag**\ (ipmi.taggedvlan, openbmc.taggedvlan) - + bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified. - + or - + bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified. - + \ **cfgmgr**\ (cfgmgt.cfgmgr) - + The name of the configuration manager service. Currently 'chef' and 'puppet' are supported services. - + \ **cfgmgtroles**\ (cfgmgt.roles) - + The roles associated with this node as recognized by the cfgmgr for the software that is to be installed and configured. These role names map to chef recipes or puppet manifest classes that should be used for this node. For example, chef OpenStack cookbooks have roles such as mysql-master,keystone, glance, nova-controller, nova-conductor, cinder-all. - + \ **cfgserver**\ (cfgmgt.cfgserver) - + The xCAT node name of the chef server or puppet master - + \ **chain**\ (chain.chain) - + A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.) The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell. - + \ **chassis**\ (nodepos.chassis) - + The BladeCenter chassis the blade is in. - + \ **cmdmapping**\ (nodehm.cmdmapping) - + The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device. Only used by PCM. - + \ **community**\ (pdu.community) - + The community string to use for SNMPv1/v2 - + \ **cons**\ (nodehm.cons) - + The console method. If nodehm.serialport is set, this will default to the nodehm.mgt setting, otherwise it defaults to unused. Valid values: cyclades, mrv, or the values valid for the mgt attribute. - + \ **conserver**\ (nodehm.conserver) - + The hostname of the machine where the conserver daemon is running. If not set, the default is the xCAT management node. - + \ **consoleenabled**\ (nodehm.consoleenabled) - + A flag field to indicate whether the node is registered in the console server. If '1', console is enabled, if not set, console is not enabled. - + \ **consoleondemand**\ (nodehm.consoleondemand) - + This overrides the value from site.consoleondemand. Set to 'yes', 'no', '1' (equivalent to 'yes'), or '0' (equivalent to 'no'). If not set, the default is the value from site.consoleondemand. - + \ **consport**\ (openbmc.consport) - + The console port for OpenBMC. - + \ **cpucount**\ (hwinv.cpucount) - + The number of cpus for the node. - + \ **cputype**\ (hwinv.cputype) - + The cpu model name for the node. - + \ **currchain**\ (chain.currchain) - + The chain steps still left to do for this node. This attribute will be automatically adjusted by xCAT while xCAT-genesis is running on the node (either during node discovery or a special operation like firmware update). During node discovery, this attribute is initialized from the chain attribute and updated as the chain steps are executed. - + \ **currstate**\ (chain.currstate) - + The current or next chain step to be executed on this node by xCAT-genesis. Set by xCAT during node discovery or as a result of nodeset. - + \ **dhcpinterfaces**\ (servicenode.dhcpinterfaces) - + The network interfaces DHCP server should listen on for the target node. This attribute can be used for management node and service nodes. If defined, it will override the values defined in site.dhcpinterfaces. This is a comma separated list of device names. !remote! indicates a non-local network for relay DHCP. For example: !remote!,eth0,eth1 - + \ **disksize**\ (hwinv.disksize) - + The size of the disks for the node in GB. - + \ **displayname**\ (mpa.displayname) - + Alternative name for BladeCenter chassis. Only used by PCM. - + \ **dockercpus**\ (vm.cpus) - + Number of CPUs the node should see. - + \ **dockerflag**\ (vm.othersettings) - + This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\ on the host. - + \ **dockerhost**\ (vm.host) - + The system that currently hosts the VM - + \ **dockermemory**\ (vm.memory) - + Megabytes of memory the VM currently should be set to. - + \ **dockernics**\ (vm.nics) - + Network configuration parameters. Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan. physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches. hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible. - + \ **domainadminpassword**\ (domain.adminpassword) - + Allow a node specific indication of Administrative user password for the domain. Most will want to ignore this in favor of passwd table. - + \ **domainadminuser**\ (domain.adminuser) - + Allow a node specific indication of Administrative user. Most will want to just use passwd table to indicate this once rather than by node. - + \ **domaintype**\ (domain.type) - + Type, if any, of authentication domain to manipulate. The only recognized value at the moment is activedirectory. - + \ **getmac**\ (nodehm.getmac) - + The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used. Valid values: same as values for mgmt attribute. - + \ **groups**\ (nodelist.groups) - + A comma-delimited list of groups this node is a member of. Group names are arbitrary, except all nodes should be part of the 'all' group. Internal group names are designated by using __. For example, __Unmanaged, could be the internal name for a group of nodes that is not managed by xCAT. Admins should avoid using the __ characters when defining their groups. - + \ **hcp**\ (ppc.hcp, zvm.hcp) - + The hardware control point for this node (HMC, IVM, Frame or CEC). Do not need to set for BPAs and FSPs. - + or - + The hardware control point for this node. - + \ **height**\ (nodepos.height) - + The server height in U(s). - + \ **hidden**\ (nodelist.hidden) - + Used to hide fsp and bpa definitions, 1 means not show them when running lsdef and nodels - + \ **hostcluster**\ (hypervisor.cluster) - + Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor. - + \ **hostinterface**\ (hypervisor.interface) - + The definition of interfaces for the hypervisor. The format is [networkname:interfacename:bootprotocol:IP:netmask:gateway] that split with | for each interface - + \ **hostmanager**\ (hypervisor.mgr) - + The virtualization specific manager of this hypervisor when applicable - + \ **hostnames**\ (hosts.hostnames) - + Hostname aliases added to /etc/hosts for this node. Comma or blank separated list. - + \ **hosttype**\ (hypervisor.type) - + The plugin associated with hypervisor specific commands such as revacuate - + \ **hwtype**\ (ppc.nodetype, zvm.nodetype, mp.nodetype, mic.nodetype) - + The hardware type of the node. Only can be one of fsp, bpa, cec, frame, ivm, hmc and lpar - + or - + The node type. Valid values: cec (Central Electronic Complex), lpar (logical partition), zvm (z/VM host operating system), and vm (virtual machine). - + or - + The hardware type for mp node. Valid values: mm,cmm, blade. - + or - + The hardware type of the mic node. Generally, it is mic. - + \ **id**\ (ppc.id, mp.id) - + For LPARs: the LPAR numeric id; for CECs: the cage number; for Frames: the frame number. - + or - + The slot number of this blade in the BladeCenter chassis. - + \ **initrd**\ (bootparams.initrd) - + The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel) - + \ **installnic**\ (noderes.installnic) - + The network adapter on the node that will be used for OS deployment, the installnic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used. If not set, primarynic will be used. If primarynic is not set too, the keyword "mac" will be used as default. - + \ **interface**\ (mac.interface) - + The adapter interface name that will be used to install and manage the node. E.g. eth0 (for linux) or en0 (for AIX).) - + \ **ip**\ (hosts.ip) - + The IP address of the node. This is only used in makehosts. The rest of xCAT uses system name resolution to resolve node names to IP addresses. - + \ **iscsipassword**\ (iscsi.passwd) - + The password for the iscsi server containing the boot device for this node. - + \ **iscsiserver**\ (iscsi.server) - + The server containing the iscsi boot device for this node. - + \ **iscsitarget**\ (iscsi.target) - + The iscsi disk used for the boot device for this node. Filled in by xCAT. - + \ **iscsiuserid**\ (iscsi.userid) - + The userid of the iscsi server containing the boot device for this node. - + \ **kcmdline**\ (bootparams.kcmdline) - + Arguments to be passed to the kernel - + \ **kernel**\ (bootparams.kernel) - + The kernel that network boot actions should currently acquire and use. Note this could be a chained boot loader such as memdisk or a non-linux boot loader - + \ **linkports**\ (switches.linkports) - + The ports that connect to other switches. Currently, this column is only used by vlan configuration. The format is: "port_number:switch,port_number:switch...". Refer to the switch table for details on how to specify the port numbers. - + \ **mac**\ (mac.mac) - + The mac address or addresses for which xCAT will manage static bindings for this node. This may be simply a mac address, which would be bound to the node name (such as "01:02:03:04:05:0E"). This may also be a "|" delimited string of "mac address!hostname" format (such as "01:02:03:04:05:0E!node5|01:02:03:04:05:0F!node6-eth1"). If there are multiple nics connected to Management Network(usually for bond), in order to make sure the OS deployment finished successfully, the macs of those nics must be able to resolve to same IP address. First, users have to create alias of the node for each mac in the Management Network through either: 1. adding the alias into /etc/hosts for the node directly or: 2. setting the alias to the "hostnames" attribute and then run "makehost" against the node. Then, configure the "mac" attribute of the node like "mac1!node|mac2!node-alias". For the first mac address (mac1 in the example) set in "mac" attribute, do not need to set a "node name" string for it since the nodename of the node will be used for it by default. - + \ **memory**\ (hwinv.memory) - + The size of the memory for the node in MB. - + \ **mgt**\ (nodehm.mgt) - + The method to use to do general hardware management of the node. This attribute is used as the default if power or getmac is not set. Valid values: openbmc, ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm. See the power attribute for more details. - + \ **micbridge**\ (mic.bridge) - + The virtual bridge on the host node which the mic connected to. - + \ **michost**\ (mic.host) - + The host node which the mic card installed on. - + \ **micid**\ (mic.id) - + The device id of the mic node. - + \ **miconboot**\ (mic.onboot) - + Set mic to autoboot when mpss start. Valid values: yes|no. Default is yes. - + \ **micpowermgt**\ (mic.powermgt) - + Set the Power Management for mic node. This attribute is used to set the power management state that mic may get into when it is idle. Four states can be set: cpufreq, corec6, pc3 and pc6. The valid value for powermgt attribute should be [cpufreq=]![corec6=]![pc3=]![pc6=]. e.g. cpufreq=on!corec6=off!pc3=on!pc6=off. Refer to the doc of mic to get more information for power management. - + \ **micvlog**\ (mic.vlog) - + Set the Verbose Log to console. Valid values: yes|no. Default is no. - + \ **migrationdest**\ (vm.migrationdest) - + A noderange representing candidate destinations for migration (i.e. similar systems, same SAN, or other criteria that xCAT can use - + \ **monserver**\ (noderes.monserver) - + The monitoring aggregation point for this node. The format is "x,y" where x is the ip address as known by the management node and y is the ip address as known by the node. - + \ **mpa**\ (mp.mpa) - + The management module used to control this blade. - + \ **mtm**\ (vpd.mtm) - + The machine type and model number of the node. E.g. 7984-6BU - + \ **nameservers**\ (noderes.nameservers) - + An optional node/group specific override for name server list. Most people want to stick to site or network defined nameserver configuration. - + \ **netboot**\ (noderes.netboot) - + The type of network booting to use for this node. Valid values: - - + + .. code-block:: perl - + Arch OS valid netboot options x86, x86_64 ALL pxe, xnba ppc64 <=rhel6, <=sles11.3 yaboot ppc64 >=rhels7, >=sles11.4 grub2,grub2-http,grub2-tftp ppc64le NonVirtualize ALL petitboot ppc64le PowerKVM Guest ALL grub2,grub2-http,grub2-tftp - - + + \ **nfsdir**\ (noderes.nfsdir) - + The path that should be mounted from the NFS server. - + \ **nfsserver**\ (noderes.nfsserver) - + The NFS or HTTP server for this node (as known by this node). - + \ **nicaliases**\ (nics.nicaliases) - + Comma-separated list of hostname aliases for each NIC. Format: eth0!,eth1!| - For multiple aliases per nic use a space-separated list. + For multiple aliases per nic use a space-separated list. For example: eth0!moe larry curly,eth1!tom|jerry - + \ **niccustomscripts**\ (nics.niccustomscripts) - + Comma-separated list of custom scripts per NIC. !,!, e.g. eth0!configeth eth0, ib0!configib ib0. The xCAT object definition commands support to use niccustomscripts. as the sub attribute . - + \ **nicdevices**\ (nics.nicdevices) - + Comma-separated list of NIC device per NIC, multiple ethernet devices can be bonded as bond device, these ethernet devices are separated by | . !|,!, e.g. bond0!eth0|eth2,br0!bond0. The xCAT object definition commands support to use nicdevices. as the sub attributes. - + \ **nicextraparams**\ (nics.nicextraparams) - + Comma-separated list of extra parameters that will be used for each NIC configuration. If only one ip address is associated with each NIC: !,!, for example, eth0!MTU=1500,ib0!MTU=65520 CONNECTED_MODE=yes. If multiple ip addresses are associated with each NIC: !|,!|, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes. The xCAT object definition commands support to use nicextraparams. as the sub attributes. - + \ **nichostnameprefixes**\ (nics.nichostnameprefixes) - - Comma-separated list of hostname prefixes per NIC. + + Comma-separated list of hostname prefixes per NIC. If only one ip address is associated with each NIC: !,!,..., for example, eth0!eth0-,ib0!ib- If multiple ip addresses are associated with each NIC: - !|,!|,..., for example, eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. - The xCAT object definition commands support to use nichostnameprefixes. as the sub attributes. + !|,!|,..., for example, eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. + The xCAT object definition commands support to use nichostnameprefixes. as the sub attributes. Note: According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnameprefixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention - + \ **nichostnamesuffixes**\ (nics.nichostnamesuffixes) - - Comma-separated list of hostname suffixes per NIC. + + Comma-separated list of hostname suffixes per NIC. If only one ip address is associated with each NIC: !,!,..., for example, eth0!-eth0,ib0!-ib0 If multiple ip addresses are associated with each NIC: - !|,!|,..., for example, eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. + !|,!|,..., for example, eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. The xCAT object definition commands support to use nichostnamesuffixes. as the sub attributes. - - + + .. code-block:: perl - + Note: According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnamesuffixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention - - + + \ **nicips**\ (nics.nicips) - - Comma-separated list of IP addresses per NIC. + + Comma-separated list of IP addresses per NIC. To specify one ip address per NIC: !,!,..., for example, eth0!10.0.0.100,ib0!11.0.0.100 To specify multiple ip addresses per NIC: !|,!|,..., for example, eth0!10.0.0.100|fd55::214:5eff:fe15:849b,ib0!11.0.0.100|2001::214:5eff:fe15:849a. The xCAT object definition commands support to use nicips. as the sub attributes. Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address. - + \ **nicnetworks**\ (nics.nicnetworks) - + Comma-separated list of networks connected to each NIC. If only one ip address is associated with each NIC: !,!, for example, eth0!10_0_0_0-255_255_0_0, ib0!11_0_0_0-255_255_0_0 If multiple ip addresses are associated with each NIC: !|,!|, for example, eth0!10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64,ib0!11_0_0_0-255_255_0_0|2001:db8:1:0::/64. The xCAT object definition commands support to use nicnetworks. as the sub attributes. - + \ **nicsadapter**\ (nics.nicsadapter) - + Comma-separated list of NIC information collected by getadapter. !,!, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face - + \ **nictypes**\ (nics.nictypes) - + Comma-separated list of NIC types per NIC. !,!, e.g. eth0!Ethernet,ib0!Infiniband. The xCAT object definition commands support to use nictypes. as the sub attributes. - + \ **nimserver**\ (noderes.nimserver) - + Not used for now. The NIM server for this node (as known by this node). - + \ **node**\ (nodelist.node) - + The hostname of a node in the cluster. - + \ **nodetype**\ (nodetype.nodetype, pdu.nodetype) - + A comma-delimited list of characteristics of this node. Valid values: ppc, blade, vm (virtual machine), osi (OS image), mm, mn, rsa, switch. - + or - + The node type should be pdu - + \ **ondiscover**\ (chain.ondiscover) - + This attribute is currently not used by xCAT. The "nodediscover" operation is always done during node discovery. - + \ **os**\ (nodetype.os) - + The operating system deployed on this node. Valid values: AIX, rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #). As a special case, if this is set to "boottarget", then it will use the initrd/kernel/parameters specified in the row in the boottarget table in which boottarget.bprofile equals nodetype.profile. - + \ **osvolume**\ (storage.osvolume) - + Specification of what storage to place the node OS image onto. Examples include: - - + + .. code-block:: perl - + localdisk (Install to first non-FC attached disk) usbdisk (Install to first USB mass storage device seen) wwn=0x50000393c813840c (Install to storage device with given WWN) - - + + \ **otherinterfaces**\ (hosts.otherinterfaces) - + Other IP addresses to add for this node. Format: -:,:,... - + \ **ou**\ (domain.ou) - + For an LDAP described machine account (i.e. Active Directory), the organizational unit to place the system. If not set, defaults to cn=Computers,dc=your,dc=domain - + \ **outlet**\ (pdu.outlet) - + The pdu outlet count - + \ **parent**\ (ppc.parent) - + For LPARs: the CEC; for FSPs: the CEC; for CEC: the frame (if one exists); for BPA: the frame; for frame: the building block number (which consists 1 or more service nodes and compute/storage nodes that are serviced by them - optional). - + \ **passwd.HMC**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **passwd.admin**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **passwd.celogin**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **passwd.general**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **passwd.hscroot**\ (ppcdirect.password) - + Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM). If not filled in, xCAT will look in the passwd table for key=fsp. If not in the passwd table, the default used is admin. - + \ **password**\ (ppchcp.password, mpa.password, websrv.password, pdu.password, switches.sshpassword) - + Password of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is abc123 for HMCs and padmin for IVMs. - + or - + Password to use to access the management module. If not specified, the key=blade row in the passwd table is used as the default. - + or - + Password to use to access the web service. - + or - + The remote login password - + or - + The remote login password. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. - + \ **pdu**\ (pduoutlet.pdu) - + a comma-separated list of outlet number for each PDU, ex: pdu1:outlet1,pdu2:outlet1 - + \ **pdutype**\ (pdu.pdutype) - + The type of pdu - + \ **postbootscripts**\ (postscripts.postbootscripts) - + Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab. On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. Please note that the postbootscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postbootscripts" attribute of a node with "chdef -m" command - + \ **postscripts**\ (postscripts.postscripts) - + Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". xCAT automatically adds the postscripts from the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute. For AIX, use the postbootscripts attribute. Please note that the postscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postscripts" attribute of a node with "chdef -m" command - + \ **power**\ (nodehm.power) - + The method to use to control the power of the node. If not set, the mgt attribute will be used. Valid values: ipmi, blade, hmc, ivm, fsp, kvm, esx, rhevm. If "ipmi", xCAT will search for this node in the ipmi table for more info. If "blade", xCAT will search for this node in the mp table. If "hmc", "ivm", or "fsp", xCAT will search for this node in the ppc table. - + \ **pprofile**\ (ppc.pprofile) - + The LPAR profile that will be used the next time the LPAR is powered on with rpower. For DFM, the pprofile attribute should be set to blank - + \ **prescripts-begin**\ (prescripts.begin) - + The scripts to be run at the beginning of the nodeset(Linux), nimnodeset(AIX) or mkdsklsnode(AIX) command. The format is: [action1:]s1,s2...[| action2:s3,s4,s5...] where: - - action1 and action2 for Linux are the nodeset actions specified in the command. + - action1 and action2 for Linux are the nodeset actions specified in the command. For AIX, action1 and action1 can be 'diskless' for mkdsklsnode command' - and 'standalone for nimnodeset command. + and 'standalone for nimnodeset command. - s1 and s2 are the scripts to run for action1 in order. - s3, s4, and s5 are the scripts to run for actions2. If actions are omitted, the scripts apply to all actions. @@ -872,541 +872,541 @@ node Attributes: diskless:myscript1,myscript2 (AIX) install:myscript1,myscript2|netboot:myscript3 (Linux) All the scripts should be copied to /install/prescripts directory. - The following two environment variables will be passed to each script: + The following two environment variables will be passed to each script: NODES a coma separated list of node names that need to run the script for ACTION current nodeset action. If '#xCAT setting:MAX_INSTANCE=number' is specified in the script, the script will get invoked for each node in parallel, but no more than number of instances will be invoked at at a time. If it is not specified, the script will be invoked once for all the nodes. - + \ **prescripts-end**\ (prescripts.end) - + The scripts to be run at the end of the nodeset(Linux), nimnodeset(AIX),or mkdsklsnode(AIX) command. The format is the same as the 'begin' column. - + \ **primarynic**\ (noderes.primarynic) - + This attribute will be deprecated. All the used network interface will be determined by installnic. The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used. Default is eth0. - + \ **primarysn**\ (nodelist.primarysn) - + Not used currently. The primary servicenode, used by this node. - + \ **privkey**\ (pdu.privkey) - + The privacy passphrase to use for SNMPv3. - + \ **privtype**\ (pdu.privtype) - + The privacy protocol(AES|DES) to use for SNMPv3. - + \ **productkey**\ (prodkey.key) - + The product key relevant to the aforementioned node/group and product combination - + \ **profile**\ (nodetype.profile) - + The string to use to locate a kickstart or autoyast template to use for OS deployment of this node. If the provmethod attribute is set to an osimage name, that takes precedence, and profile need not be defined. Otherwise, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat. - + \ **protocol**\ (switches.protocol) - + Protocol for running remote commands for the switch. The valid values are: ssh, telnet. ssh is the default. If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. The passwd.comments attribute is used for protocol. - + \ **provmethod**\ (nodetype.provmethod) - + The provisioning method for node deployment. The valid values are install, netboot, statelite or an os image name from the osimage table. If an image name is specified, the osimage definition stored in the osimage table and the linuximage table (for Linux) or nimimage table (for AIX) are used to locate the files for templates, pkglists, syncfiles, etc. On Linux, if install, netboot or statelite is specified, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat. - + \ **rack**\ (nodepos.rack) - + The frame the node is in. - + \ **room**\ (nodepos.room) - + The room where the node is located. - + \ **routenames**\ (noderes.routenames) - + A comma separated list of route names that refer to rows in the routes table. These are the routes that should be defined on this node when it is deployed. - + \ **seclevel**\ (pdu.seclevel) - + The Security Level(noAuthNoPriv|authNoPriv|authPriv) to use for SNMPv3. - + \ **serial**\ (vpd.serial) - + The serial number of the node. - + \ **serialflow**\ (nodehm.serialflow) - + The flow control value of the serial port for this node. For SOL this is typically 'hard'. - + \ **serialport**\ (nodehm.serialport) - + The serial port for this node, in the linux numbering style (0=COM1/ttyS0, 1=COM2/ttyS1). For SOL on IBM blades, this is typically 1. For rackmount IBM servers, this is typically 0. - + \ **serialspeed**\ (nodehm.serialspeed) - + The speed of the serial port for this node. For SOL this is typically 19200. - + \ **servicenode**\ (noderes.servicenode) - + A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used. The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove. - + \ **setupconserver**\ (servicenode.conserver) - + Do we set up console service on this service node? Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon. - + \ **setupdhcp**\ (servicenode.dhcpserver) - + Do we set up DHCP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, runs makedhcp -n. If 0, it does not change the current state of the service. - + \ **setupftp**\ (servicenode.ftpserver) - + Do we set up a ftp server on this service node? Not supported on AIX Valid values:1 or 0. If 1, configure and start vsftpd. (You must manually install vsftpd on the service nodes before this.) If 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes - + \ **setupipforward**\ (servicenode.ipforward) - + Do we set up ip forwarding on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - + \ **setupldap**\ (servicenode.ldapserver) - + Do we set up ldap caching proxy on this service node? Not supported on AIX. Valid values:1 or 0. If 0, it does not change the current state of the service. - + \ **setupnameserver**\ (servicenode.nameserver) - + Do we set up DNS on this service node? Valid values: 2, 1, or 0. If 2, creates named.conf as dns slave, using the management node as dns master, and starts named. If 1, creates named.conf file with forwarding to the management node and starts named. If 0, it does not change the current state of the service. - + \ **setupnfs**\ (servicenode.nfsserver) - + Do we set up file services (HTTP,FTP,or NFS) on this service node? For AIX will only setup NFS, not HTTP or FTP. Valid values:1 or 0.If 0, it does not change the current state of the service. - + \ **setupnim**\ (servicenode.nimserver) - + Not used. Do we set up a NIM server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - + \ **setupntp**\ (servicenode.ntpserver) - + Not used. Use setupntp postscript to setup a ntp server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service. - + \ **setupproxydhcp**\ (servicenode.proxydhcp) - + Do we set up proxydhcp service on this node? valid values: 1 or 0. If 1, the proxydhcp daemon will be enabled on this node. - + \ **setuptftp**\ (servicenode.tftpserver) - + Do we set up TFTP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, configures and starts atftp. If 0, it does not change the current state of the service. - + \ **sfp**\ (ppc.sfp) - + The Service Focal Point of this Frame. This is the name of the HMC that is responsible for collecting hardware service events for this frame and all of the CECs within this frame. - + \ **side**\ (vpd.side) - + - or -. The side information for the BPA/FSP. The side attribute refers to which BPA/FSP, A or B, which is determined by the slot value returned from lsslp command. It also lists the physical port within each BPA/FSP which is determined by the IP address order from the lsslp response. This information is used internally when communicating with the BPAs/FSPs - + \ **slot**\ (nodepos.slot) - + The slot number of the blade in the chassis. For PCM, a comma-separated list of slot numbers is stored - + \ **slotid**\ (mp.id) - + The slot number of this blade in the BladeCenter chassis. - + \ **slots**\ (mpa.slots) - + The number of available slots in the chassis. For PCM, this attribute is used to store the number of slots in the following format: ,, Where: - - + + .. code-block:: perl - + = number of rows of slots in chassis = number of columns of slots in chassis = set to 0 if slots are vertical, and set to 1 if slots of horizontal - - + + \ **snmpauth**\ (switches.auth) - + The authentication protocol to use for SNMPv3. SHA is assumed if v3 enabled and this is unspecified - + \ **snmppassword**\ (switches.password) - + The password string for SNMPv3 or community string for SNMPv1/SNMPv2. Falls back to passwd table, and site snmpc value if using SNMPv1/SNMPv2. - + \ **snmpprivacy**\ (switches.privacy) - + The privacy protocol to use for v3. xCAT will use authNoPriv if this is unspecified. DES is recommended to use if v3 enabled, as it is the most readily available. - + \ **snmpuser**\ (pdu.snmpuser) - + The username to use for SNMPv3 communication, ignored for SNMPv1 - + \ **snmpusername**\ (switches.username) - + The username to use for SNMPv3 communication, ignored for SNMPv1 - + \ **snmpversion**\ (pdu.snmpversion, switches.snmpversion) - + The version to use to communicate with switch. SNMPv1 is assumed by default. - + or - + The version to use to communicate with switch. SNMPv1 is assumed by default. - + \ **status**\ (nodelist.status) - + The current status of this node. This attribute will be set by xCAT software. Valid values: defined, booting, netbooting, booted, discovering, configuring, installing, alive, standingby, powering-off, unreachable. If blank, defined is assumed. The possible status change sequences are: For installation: defined->[discovering]->[configuring]->[standingby]->installing->booting->[postbooting]->booted->[alive], For diskless deployment: defined->[discovering]->[configuring]->[standingby]->netbooting->[postbooting]->booted->[alive], For booting: [alive/unreachable]->booting->[postbooting]->booted->[alive], For powering off: [alive]->powering-off->[unreachable], For monitoring: alive->unreachable. Discovering and configuring are for x Series discovery process. Alive and unreachable are set only when there is a monitoring plug-in start monitor the node status for xCAT. Note that the status values will not reflect the real node status if you change the state of the node from outside of xCAT (i.e. power off the node using HMC GUI). - + \ **statustime**\ (nodelist.statustime) - + The data and time when the status was updated. - + \ **storagcontroller**\ (storage.controller) - + The management address to attach/detach new volumes. In the scenario involving multiple controllers, this data must be passed as argument rather than by table value - + \ **storagetype**\ (storage.type) - + The plugin used to drive storage configuration (e.g. svc) - + \ **supernode**\ (ppc.supernode) - + Indicates the connectivity of this CEC in the HFI network. A comma separated list of 2 ids. The first one is the supernode number the CEC is part of. The second one is the logical location number (0-3) of this CEC within the supernode. - + \ **supportedarchs**\ (nodetype.supportedarchs) - + Comma delimited list of architectures this node can execute. - + \ **supportproxydhcp**\ (noderes.proxydhcp) - + To specify whether the node supports proxydhcp protocol. Valid values: yes or 1, no or 0. Default value is yes. - + \ **switch**\ (switch.switch) - + The switch hostname. - + \ **switchinterface**\ (switch.interface) - + The interface name from the node perspective. For example, eth0. For the primary nic, it can be empty, the word "primary" or "primary:ethx" where ethx is the interface name. - + \ **switchport**\ (switch.port) - + The port number in the switch that this node is connected to. On a simple 1U switch, an administrator can generally enter the number as printed next to the ports, and xCAT will understand switch representation differences. On stacked switches or switches with line cards, administrators should usually use the CLI representation (i.e. 2/0/1 or 5/8). One notable exception is stacked SMC 8848M switches, in which you must add 56 for the proceeding switch, then the port number. For example, port 3 on the second switch in an SMC8848M stack would be 59 - + \ **switchtype**\ (switches.switchtype) - + The type of switch. It is used to identify the file name that implements the functions for this switch. The valid values are: Mellanox, Cisco, BNT and Juniper. - + \ **switchvlan**\ (switch.vlan) - + The ID for the tagged vlan that is created on this port using mkvlan and chvlan commands. - + \ **syslog**\ (noderes.syslog) - + To configure how to configure syslog for compute node. Valid values:blank(not set), ignore. blank - run postscript syslog; ignore - do NOT run postscript syslog - + \ **termport**\ (nodehm.termport) - + The port number on the terminal server that this node is connected to. - + \ **termserver**\ (nodehm.termserver) - + The hostname of the terminal server. - + \ **tftpdir**\ (noderes.tftpdir) - + The directory that roots this nodes contents from a tftp and related perspective. Used for NAS offload by using different mountpoints. - + \ **tftpserver**\ (noderes.tftpserver) - + The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver. - + \ **unit**\ (nodepos.u) - + The vertical position of the node in the frame - + \ **updatestatus**\ (nodelist.updatestatus) - + The current node update status. Valid states are synced, out-of-sync,syncing,failed. - + \ **updatestatustime**\ (nodelist.updatestatustime) - + The date and time when the updatestatus was updated. - + \ **urlpath**\ (mpa.urlpath) - + URL path for the Chassis web interface. The full URL is built as follows: / - + \ **usercomment**\ (nodelist.comments) - + Any user-written notes. - + \ **userid**\ (zvm.userid) - + The z/VM userID of this node. - + \ **username**\ (ppchcp.username, mpa.username, websrv.username, pdu.username, switches.sshusername) - + Userid of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is hscroot for HMCs and padmin for IVMs. - + or - + Userid to use to access the management module. - + or - + Userid to use to access the web service. - + or - + The remote login user name - + or - + The remote login user name. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. - + \ **vmbeacon**\ (vm.beacon) - + This flag is used by xCAT to track the state of the identify LED with respect to the VM. - + \ **vmbootorder**\ (vm.bootorder) - + Boot sequence (i.e. net,hd) - + \ **vmcfgstore**\ (vm.cfgstore) - + Optional location for persistent storage separate of emulated hard drives for virtualization solutions that require persistent store to place configuration data - + \ **vmcluster**\ (vm.cluster) - + Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor. - + \ **vmcpus**\ (vm.cpus) - + Number of CPUs the node should see. - + \ **vmhost**\ (vm.host) - + The system that currently hosts the VM - + \ **vmmanager**\ (vm.mgr) - + The function manager for the virtual machine - + \ **vmmaster**\ (vm.master) - + The name of a master image, if any, this virtual machine is linked to. This is generally set by clonevm and indicates the deletion of a master that would invalidate the storage of this virtual machine - + \ **vmmemory**\ (vm.memory) - + Megabytes of memory the VM currently should be set to. - + \ **vmnicnicmodel**\ (vm.nicmodel) - + Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc) - + \ **vmnics**\ (vm.nics) - + Network configuration parameters. Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan. physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches. hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible. - + \ **vmothersetting**\ (vm.othersettings) - + This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\ on the host. - + \ **vmphyslots**\ (vm.physlots) - + Specify the physical slots drc index that will assigned to the partition, the delimiter is ',', and the drc index must started with '0x'. For more details, reference manpage for 'lsvm'. - + \ **vmstorage**\ (vm.storage) - + A list of storage files or devices to be used. i.e. dir:///cluster/vm/ or nfs:///path/to/folder/ - + \ **vmstoragecache**\ (vm.storagecache) - + Select caching scheme to employ. E.g. KVM understands 'none', 'writethrough' and 'writeback' - + \ **vmstorageformat**\ (vm.storageformat) - + Select disk format to use by default (e.g. raw versus qcow2) - + \ **vmstoragemodel**\ (vm.storagemodel) - + Model of storage devices to provide to guest - + \ **vmtextconsole**\ (vm.textconsole) - + Tracks the Psuedo-TTY that maps to the serial port or console of a VM - + \ **vmvirtflags**\ (vm.virtflags) - - General flags used by the virtualization method. + + General flags used by the virtualization method. For example, in Xen it could, among other things, specify paravirtualized setup, or direct kernel boot. For a hypervisor/dom0 entry, it is the virtualization method (i.e. "xen"). For KVM, the following flag=value pairs are recognized: imageformat=[raw|fullraw|qcow2] raw is a generic sparse file that allocates storage on demand @@ -1414,33 +1414,33 @@ node Attributes: qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level clonemethod=[qemu-img|reflink] qemu-img allows use of qcow2 to generate virtualization layer copy-on-write - reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs + reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs placement_affinity=[migratable|user_migratable|pinned] - + \ **vmvncport**\ (vm.vncport) - + Tracks the current VNC display port (currently not meant to be set - + \ **webport**\ (websrv.port) - + The port of the web service. - + \ **xcatmaster**\ (noderes.xcatmaster) - + The hostname of the xCAT service node (as known by this node). This acts as the default value for nfsserver and tftpserver, if they are not set. If xcatmaster is not set, the node will use whoever responds to its boot request as its master. For the directed bootp case for POWER, it will use the management node if xcatmaster is not set. - + \ **zonename**\ (nodelist.zonename) - + The name of the zone to which the node is currently assigned. If undefined, then it is not assigned to any zone. - + @@ -1449,5 +1449,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From de6a2119780fc79e049f499184207792fe12f974 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0490/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/notification.7.rst --- .../references/man7/notification.7.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/notification.7.rst b/docs/source/guides/admin-guides/references/man7/notification.7.rst index c93c46647..e7dbb4f1d 100644 --- a/docs/source/guides/admin-guides/references/man7/notification.7.rst +++ b/docs/source/guides/admin-guides/references/man7/notification.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **notification Attributes:**\ \ *comments*\ , \ *filename*\ , \ *tableops*\ , \ *tables*\ +\ **notification Attributes:**\ \ *comments*\ , \ *filename*\ , \ *tableops*\ , \ *tables*\ *********** @@ -40,27 +40,27 @@ notification Attributes: \ **comments**\ (notification.comments) - + Any user-written notes. - + \ **filename**\ (notification.filename) - + The path name of a file that implements the callback routine when the monitored table changes. Can be a perl module or a command. See the regnotif man page for details. - + \ **tableops**\ (notification.tableops) - + Specifies the table operation to monitor for. Valid values: "d" (rows deleted), "a" (rows added), "u" (rows updated). - + \ **tables**\ (notification.tables) - + Comma-separated list of xCAT database tables to monitor. - + @@ -69,5 +69,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 45d0de00e36702ef1b8716ec1991c5cd000c69ae Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0491/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/osdistro.7.rst --- .../references/man7/osdistro.7.rst | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/osdistro.7.rst b/docs/source/guides/admin-guides/references/man7/osdistro.7.rst index f1a87361c..2f1dad7dd 100644 --- a/docs/source/guides/admin-guides/references/man7/osdistro.7.rst +++ b/docs/source/guides/admin-guides/references/man7/osdistro.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **osdistro Attributes:**\ \ *arch*\ , \ *basename*\ , \ *dirpaths*\ , \ *majorversion*\ , \ *minorversion*\ , \ *osdistroname*\ , \ *type*\ +\ **osdistro Attributes:**\ \ *arch*\ , \ *basename*\ , \ *dirpaths*\ , \ *majorversion*\ , \ *minorversion*\ , \ *osdistroname*\ , \ *type*\ *********** @@ -40,45 +40,45 @@ osdistro Attributes: \ **arch**\ (osdistro.arch) - + The OS distro arch (e.g. x86_64) - + \ **basename**\ (osdistro.basename) - + The OS base name (e.g. rhels) - + \ **dirpaths**\ (osdistro.dirpaths) - + Directory paths where OS distro is store. There could be multiple paths if OS distro has more than one ISO image. (e.g. /install/rhels6.2/x86_64,...) - + \ **majorversion**\ (osdistro.majorversion) - + The OS distro major version.(e.g. 6) - + \ **minorversion**\ (osdistro.minorversion) - + The OS distro minor version. (e.g. 2) - + \ **osdistroname**\ (osdistro.osdistroname) - + Unique name (e.g. rhels6.2-x86_64) - + \ **type**\ (osdistro.type) - + Linux or AIX - + @@ -87,5 +87,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From d97393d1b0ea6259e2b0fcf2845fc9f04fc5cbf7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0492/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst --- .../references/man7/osdistroupdate.7.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst b/docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst index 17850864c..11cf48b50 100644 --- a/docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst +++ b/docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **osdistroupdate Attributes:**\ \ *dirpath*\ , \ *downloadtime*\ , \ *osdistroname*\ , \ *osupdatename*\ , \ *usercomment*\ +\ **osdistroupdate Attributes:**\ \ *dirpath*\ , \ *downloadtime*\ , \ *osdistroname*\ , \ *osupdatename*\ , \ *usercomment*\ *********** @@ -40,33 +40,33 @@ osdistroupdate Attributes: \ **dirpath**\ (osdistroupdate.dirpath) - + Path to where OS distro update is stored. (e.g. /install/osdistroupdates/rhels6.2-x86_64-20120716-update) - + \ **downloadtime**\ (osdistroupdate.downloadtime) - + The timestamp when OS distro update was downloaded.. - + \ **osdistroname**\ (osdistroupdate.osdistroname) - + The OS distro name to update. (e.g. rhels) - + \ **osupdatename**\ (osdistroupdate.osupdatename) - + Name of OS update. (e.g. rhn-update1) - + \ **usercomment**\ (osdistroupdate.comments) - + Any user-written notes. - + @@ -75,5 +75,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From fc426870eff7fe8bb13bdf81dcbe81d45cccba34 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0493/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/osimage.7.rst --- .../references/man7/osimage.7.rst | 276 +++++++++--------- 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/osimage.7.rst b/docs/source/guides/admin-guides/references/man7/osimage.7.rst index 8e2faea1f..060118843 100644 --- a/docs/source/guides/admin-guides/references/man7/osimage.7.rst +++ b/docs/source/guides/admin-guides/references/man7/osimage.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **osimage Attributes:**\ \ *addkcmdline*\ , \ *boottarget*\ , \ *bosinst_data*\ , \ *cfmdir*\ , \ *configdump*\ , \ *crashkernelsize*\ , \ *description*\ , \ *driverupdatesrc*\ , \ *dump*\ , \ *exlist*\ , \ *fb_script*\ , \ *groups*\ , \ *home*\ , \ *image_data*\ , \ *imagename*\ , \ *imagetype*\ , \ *installp_bundle*\ , \ *installto*\ , \ *isdeletable*\ , \ *kerneldir*\ , \ *kernelver*\ , \ *kitcomponents*\ , \ *krpmver*\ , \ *lpp_source*\ , \ *mksysb*\ , \ *netdrivers*\ , \ *nimmethod*\ , \ *nimtype*\ , \ *nodebootif*\ , \ *osarch*\ , \ *osdistroname*\ , \ *osname*\ , \ *osupdatename*\ , \ *osvers*\ , \ *otherifce*\ , \ *otherpkgdir*\ , \ *otherpkglist*\ , \ *otherpkgs*\ , \ *paging*\ , \ *partitionfile*\ , \ *permission*\ , \ *pkgdir*\ , \ *pkglist*\ , \ *postbootscripts*\ , \ *postinstall*\ , \ *postscripts*\ , \ *profile*\ , \ *provmethod*\ , \ *resolv_conf*\ , \ *root*\ , \ *rootfstype*\ , \ *rootimgdir*\ , \ *script*\ , \ *serverrole*\ , \ *shared_home*\ , \ *shared_root*\ , \ *spot*\ , \ *synclists*\ , \ *template*\ , \ *tmp*\ , \ *usercomment*\ , \ *winpepath*\ +\ **osimage Attributes:**\ \ *addkcmdline*\ , \ *boottarget*\ , \ *bosinst_data*\ , \ *cfmdir*\ , \ *configdump*\ , \ *crashkernelsize*\ , \ *description*\ , \ *driverupdatesrc*\ , \ *dump*\ , \ *exlist*\ , \ *fb_script*\ , \ *groups*\ , \ *home*\ , \ *image_data*\ , \ *imagename*\ , \ *imagetype*\ , \ *installp_bundle*\ , \ *installto*\ , \ *isdeletable*\ , \ *kerneldir*\ , \ *kernelver*\ , \ *kitcomponents*\ , \ *krpmver*\ , \ *lpp_source*\ , \ *mksysb*\ , \ *netdrivers*\ , \ *nimmethod*\ , \ *nimtype*\ , \ *nodebootif*\ , \ *osarch*\ , \ *osdistroname*\ , \ *osname*\ , \ *osupdatename*\ , \ *osvers*\ , \ *otherifce*\ , \ *otherpkgdir*\ , \ *otherpkglist*\ , \ *otherpkgs*\ , \ *paging*\ , \ *partitionfile*\ , \ *permission*\ , \ *pkgdir*\ , \ *pkglist*\ , \ *postbootscripts*\ , \ *postinstall*\ , \ *postscripts*\ , \ *profile*\ , \ *provmethod*\ , \ *resolv_conf*\ , \ *root*\ , \ *rootfstype*\ , \ *rootimgdir*\ , \ *script*\ , \ *serverrole*\ , \ *shared_home*\ , \ *shared_root*\ , \ *spot*\ , \ *synclists*\ , \ *template*\ , \ *tmp*\ , \ *usercomment*\ , \ *winpepath*\ *********** @@ -40,245 +40,245 @@ osimage Attributes: \ **addkcmdline**\ (linuximage.addkcmdline) - + User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" "). This attribute is ignored if linuximage.boottarget is set. - + \ **boottarget**\ (linuximage.boottarget) - + The name of the boottarget definition. When this attribute is set, xCAT will use the kernel, initrd and kernel params defined in the boottarget definition instead of the default. - + \ **bosinst_data**\ (nimimage.bosinst_data) - + The name of a NIM bosinst_data resource. - + \ **cfmdir**\ (osimage.cfmdir) - + CFM directory name for PCM. Set to /install/osimages//cfmdir by PCM. - + \ **configdump**\ (nimimage.configdump) - + Specifies the type of system dump to be collected. The values are selective, full, and none. The default is selective. - + \ **crashkernelsize**\ (linuximage.crashkernelsize) - + the size that assigned to the kdump kernel. If the kernel size is not set, 256M will be the default value. - + \ **description**\ (osimage.description) - + OS Image Description - + \ **driverupdatesrc**\ (linuximage.driverupdatesrc) - + The source of the drivers which need to be loaded during the boot. Two types of driver update source are supported: Driver update disk and Driver rpm package. The value for this attribute should be comma separated sources. Each source should be the format tab:full_path_of_source_file. The tab keyword can be: dud (for Driver update disk) and rpm (for driver rpm). If missing the tab, the rpm format is the default. e.g. dud:/install/dud/dd.img,rpm:/install/rpm/d.rpm - + \ **dump**\ (linuximage.dump, nimimage.dump) - + The NFS directory to hold the Linux kernel dump file (vmcore) when the node with this image crashes, its format is "nfs:///". If you want to use the node's "xcatmaster" (its SN or MN), can be left blank. For example, "nfs:///" means the NFS directory to hold the kernel dump file is on the node's SN, or MN if there's no SN. - + or - + The name of the NIM dump resource. - + \ **exlist**\ (linuximage.exlist) - + The fully qualified name of the file that stores the file names and directory names that will be excluded from the image during packimage command. It is used for diskless image only. - + \ **fb_script**\ (nimimage.fb_script) - + The name of a NIM fb_script resource. - + \ **groups**\ (osimage.groups) - + A comma-delimited list of image groups of which this image is a member. Image groups can be used in the litefile and litetree table instead of a single image name. Group names are arbitrary. - + \ **home**\ (nimimage.home) - + The name of the NIM home resource. - + \ **image_data**\ (nimimage.image_data) - + The name of a NIM image_data resource. - + \ **imagename**\ (osimage.imagename) - + The name of this xCAT OS image definition. - + \ **imagetype**\ (osimage.imagetype) - + The type of operating system image this definition represents (linux,AIX). - + \ **installp_bundle**\ (nimimage.installp_bundle) - + One or more comma separated NIM installp_bundle resources. - + \ **installto**\ (winimage.installto) - + The disk and partition that the Windows will be deployed to. The valid format is :. If not set, default value is 0:1 for bios boot mode(legacy) and 0:3 for uefi boot mode; If setting to 1, it means 1:1 for bios boot and 1:3 for uefi boot - + \ **isdeletable**\ (osimage.isdeletable) - + A flag to indicate whether this image profile can be deleted. This attribute is only used by PCM. - + \ **kerneldir**\ (linuximage.kerneldir) - + The directory name where the 3rd-party kernel is stored. It is used for diskless image only. - + \ **kernelver**\ (linuximage.kernelver) - + The version of linux kernel used in the linux image. If the kernel version is not set, the default kernel in rootimgdir will be used - + \ **kitcomponents**\ (osimage.kitcomponents) - + List of Kit Component IDs assigned to this OS Image definition. - + \ **krpmver**\ (linuximage.krpmver) - + The rpm version of kernel packages (for SLES only). If it is not set, the default rpm version of kernel packages will be used. - + \ **lpp_source**\ (nimimage.lpp_source) - + The name of the NIM lpp_source resource. - + \ **mksysb**\ (nimimage.mksysb) - + The name of a NIM mksysb resource. - + \ **netdrivers**\ (linuximage.netdrivers) - + The ethernet device drivers of the nodes which will use this linux image, at least the device driver for the nodes' installnic should be included - + \ **nimmethod**\ (nimimage.nimmethod) - + The NIM install method to use, (ex. rte, mksysb). - + \ **nimtype**\ (nimimage.nimtype) - + The NIM client type- standalone, diskless, or dataless. - + \ **nodebootif**\ (linuximage.nodebootif) - + The network interface the stateless/statelite node will boot over (e.g. eth0) - + \ **osarch**\ (osimage.osarch) - + The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64. - + \ **osdistroname**\ (osimage.osdistroname) - + The name of the OS distro definition. This attribute can be used to specify which OS distro to use, instead of using the osname,osvers,and osarch attributes. For \*kit commands, the attribute will be used to read the osdistro table for the osname, osvers, and osarch attributes. If defined, the osname, osvers, and osarch attributes defined in the osimage table will be ignored. - + \ **osname**\ (osimage.osname) - + Operating system name- AIX or Linux. - + \ **osupdatename**\ (osimage.osupdatename) - + A comma-separated list of OS distro updates to apply to this osimage. - + \ **osvers**\ (osimage.osvers) - + The Linux operating system deployed on this node. Valid values: rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #). - + \ **otherifce**\ (linuximage.otherifce) - + Other network interfaces (e.g. eth1) in the image that should be configured via DHCP - + \ **otherpkgdir**\ (linuximage.otherpkgdir) - + The base directory and urls of internet repos from which the non-distro packages are retrived. Only 1 local directory is supported at present. The entries should be delimited with comma ",". Currently, the internet repos are only supported on Ubuntu and Redhat. - + \ **otherpkglist**\ (linuximage.otherpkglist) - + The fully qualified name of the file that stores non-distro package lists that will be included in the image. It could be set to multiple paths. The multiple paths must be separated by ",". - + \ **otherpkgs**\ (nimimage.otherpkgs) - + One or more comma separated installp or rpm packages. The rpm packages must have a prefix of 'R:', (ex. R:foo.rpm) - + \ **paging**\ (nimimage.paging) - + The name of the NIM paging resource. - + \ **partitionfile**\ (linuximage.partitionfile, winimage.partitionfile) - + Only available for diskful osimages and statelite osimages(localdisk enabled). The full path of the partition file or the script to generate the partition file. The valid value includes: "": For diskful osimages, the partition file contains the partition definition that will be inserted directly into the template file for os installation. The syntax and format of the partition file should confirm to the corresponding OS installer of the Linux distributions(e.g. kickstart for RedHat, autoyast for SLES, pressed for Ubuntu). For statelite osimages, when the localdisk is enabled, the partition file with specific syntax and format includes the partition scheme of the local disk, please refer to the statelite documentation for details. "s:": a shell script to generate the partition file "/tmp/partitionfile" inside the installer before the installation start. @@ -286,44 +286,44 @@ osimage Attributes: "s:d:": only available for ubuntu osimages, a script to generate the disk name file "/tmp/xcat.install_disk" inside the debian installer. This script is run in the "pressed/early_command" section. "c:": only availbe for ubuntu osimages, contains the additional pressed entries in "d-i ..." form. This can be used to specify some additional preseed options to support RAID or LVM in Ubuntu. "s:c:": only available for ubuntu osimages, runs in pressed/early_command and set the preseed values with "debconf-set". The multiple values should be delimited with comma "," - + or - + The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file can include both configurations if you need to support both bios and uefi mode. Either way, you must specify the boot mode in the configuration. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section like [INSTALLTO]0:1 - + \ **permission**\ (linuximage.permission) - + The mount permission of /.statelite directory is used, its default value is 755 - + \ **pkgdir**\ (linuximage.pkgdir) - + The name of the directory where the distro packages are stored. It could be set to multiple paths. The multiple paths must be separated by ",". The first path in the value of osimage.pkgdir must be the OS base pkg dir path, such as pkgdir=/install/rhels6.2/x86_64,/install/updates . In the os base pkg path, there are default repository data. And in the other pkg path(s), the users should make sure there are repository data. If not, use "createrepo" command to create them. For ubuntu, multiple mirrors can be specified in the pkgdir attribute, the mirrors must be prefixed by the protocol(http/ssh) and delimited with "," between each other. - + \ **pkglist**\ (linuximage.pkglist) - + The fully qualified name of the file that stores the distro packages list that will be included in the image. Make sure that if the pkgs in the pkglist have dependency pkgs, the dependency pkgs should be found in one of the pkgdir - + \ **postbootscripts**\ (osimage.postbootscripts) - + Comma separated list of scripts that should be run on this after diskful installation or diskless boot. On AIX these scripts are run during the processing of /etc/inittab. On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. See the site table runbootscripts attribute. - + \ **postinstall**\ (linuximage.postinstall) - + Supported in diskless image only. The fully qualified name of the scripts running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be seperated with comma ",". A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts: - - + + .. code-block:: perl - + IMG_ARCH(The architecture of the osimage, such as "ppc64le","x86_64"), IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"), IMG_OSVER(The os release of the osimage, such as "rhels7.3","sles11.4"), @@ -334,118 +334,118 @@ osimage Attributes: IMG_OTHERPKGLIST(the "otherpkglist" attribute of the osimage), IMG_OTHERPKGDIR(the "otherpkgdir" attribute of the osimage), IMG_ROOTIMGDIR(the "rootimgdir" attribute of the osimage) - - + + \ **postscripts**\ (osimage.postscripts) - + Comma separated list of scripts that should be run on this image after diskful installation or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute. For AIX, use the postbootscripts attribute. See the site table runbootscripts attribute. - + \ **profile**\ (osimage.profile) - + The node usage category. For example compute, service. - + \ **provmethod**\ (osimage.provmethod) - + The provisioning method for node deployment. The valid values are install, netboot,statelite,boottarget,dualboot,sysclone. If boottarget is set, you must set linuximage.boottarget to the name of the boottarget definition. It is not used by AIX. - + \ **resolv_conf**\ (nimimage.resolv_conf) - + The name of the NIM resolv_conf resource. - + \ **root**\ (nimimage.root) - + The name of the NIM root resource. - + \ **rootfstype**\ (osimage.rootfstype) - + The filesystem type for the rootfs is used when the provmethod is statelite. The valid values are nfs or ramdisk. The default value is nfs - + \ **rootimgdir**\ (linuximage.rootimgdir) - + The directory name where the image is stored. It is generally used for diskless image. it also can be used in sysclone environment to specify where the image captured from golden client is stored. in sysclone environment, rootimgdir is generally assigned to some default value by xcat, but you can specify your own store directory. just one thing need to be noticed, wherever you save the image, the name of last level directory must be the name of image. for example, if your image name is testimage and you want to save this image under home directoy, rootimgdir should be assigned to value /home/testimage/ - + \ **script**\ (nimimage.script) - + The name of a NIM script resource. - + \ **serverrole**\ (osimage.serverrole) - + The role of the server created by this osimage. Default roles: mgtnode, servicenode, compute, login, storage, utility. - + \ **shared_home**\ (nimimage.shared_home) - + The name of the NIM shared_home resource. - + \ **shared_root**\ (nimimage.shared_root) - + A shared_root resource represents a directory that can be used as a / (root) directory by one or more diskless clients. - + \ **spot**\ (nimimage.spot) - + The name of the NIM SPOT resource. - + \ **synclists**\ (osimage.synclists) - + The fully qualified name of a file containing a list of files to synchronize on the nodes. Can be a comma separated list of multiple synclist files. The synclist generated by PCM named /install/osimages//synclist.cfm is reserved for use only by PCM and should not be edited by the admin. - + \ **template**\ (linuximage.template, winimage.template) - + The fully qualified name of the template file that will be used to create the OS installer configuration file for stateful installations (e.g. kickstart for RedHat, autoyast for SLES). - + or - + The fully qualified name of the template file that is used to create the windows unattend.xml file for diskful installation. - + \ **tmp**\ (nimimage.tmp) - + The name of the NIM tmp resource. - + \ **usercomment**\ (linuximage.comments, nimimage.comments) - + Any user-written notes. - + or - + Any user-provided notes. - + \ **winpepath**\ (winimage.winpepath) - + The path of winpe which will be used to boot this image. If the real path is /tftpboot/winboot/winpe1/, the value for winpepath should be set to winboot/winpe1 - + @@ -454,5 +454,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 1f615e385b865fd8e0177586c9be34dce4fd2970 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0494/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/pdu.7.rst --- .../admin-guides/references/man7/pdu.7.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/pdu.7.rst b/docs/source/guides/admin-guides/references/man7/pdu.7.rst index de02c50e9..72e27fd3d 100644 --- a/docs/source/guides/admin-guides/references/man7/pdu.7.rst +++ b/docs/source/guides/admin-guides/references/man7/pdu.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **pdu Attributes:**\ \ *node*\ , \ *nodetype*\ , \ *outlet*\ +\ **pdu Attributes:**\ \ *node*\ , \ *nodetype*\ , \ *outlet*\ *********** @@ -40,21 +40,21 @@ pdu Attributes: \ **node**\ (pdu.node) - + The hostname/address of the pdu to which the settings apply - + \ **nodetype**\ (pdu.nodetype) - + The node type should be pdu - + \ **outlet**\ (pdu.outlet) - + The pdu outlet count - + @@ -63,5 +63,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 23e2bc073f9383be26fd909a7a453c962f730168 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0495/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/policy.7.rst --- .../admin-guides/references/man7/policy.7.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/policy.7.rst b/docs/source/guides/admin-guides/references/man7/policy.7.rst index b920c052f..8967d20e9 100644 --- a/docs/source/guides/admin-guides/references/man7/policy.7.rst +++ b/docs/source/guides/admin-guides/references/man7/policy.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **policy Attributes:**\ \ *commands*\ , \ *host*\ , \ *name*\ , \ *noderange*\ , \ *parameters*\ , \ *priority*\ , \ *rule*\ , \ *time*\ , \ *usercomment*\ +\ **policy Attributes:**\ \ *commands*\ , \ *host*\ , \ *name*\ , \ *noderange*\ , \ *parameters*\ , \ *priority*\ , \ *rule*\ , \ *time*\ , \ *usercomment*\ *********** @@ -40,57 +40,57 @@ policy Attributes: \ **commands**\ (policy.commands) - + The list of commands that this rule applies to. Default is "\*" (all commands). - + \ **host**\ (policy.host) - + The host from which users may issue the commands specified by this rule. Default is "\*" (all hosts). Only all or one host is supported - + \ **name**\ (policy.name) - + The username that is allowed to perform the commands specified by this rule. Default is "\*" (all users). - + \ **noderange**\ (policy.noderange) - + The Noderange that this rule applies to. Default is "\*" (all nodes). Not supported with the \*def commands. - + \ **parameters**\ (policy.parameters) - + A regular expression that matches the command parameters (everything except the noderange) that this rule applies to. Default is "\*" (all parameters). Not supported with the \*def commands. - + \ **priority**\ (policy.priority) - + The priority value for this rule. This value is used to identify this policy data object (i.e. this rule) The table is sorted on this field with the lower the number the higher the priority. For example 1.0 is higher priority than 4.1 is higher than 4.9. - + \ **rule**\ (policy.rule) - + Specifies how this rule should be applied. Valid values are: allow, trusted. Allow will allow the user to run the commands. Any other value will deny the user access to the commands. Trusted means that once this client has been authenticated via the certificate, all other information that is sent (e.g. the username) is believed without question. This authorization should only be given to the xcatd on the management node at this time. - + \ **time**\ (policy.time) - + Time ranges that this command may be executed in. This is not supported. - + \ **usercomment**\ (policy.comments) - + Any user-written notes. - + @@ -99,5 +99,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From da5b4e11984ec27d23c7244cc20eeb28f4731329 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0496/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/rack.7.rst --- .../admin-guides/references/man7/rack.7.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/rack.7.rst b/docs/source/guides/admin-guides/references/man7/rack.7.rst index 1403a7da0..b2ddd3795 100644 --- a/docs/source/guides/admin-guides/references/man7/rack.7.rst +++ b/docs/source/guides/admin-guides/references/man7/rack.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **rack Attributes:**\ \ *displayname*\ , \ *height*\ , \ *num*\ , \ *rackname*\ , \ *room*\ , \ *usercomment*\ +\ **rack Attributes:**\ \ *displayname*\ , \ *height*\ , \ *num*\ , \ *rackname*\ , \ *room*\ , \ *usercomment*\ *********** @@ -40,39 +40,39 @@ rack Attributes: \ **displayname**\ (rack.displayname) - + Alternative name for rack. Only used by PCM. - + \ **height**\ (rack.height) - + Number of units which can be stored in the rack. - + \ **num**\ (rack.num) - + The rack number. - + \ **rackname**\ (rack.rackname) - + The rack name. - + \ **room**\ (rack.room) - + The room in which the rack is located. - + \ **usercomment**\ (rack.comments) - + Any user-written notes. - + @@ -81,5 +81,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 665d92b6228e6008c886e641a5ae60d155d2056f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0497/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/route.7.rst --- .../admin-guides/references/man7/route.7.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/route.7.rst b/docs/source/guides/admin-guides/references/man7/route.7.rst index 1cbef8fc8..55b451253 100644 --- a/docs/source/guides/admin-guides/references/man7/route.7.rst +++ b/docs/source/guides/admin-guides/references/man7/route.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **route Attributes:**\ \ *gateway*\ , \ *ifname*\ , \ *mask*\ , \ *net*\ , \ *routename*\ , \ *usercomment*\ +\ **route Attributes:**\ \ *gateway*\ , \ *ifname*\ , \ *mask*\ , \ *net*\ , \ *routename*\ , \ *usercomment*\ *********** @@ -40,39 +40,39 @@ route Attributes: \ **gateway**\ (routes.gateway) - + The gateway that routes the ip traffic from the mn to the nodes. It is usually a service node. - + \ **ifname**\ (routes.ifname) - + The interface name that facing the gateway. It is optional for IPv4 routes, but it is required for IPv6 routes. - + \ **mask**\ (routes.mask) - + The network mask. - + \ **net**\ (routes.net) - + The network address. - + \ **routename**\ (routes.routename) - + Name used to identify this route. - + \ **usercomment**\ (routes.comments) - + Any user-written notes. - + @@ -81,5 +81,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 1769368b385ce1ea7a7e33b007933e0807cc87ab Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0498/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/site.7.rst --- .../admin-guides/references/man7/site.7.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/site.7.rst b/docs/source/guides/admin-guides/references/man7/site.7.rst index c617ecd0f..7c341e89b 100644 --- a/docs/source/guides/admin-guides/references/man7/site.7.rst +++ b/docs/source/guides/admin-guides/references/man7/site.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **site Attributes:**\ \ *installdir*\ , \ *master*\ , \ *xcatdport*\ +\ **site Attributes:**\ \ *installdir*\ , \ *master*\ , \ *xcatdport*\ *********** @@ -40,21 +40,21 @@ site Attributes: \ **installdir**\ (site.value) - + The installation directory - + \ **master**\ (site.value) - + The management node - + \ **xcatdport**\ (site.value) - + Port used by xcatd daemon on master - + @@ -63,5 +63,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 26d89ccde59038a796acc14f9e6a8deb22249129 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0499/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/taskstate.7.rst --- .../references/man7/taskstate.7.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/taskstate.7.rst b/docs/source/guides/admin-guides/references/man7/taskstate.7.rst index 464a2206d..09209820a 100644 --- a/docs/source/guides/admin-guides/references/man7/taskstate.7.rst +++ b/docs/source/guides/admin-guides/references/man7/taskstate.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **taskstate Attributes:**\ \ *command*\ , \ *disable*\ , \ *node*\ , \ *pid*\ , \ *reserve*\ , \ *state*\ +\ **taskstate Attributes:**\ \ *command*\ , \ *disable*\ , \ *node*\ , \ *pid*\ , \ *reserve*\ , \ *state*\ *********** @@ -40,39 +40,39 @@ taskstate Attributes: \ **command**\ (taskstate.command) - + Current command is running - + \ **disable**\ (taskstate.disable) - + Set to 'yes' or '1' to comment out this row. - + \ **node**\ (taskstate.node) - + The node name. - + \ **pid**\ (taskstate.pid) - + The process id of the request process. - + \ **reserve**\ (taskstate.reserve) - + used to lock the node - + \ **state**\ (taskstate.state) - + The task state(callback, running) for the node. - + @@ -81,5 +81,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 337610db433363d53fe1ac7e156876c472f6236c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0500/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/zone.7.rst --- .../admin-guides/references/man7/zone.7.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/zone.7.rst b/docs/source/guides/admin-guides/references/man7/zone.7.rst index 7dca58ceb..e96c9c0c3 100644 --- a/docs/source/guides/admin-guides/references/man7/zone.7.rst +++ b/docs/source/guides/admin-guides/references/man7/zone.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **zone Attributes:**\ \ *defaultzone*\ , \ *sshbetweennodes*\ , \ *sshkeydir*\ , \ *usercomment*\ , \ *zonename*\ +\ **zone Attributes:**\ \ *defaultzone*\ , \ *sshbetweennodes*\ , \ *sshkeydir*\ , \ *usercomment*\ , \ *zonename*\ *********** @@ -40,33 +40,33 @@ zone Attributes: \ **defaultzone**\ (zone.defaultzone) - + If nodes are not assigned to any other zone, they will default to this zone. If value is set to yes or 1. - + \ **sshbetweennodes**\ (zone.sshbetweennodes) - + Indicates whether passwordless ssh will be setup between the nodes of this zone. Values are yes/1 or no/0. Default is yes. - + \ **sshkeydir**\ (zone.sshkeydir) - + Directory containing the shared root ssh RSA keys. - + \ **usercomment**\ (zone.comments) - + Any user-provided notes. - + \ **zonename**\ (zone.zonename) - + The name of the zone. - + @@ -75,5 +75,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From cfdc66be57431c43d3e8a63afe167c1c8b57610d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0501/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man7/zvmivp.7.rst --- docs/source/guides/admin-guides/references/man7/zvmivp.7.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man7/zvmivp.7.rst b/docs/source/guides/admin-guides/references/man7/zvmivp.7.rst index 5a8aeb8bf..8d7c12ac9 100644 --- a/docs/source/guides/admin-guides/references/man7/zvmivp.7.rst +++ b/docs/source/guides/admin-guides/references/man7/zvmivp.7.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **zvmivp Attributes:**\ \ **\ +\ **zvmivp Attributes:**\ \ **\ *********** @@ -45,5 +45,5 @@ SEE ALSO ******** -\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ +\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ From 09fa4c254d46b1ff6991e9f31cbfbbbfc0d41c98 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0502/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/chtab.8.rst --- .../admin-guides/references/man8/chtab.8.rst | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/chtab.8.rst b/docs/source/guides/admin-guides/references/man8/chtab.8.rst index 8e38a5abe..65e69fbc2 100644 --- a/docs/source/guides/admin-guides/references/man8/chtab.8.rst +++ b/docs/source/guides/admin-guides/references/man8/chtab.8.rst @@ -74,63 +74,63 @@ EXAMPLES 1. To add a node=node1 to the nodelist table with groups=all: - - + + .. code-block:: perl - + chtab node=node1 nodelist.groups=all - - + + 2. To add a keyword (tftpdir) and value (/tftpboot) to the site table: - - + + .. code-block:: perl - + chtab key=tftpdir site.value=/tftpboot - - + + 3. To add node1 to the nodetype table with os=rhel5: - - + + .. code-block:: perl - + chtab node=node1 nodetype.os=rhel5 - - + + 4. To change node1 in nodetype table setting os=sles: - - + + .. code-block:: perl - + chtab node=node1 nodetype.os=sles - - + + 5. To change node1 by appending otherpkgs to the postbootscripts field in the postscripts table: - - + + .. code-block:: perl - + chtab node=node1 postscripts.postbootscripts+=otherpkgs - - + + 6. To delete node1 from nodetype table: - - + + .. code-block:: perl - + chtab -d node=node1 nodetype - - + + From e998328af9073fcc94fbebd3adf2818d7e8b60da Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0503/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst --- .../guides/admin-guides/references/man8/copycds-cdrom.8.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst b/docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst index ef33aff24..bc9f48015 100644 --- a/docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst +++ b/docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst @@ -11,7 +11,7 @@ SYNOPSIS ******** -\ **copycds-cdrom**\ \ *[copycds options]*\ \ *[drive]*\ +\ **copycds-cdrom**\ \ *[copycds options]*\ \ *[drive]*\ *********** From 52a1be462522f0c895b1b9cc2b32ea54c7530f03 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0504/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/copycds.8.rst --- .../references/man8/copycds.8.rst | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/copycds.8.rst b/docs/source/guides/admin-guides/references/man8/copycds.8.rst index 37c399113..6353a9dde 100644 --- a/docs/source/guides/admin-guides/references/man8/copycds.8.rst +++ b/docs/source/guides/admin-guides/references/man8/copycds.8.rst @@ -44,40 +44,40 @@ OPTIONS -\ **-n|-**\ **-name|-**\ **-osver**\ =\ *distroname*\ - +\ **-n|-**\ **-name|-**\ **-osver**\ =\ *distroname*\ + The linux distro name and version that the ISO/DVD contains. Examples: rhels6.3, sles11.2, fedora9. Note the 's' in rhels6.3 which denotes the Server version of RHEL, which is typically used. - -\ **-a|-**\ **-arch**\ =\ *architecture*\ - + +\ **-a|-**\ **-arch**\ =\ *architecture*\ + The architecture of the linux distro on the ISO/DVD. Examples: x86, x86_64, ppc64, s390x. - -\ **-p|-**\ **-path**\ =\ *ospkgpath*\ - + +\ **-p|-**\ **-path**\ =\ *ospkgpath*\ + The destination directory to which the contents of ISO/DVD will be copied. When this option is not specified, the default destination directory will be formed from the \ **installdir**\ site table attribute and the distro name and architecture, for example: /install/rhel6.3/x86_64. This option is only supported for distributions of sles, redhat and windows. - -\ **-i|-**\ **-inspection**\ - + +\ **-i|-**\ **-inspection**\ + Check whether xCAT can recognize the DVDs/ISOs in the argument list, but do not copy the disc. Displays the os distribution name, architecture and disc no of each recognized DVD/ISO. This option is only supported for distributions of sles, redhat and windows. - -\ **-o|-**\ **-noosimage**\ - + +\ **-o|-**\ **-noosimage**\ + Do not create the default osimages based on the osdistro copied in. By default, \ **copycds**\ will create a set of osimages based on the osdistro. - -\ **-w|-**\ **-nonoverwrite**\ - + +\ **-w|-**\ **-nonoverwrite**\ + Complain and exit if the os disc has already been copied in. By default, \ **copycds**\ will overwrite the os disc already copied in. - + @@ -98,74 +98,74 @@ EXAMPLES 1. To copy the RPMs from a set of ISOs that represent the DVDs of a distro: - - + + .. code-block:: perl - + copycds dvd1.iso dvd2.iso - - + + 2. To copy the RPMs from a physical DVD to /depot/kits/3 directory: - - + + .. code-block:: perl - + copycds -p /depot/kits/3 /dev/dvd - - + + 3. To copy the RPMs from a DVD ISO of a very recently released distro: - - + + .. code-block:: perl - + copycds -n rhels6.4 -a x86_64 dvd.iso - - + + 4. To check whether a DVD ISO can be recognized by xCAT and display the recognized disc info: - - + + .. code-block:: perl - + copycds -i /media/RHEL/6.2/RHEL6.2-20111117.0-Server-ppc64-DVD1.iso - - + + Output will be similar to: - - + + .. code-block:: perl - + OS Image:/media/RHEL/6.2/RHEL6.2-20111117.0-Server-ppc64-DVD1.iso DISTNAME:rhels6.2 ARCH:ppc64 DISCNO:1 - - + + For the attributes that are not recognized, the value will be blank. - + 5. To copy the packages from a supplemental DVD ISO file: - - + + .. code-block:: perl - + copycds /isodir/RHEL6.5/RHEL6.5-Supplementary-20131114.2-Server-ppc64-DVD1.iso -n rhels6.5-supp - - + + Also, remember to add the new directory to your osimage definition: - - + + .. code-block:: perl - + chdef -t osimage myosimage -p pkgdir=/install/rhels6.5-supp/ppc64 - - + + From c31dc09cdf1915616d23d24e783c78e4cd28346b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0505/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst --- .../references/man8/makeconservercf.8.rst | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst b/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst index 249be78f4..105ea8367 100644 --- a/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst @@ -27,7 +27,7 @@ SYNOPSIS \ **makeconservercf**\ [\ **-V|-**\ **-verbose**\ ] [\ **-c|-**\ **-conserver**\ ] [\ *noderange*\ ] -\ **makeconservercf**\ [\ **-V|-**\ **-verbose**\ ] \ *noderange*\ [\ **-t|-**\ **-trust**\ ] \ *hosts*\ +\ **makeconservercf**\ [\ **-V|-**\ **-verbose**\ ] \ *noderange*\ [\ **-t|-**\ **-trust**\ ] \ *hosts*\ \ **makeconservercf**\ [\ **-h|-**\ **-help|-v|-**\ **-version**\ ] @@ -58,55 +58,55 @@ OPTIONS -\ **-d|-**\ **-delete**\ - +\ **-d|-**\ **-delete**\ + Delete rather than add or refresh the nodes specified as a noderange. - -\ **-C|-**\ **-cleanup**\ - + +\ **-C|-**\ **-cleanup**\ + Remove the entries for the nodes whose definitions have been removed from xCAT db. - -\ **-c|-**\ **-conserver**\ - + +\ **-c|-**\ **-conserver**\ + Only set up the conserver on the conserver host. If no conserver host is set for nodes, the conserver gets set up only on the management node. - -\ **-l|-**\ **-local**\ - + +\ **-l|-**\ **-local**\ + Only run \ **makeconservercf**\ locally and create the local /etc/conserver.cf. The default is to also run it on all service nodes, if there are any. - -\ **-t|-**\ **-trust**\ \ *hosts*\ - + +\ **-t|-**\ **-trust**\ \ *hosts*\ + Add additional trusted hosts into /etc/conserver.cf. The \ *hosts*\ are comma separated list of ip addresses or host names. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Display version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - + @@ -132,33 +132,33 @@ EXAMPLES 1. To create conserver configuration for all the nodes. - - + + .. code-block:: perl - + makeconservercf - - + + 2. To create conserver configuration for nodes node01-node10. - - + + .. code-block:: perl - + makeconservercf node01-node10 - - + + 3. To remove conserver configuration for node01. - - + + .. code-block:: perl - + makeconservercf -d node01 - - + + From 1fb81e547a0a85dbbc32174394a245713b62590e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0506/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/makedhcp.8.rst --- .../references/man8/makedhcp.8.rst | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makedhcp.8.rst b/docs/source/guides/admin-guides/references/man8/makedhcp.8.rst index 647f422de..ee3a581d5 100644 --- a/docs/source/guides/admin-guides/references/man8/makedhcp.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makedhcp.8.rst @@ -29,9 +29,9 @@ SYNOPSIS \ **makedhcp**\ \ *noderange*\ [\ **-s**\ \ *statements*\ ] [\ **-l | -**\ **-localonly**\ ] -\ **makedhcp**\ \ **-q**\ \ *noderange*\ +\ **makedhcp**\ \ **-q**\ \ *noderange*\ -\ **makedhcp**\ \ **[-h|-**\ **-help]**\ +\ **makedhcp**\ \ **[-h|-**\ **-help]**\ *********** @@ -39,35 +39,35 @@ DESCRIPTION *********** -The \ **makedhcp**\ command creates and updates the DHCP configuration on the management node and service nodes. +The \ **makedhcp**\ command creates and updates the DHCP configuration on the management node and service nodes. The \ **makedhcp**\ command is supported for both Linux and AIX clusters. 1. - + Start by filling out the networks(5)|networks.5 table properly. - + 2. - + Then use the \ **makedhcp -n**\ option to create a new dhcp configuration file. You can set the site table, dhcplease attribute to the lease time for the dhcp client. The default value is 43200. - + 3. - + Next, get the node IP addresses and MACs defined in the xCAT database. Also, get the hostnames and IP addresses pushed to /etc/hosts (using makehosts(8)|makehosts.8) and to DNS (using makedns(8)|makedns.8). - + 4. - + Then run \ **makedhcp**\ with a noderange or the \ **-a**\ option. This will inject into dhcpd configuration data pertinent to the specified nodes. On linux, the configuration information immediately takes effect without a restart of DHCP. - + If you need to delete node entries from the DHCP configuration, use the \ **-d**\ flag. @@ -79,8 +79,8 @@ OPTIONS -\ **-n**\ - +\ **-n**\ + Create a new dhcp configuration file with a network statement for each network the dhcp daemon should listen on. (Which networks dhcpd should listen on can be controlled by the dhcpinterfaces attribute in the site(5)|site.5 table.) The \ **makedhcp**\ command will automatically restart the dhcp daemon after this operation. @@ -88,58 +88,58 @@ OPTIONS For Linux systems the file will include network entries as well as certain general parameters such as a dynamic range and omapi configuration. For AIX systems the file will include network entries. On AIX systems, if there are any non-xCAT entries in the existing configuration file they will be preserved and added to the end of the new configuration file. - -\ **-a**\ - + +\ **-a**\ + Define all nodes to the DHCP server. (Will only add nodes that can be reached, network-wise, by this DHCP server.) The dhcp daemon does not have to be restarted after this. On AIX systems \ **makedhcp**\ will not add entries for cluster nodes that will be installed using NIM. The entries for these nodes will be managed by NIM. - -\ *noderange*\ - + +\ *noderange*\ + Add the specified nodes to the DHCP server configuration. - -\ **-s**\ \ *statements*\ - + +\ **-s**\ \ *statements*\ + For the input noderange, the argument will be interpreted like dhcp configuration file text. - -\ **-d**\ \ *noderange*\ - + +\ **-d**\ \ *noderange*\ + Delete node entries from the DHCP server configuration. On AIX, any entries created by NIM will not be removed. - -\ **-a -d**\ - + +\ **-a -d**\ + Delete all node entries, that were added by xCAT, from the DHCP server configuration. - -\ **-l | -**\ **-localonly**\ - + +\ **-l | -**\ **-localonly**\ + Configure dhcpd on the local machine only. Without this option, makedhcp will also send this operation to any service nodes that service the nodes in the noderange. - -\ **-q**\ \ *noderange*\ - + +\ **-q**\ \ *noderange*\ + Query the node entries from the DHCP server configuration. On AIX, any entries created by NIM will not be listed. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - + @@ -165,46 +165,46 @@ EXAMPLES 1. Create a new DHCP configuration file and add the network definitions: - - + + .. code-block:: perl - + makedhcp -n - - + + 2. Define all nodes to the dhcp server: - - + + .. code-block:: perl - + makedhcp -a - - + + Note: This does not add nodes that will be installed with AIX/NIM. - + 3. Will cause dhcp on the next request to set root-path appropriately for only node5. Note some characters (e.g. ") must be doubly escaped (once for the shell, and once for the OMAPI layer). - - + + .. code-block:: perl - + makedhcp node5 -s 'option root-path \"172.16.0.1:/install/freebsd6.2/x86_64\";' - - + + 4. Query a node from the DHCP server. - - + + .. code-block:: perl - - # makedhcp -q node01 + + # makedhcp -q node01 node01: ip-address = 91.214.34.156, hardware-address = 00:00:c9:c6:6c:42 - - + + From 8d82f137b297ebe219a22afae23f0c38c4de9019 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0507/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/makedns.8.rst --- .../references/man8/makedns.8.rst | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makedns.8.rst b/docs/source/guides/admin-guides/references/man8/makedns.8.rst index a97c1401a..961a13037 100644 --- a/docs/source/guides/admin-guides/references/man8/makedns.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makedns.8.rst @@ -59,36 +59,36 @@ OPTIONS -\ **-V | -**\ **-verbose**\ - +\ **-V | -**\ **-verbose**\ + Verbose mode. - -\ **-n | -**\ **-new**\ - + +\ **-n | -**\ **-new**\ + Use this flag to create new named configuration and db files. - -\ **-d | -**\ **-delete**\ - + +\ **-d | -**\ **-delete**\ + Remove the DNS records. - -\ **-e | -**\ **-external**\ - + +\ **-e | -**\ **-external**\ + Update DNS records to the external DNS server listed in /etc/resolv.conf. - + Enabling the site attribute \ *externaldns*\ means use 'external' DNS by default. If setting \ *externaldns*\ to 1, you need NOT use \ **-e**\ flag in every makedns call. - -\ **noderange**\ - + +\ **noderange**\ + A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats. - + @@ -99,43 +99,43 @@ Examples 1. To set up DNS for all the hosts in /etc/hosts file. - - + + .. code-block:: perl - + makedns - - + + 2. To set up DNS for \ *node1*\ . - - + + .. code-block:: perl - + makedns node1 - - + + 3. To create a new named configuration and db files for all hosts in /etc/hosts. - - + + .. code-block:: perl - + makedns -n - - + + 4. To delete the DNS records for \ *node1*\ . - - + + .. code-block:: perl - + makedns -d node1 - - + + From d9f0ab7e5572933046c6e49d1552592cd8972778 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0508/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/makegocons.8.rst --- .../references/man8/makegocons.8.rst | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makegocons.8.rst b/docs/source/guides/admin-guides/references/man8/makegocons.8.rst index 31daffabd..2ba2fe660 100644 --- a/docs/source/guides/admin-guides/references/man8/makegocons.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makegocons.8.rst @@ -49,7 +49,7 @@ which nodes will have their consoles accessed from the management node and which To start goconserver on the specified service node, setup goconserver package on that service node, then set the \ **console**\ column of \ **servicenode**\ table to \ **2**\ . -To support diskless service node, a new column \ **consoleenabled**\ has been added in \ **nodehm**\ table, it is used by \ **makegocons**\ +To support diskless service node, a new column \ **consoleenabled**\ has been added in \ **nodehm**\ table, it is used by \ **makegocons**\ command to save the current console state for the node. After reinstalling the service node, the console storage file which maintain the console nodes by goconserver is lost, xCAT would register the console nodes into goconserver based on \ **consoleenabled**\ attribute when restarting xcatd service. @@ -66,40 +66,40 @@ OPTIONS -\ **-d|-**\ **-delete**\ - +\ **-d|-**\ **-delete**\ + Delete rather than add or refresh the nodes specified as a noderange. - -\ **-C|-**\ **-cleanup**\ - + +\ **-C|-**\ **-cleanup**\ + Remove the entries for the nodes whose definitions have been removed from xCAT db. - -\ **-q|-**\ **-query**\ - + +\ **-q|-**\ **-query**\ + List the console connection of the nodes. If noderange is not specified, all of the console nodes will be displayed. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Display version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - + @@ -125,43 +125,43 @@ EXAMPLES 1. To create goconserver configuration for all the nodes. - - + + .. code-block:: perl - + makegocons - - + + 2. To create goconserver configuration for nodes node01-node10. - - + + .. code-block:: perl - + makegocons node01-node10 - - + + 3. To remove goconserver configuration for node01. - - + + .. code-block:: perl - + makegocons -d node01 - - + + 4. To list console connection for node01. - - + + .. code-block:: perl - + makegocons -q node01 - - + + From 88bcbfab997838d7257efb8f45698b29c6b7a4ea Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0509/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/makehosts.8.rst --- .../references/man8/makehosts.8.rst | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makehosts.8.rst b/docs/source/guides/admin-guides/references/man8/makehosts.8.rst index c2e10b28a..377da28ff 100644 --- a/docs/source/guides/admin-guides/references/man8/makehosts.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makehosts.8.rst @@ -29,7 +29,7 @@ DESCRIPTION *********** -\ **makehosts**\ updates the /etc/hosts file based on information stored in the +\ **makehosts**\ updates the /etc/hosts file based on information stored in the xCAT database object definitions. The main three bits of information needed are: node hostname, node ip and network domain name. @@ -49,32 +49,32 @@ OPTIONS -\ **-n**\ - +\ **-n**\ + Completely replace the /etc/hosts file, losing any previous content. If this option is not specified, it will only replace the lines in the file that correspond to the nodes in the specified noderange. - -\ **-l | -**\ **-longnamefirst**\ - + +\ **-l | -**\ **-longnamefirst**\ + The FQDN (Fully Qualified Domain Name) of the host will appear before the PQDN (Partially Qualified Domain Name) for each host in the /etc/hosts file. The default is PQDN first. After xCAT is installed, the attribute name "FQDNfirst" can be added into "site" table manually. If the value is set as "1", "yes" or "enable", the /etc/hosts entries generated by "makehosts" will put the FQDN before the PQDN. Otherwise, the original behavior will be performed. - -\ **-m | -**\ **-mactolinklocal**\ - + +\ **-m | -**\ **-mactolinklocal**\ + Updates /etc/hosts file with IPv6 link local addresses, the link local address is generated from the mac address stored in mac table. - -\ **-d**\ - + +\ **-d**\ + Delete rather than create records. This will also delete any additional network interfaces (NICs) included in the node definitions. - + @@ -85,26 +85,26 @@ EXAMPLES 1. Add entries to /etc/hosts for all nodes included in the xCAT node group called "compute". - - + + .. code-block:: perl - + makehosts compute - - + + 2. If the xCAT hosts table contains: - - + + .. code-block:: perl - + "compute","|node(\d+)|1.2.3.($1+0)|","|(.*)|($1).cluster.net|",, - - + + Assuming the group "compute" contains node01, node02, etc., then in /etc/hosts they will be given IP addresses of 1.2.3.1, 1.2.3.2, etc. - + From 64622e3fb0940094dab46a9e61f8e466d24668d5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0510/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst --- .../references/man8/makeknownhosts.8.rst | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst b/docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst index fe31b65ad..b82da98f3 100644 --- a/docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst @@ -46,29 +46,29 @@ OPTIONS -\ *noderange*\ - +\ *noderange*\ + A set of comma delimited node names and/or group names. See the \ *noderange*\ man page for details on supported formats. - -\ **-d|-**\ **-delete**\ - + +\ **-d|-**\ **-delete**\ + Only removes the entries for the nodes from the known_hosts file. - -\ **-r|-**\ **-remove**\ - + +\ **-r|-**\ **-remove**\ + Synonymous to \ **-d|-**\ **-delete**\ . - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Verbose mode. - + @@ -79,32 +79,32 @@ EXAMPLES 1. To build the known_hosts entry for the nodes in the compute group - - + + .. code-block:: perl - + makeknownhosts compute - - + + 2. To build the known_hosts entry for the nodes in the lpars and service groups - - + + .. code-block:: perl - + makeknownhosts lpars,service - - + + 3. To remove the known_hosts entry for node02 - - + + .. code-block:: perl - + makeknownhosts node02 -d - - + + From 51b5c41994d6fc922335c1d6fcfdfb79155ff71e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0511/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/makenetworks.8.rst --- .../references/man8/makenetworks.8.rst | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makenetworks.8.rst b/docs/source/guides/admin-guides/references/man8/makenetworks.8.rst index aa78cdc5b..99f296e05 100644 --- a/docs/source/guides/admin-guides/references/man8/makenetworks.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makenetworks.8.rst @@ -47,7 +47,7 @@ For example: .. code-block:: perl makenetworks -d > mynetstanzas - + cat mynetstanzas | mkdef -z @@ -104,31 +104,31 @@ EXAMPLES 1. Gather cluster network information and create xCAT network definitions. - - + + .. code-block:: perl - + makenetworks - - + + 2. Display cluster network information but do not write the network definitions to the xCAT database. - - + + .. code-block:: perl - + makenetworks -d - - + + The output would be one or more stanzas of information similar to the following. The line that ends with a colon is the value of the "netname" attribute and is the name of the network object to use with the lsdef, mkdef, chdef and rmdef commands. - + 9_114_37_0-255_255_255_0: objtype=network gateway=9.114.37.254 mask=255.255.255.0 net=9.114.37.0 - + From eafda3f0da6902f152e684ea119987b4abf0c330 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0512/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/makeroutes.8.rst --- .../references/man8/makeroutes.8.rst | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makeroutes.8.rst b/docs/source/guides/admin-guides/references/man8/makeroutes.8.rst index 1bb33dd5c..c369fa26b 100644 --- a/docs/source/guides/admin-guides/references/man8/makeroutes.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makeroutes.8.rst @@ -54,28 +54,28 @@ OPTIONS -\ **-d|-**\ **-delete**\ - +\ **-d|-**\ **-delete**\ + Specifies to delete the given routes. If not specified, the action is to add routes. - -\ **-r|-**\ **-routename**\ - + +\ **-r|-**\ **-routename**\ + Specifies a list of comma separated route names defined in the \ **routes**\ table. If omitted, all routes defined in \ **noderes.routenames**\ for nodes or \ **site.mnroutenames**\ for the management node will be used. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - + @@ -86,43 +86,43 @@ EXAMPLES 1. To add all routes from the \ **site.mnroutenames**\ to the os route table for the management node. - - + + .. code-block:: perl - + makeroutes - - + + 2. To add all the routes from \ **noderes.routenames**\ to the os route table for node1. - - + + .. code-block:: perl - + makeroutes node1 - - + + 3. To add route rr1 and rr2 to the os route table for the management node. - - + + .. code-block:: perl - + makeroutes -r rr1,rr2 - - + + 4. To delete route rr1 and rr2 from the os route table on node1 and node1. - - + + .. code-block:: perl - + makeroutes node1,node2 -d -r rr1,rr2 - - + + From de7ad115fb1d7e9f4ae90f73840202b4f13e5f84 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0513/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/mknb.8.rst --- .../guides/admin-guides/references/man8/mknb.8.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/mknb.8.rst b/docs/source/guides/admin-guides/references/man8/mknb.8.rst index 119a369ef..174e140a8 100644 --- a/docs/source/guides/admin-guides/references/man8/mknb.8.rst +++ b/docs/source/guides/admin-guides/references/man8/mknb.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **mknb**\ \ *arch*\ +\ **mknb**\ \ *arch*\ *********** @@ -29,7 +29,7 @@ DESCRIPTION The \ **mknb**\ command is run by xCAT automatically when xCAT is installed on the management node. It creates a network boot root image (used for node discovery, BMC programming, and flashing) -for the same architecture that the management node is. So you normally do not need to run the +for the same architecture that the management node is. So you normally do not need to run the \ **mknb**\ command yourself. If you make custom changes to the network boot root image, you will need to run \ **mknb**\ again to regenerate the diskless image to include your changes. If you have an xCAT Hierarchical Cluster with Service Nodes having local /tftpboot directories (site.sharedtftp=0), you will need to copy the generated root image to each Service Node. @@ -43,10 +43,10 @@ OPTIONS -\ *arch*\ - +\ *arch*\ + The hardware architecture for which to build the boot image. - + From c176ec2df2ba99c1ea5d9417495099e1a4bf9b09 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0514/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/nodeadd.8.rst --- .../references/man8/nodeadd.8.rst | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/nodeadd.8.rst b/docs/source/guides/admin-guides/references/man8/nodeadd.8.rst index aa956530e..9a92b2edc 100644 --- a/docs/source/guides/admin-guides/references/man8/nodeadd.8.rst +++ b/docs/source/guides/admin-guides/references/man8/nodeadd.8.rst @@ -47,16 +47,16 @@ OPTIONS -\ **-v|-**\ **-version**\ - +\ **-v|-**\ **-version**\ + Command Version. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -82,23 +82,23 @@ EXAMPLES 1. To add nodes in noderange node1-node4 with group all: - - + + .. code-block:: perl - + nodeadd node1-node4 groups=all - - + + 2. To add nodes in noderange node1-node4 to the nodetype table with os=rhel5: - - + + .. code-block:: perl - + nodeadd node1-node4 groups=all,rhel5 nodetype.os=rhel5 - - + + From 9c77c2c4bfb86012b1d3fcaacca971589c47390f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0515/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/nodeset.8.rst --- .../references/man8/nodeset.8.rst | 122 +++++++++--------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst index 97ebf1649..e09d07592 100644 --- a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst +++ b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -23,13 +23,13 @@ Name \ **nodeset**\ \ *noderange*\ \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ] [\ **-**\ **-ignorekernelchk**\ ] -\ **nodeset**\ \ *noderange*\ \ **runimage=**\ \ *task*\ +\ **nodeset**\ \ *noderange*\ \ **runimage=**\ \ *task*\ \ **nodeset**\ [\ **-h | -**\ **-help | -v | -**\ **-version**\ ] ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -65,94 +65,94 @@ A user can supply their own scripts to be run on the mn or on the service node ( *************** -\ **Options**\ +\ **Options**\ *************** -\ **boot**\ - +\ **boot**\ + Instruct network boot loader to be skipped, generally meaning boot to hard disk - -\ **offline**\ - + +\ **offline**\ + Cleanup the current pxe/tftp boot configuration files for the nodes requested - -\ **osimage | osimage=**\ \ *imagename*\ - + +\ **osimage | osimage=**\ \ *imagename*\ + Prepare server for installing a node using the specified os image. The os image is defined in the \ *osimage*\ table and \ *linuximage*\ table. If the is omitted, the os image name will be obtained from \ *nodetype.provmethod*\ for the node. - -\ **-**\ **-noupdateinitrd**\ - + +\ **-**\ **-noupdateinitrd**\ + Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the \ **geninitrd**\ command should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of \ **nodeset**\ command. - -\ **-**\ **-ignorekernelchk**\ - + +\ **-**\ **-ignorekernelchk**\ + Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel. - -\ **runimage**\ =\ *task*\ - + +\ **runimage**\ =\ *task*\ + If you would like to run a task after deployment, you can define that task with this attribute. - -\ **stat**\ - + +\ **stat**\ + Display the current boot loader config file description for the nodes requested. When \ **disjointdhcps**\ is set, using \ **-a**\ to display them on all available service nodes. - -\ **runcmd=**\ \ *command*\ - + +\ **runcmd=**\ \ *command*\ + This instructs the node to boot to the xCAT genesis environment and specified command to be executed. - -\ **shell**\ - + +\ **shell**\ + This instructs the node to boot to the xCAT genesis environment, and present a shell prompt on console. The node will also be able to be sshed into and have utilities such as wget, tftp, scp, nfs, and cifs. It will have storage drivers available for many common systems. - -\ **shutdown**\ - + +\ **shutdown**\ + To make the node to get into power off status. This status only can be used after \ **runcmd**\ and \ **runimage**\ to power off the node after the performing of operations. - -\ **-V | -**\ **-verbose**\ - + +\ **-V | -**\ **-verbose**\ + Verbose mode. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Print help. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Print version. - + ************* -\ **Files**\ +\ **Files**\ ************* @@ -173,44 +173,44 @@ root directory and the TFTP xCAT subdirectory. /tftpboot and **************** -\ **Examples**\ +\ **Examples**\ **************** 1. To setup to install mycomputeimage on the compute node group. - - + + .. code-block:: perl - + nodeset compute osimage=mycomputeimage - - + + 2. To run http://$master/image.tgz after deployment: - - + + .. code-block:: perl - + nodeset $node runimage=http://$MASTER/image.tgz - - + + 3. Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition. - - + + .. code-block:: perl - + rinstall node1 runcmd=bmcsetup - - + + ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From e66929ee33c6ae79df6db0ca9e564d57e883d28c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0516/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst --- .../references/man8/rescanplugins.8.rst | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst b/docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst index 6de8cd178..91badc206 100644 --- a/docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst +++ b/docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **rescanplugins**\ +\ **rescanplugins**\ \ **rescanplugins**\ [\ **-h | -**\ **-help**\ ] @@ -44,22 +44,22 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Displays the usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Displays the release version of the code. - -\ **-s|-**\ **-servicenodes**\ - + +\ **-s|-**\ **-servicenodes**\ + Process the rescanplugins on the management node and on all service nodes. The rescanplugins command will be sent to the xcatd daemon on all nodes defined in the servicenode table. The default is to only run on the management node. - + @@ -70,22 +70,22 @@ EXAMPLES 1. To rescan the plugins only on the xCAT Management Node: - - + + .. code-block:: perl - + rescanplugins - - + + 2. To rescan the plugins on the xCAT Management Node and on all service nodes: - - + + .. code-block:: perl - + rescanplugins -s - - + + From 97c1ec45a707006652bf8819e1361f083ba8c607 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0517/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/rinstall.8.rst --- .../references/man8/rinstall.8.rst | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/rinstall.8.rst b/docs/source/guides/admin-guides/references/man8/rinstall.8.rst index 26daef119..c0923a4f3 100644 --- a/docs/source/guides/admin-guides/references/man8/rinstall.8.rst +++ b/docs/source/guides/admin-guides/references/man8/rinstall.8.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -23,13 +23,13 @@ Name \ **rinstall**\ \ *noderange*\ \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ][\ **-**\ **-ignorekernelchk**\ ] [\ **-c | -**\ **-console**\ ] [\ **-u | -**\ **-uefimode**\ ] [\ **-V | -**\ **-verbose**\ ] -\ **rinstall**\ \ *noderange*\ \ **runimage=**\ \ *task*\ +\ **rinstall**\ \ *noderange*\ \ **runimage=**\ \ *task*\ \ **rinstall**\ [\ **-h | -**\ **-help | -v | -**\ **-version**\ ] ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -41,132 +41,132 @@ If \ **-c**\ is specified, it will then run \ **rcons**\ on the node. This is *************** -\ **Options**\ +\ **Options**\ *************** -\ **boot**\ - +\ **boot**\ + Instruct network boot loader to be skipped, generally meaning boot to hard disk - + \ **osimage**\ [=\ *imagename*\ ] - + Prepare server for installing a node using the specified OS image. The OS image is defined in the \ *osimage*\ table and \ *linuximage*\ table. If the \ *imagename*\ is omitted, the OS image name will be obtained from \ *nodetype.provmethod*\ for the node. - + \ **-**\ **-noupdateinitrd**\ Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the \ **geninitrd**\ command should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of \ **rinstall**\ command. -\ **-**\ **-ignorekernelchk**\ - +\ **-**\ **-ignorekernelchk**\ + Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel. - -\ **runimage=**\ \ *task*\ - + +\ **runimage=**\ \ *task*\ + If you would like to run a task after deployment, you can define that task with this attribute. - -\ **runcmd=**\ \ *command*\ - + +\ **runcmd=**\ \ *command*\ + This instructs the node to boot to the xCAT genesis environment and specified command to be executed. - -\ **shell**\ - + +\ **shell**\ + This instructs the node to boot to the xCAT genesis environment, and present a shell prompt on console. The node will also be able to be sshed into and have utilities such as wget, tftp, scp, nfs, and cifs. It will have storage drivers available for many common systems. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Display usage message. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display version. - -\ **-u | -**\ **-uefimode**\ - + +\ **-u | -**\ **-uefimode**\ + For BMC-based servers, to specify the next boot mode to be "UEFI Mode". - -\ **-V | -**\ **-verbose**\ - + +\ **-V | -**\ **-verbose**\ + Verbose output. - -\ **-c | -**\ **-console**\ - + +\ **-c | -**\ **-console**\ + Requests that \ **rinstall**\ runs \ **rcons**\ once the provision starts. This will only work if there is only one node in the noderange. See winstall(8)|winstall.8 for starting consoles on multiple nodes. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. Provision nodes 1 through 20, using their current configuration. - - + + .. code-block:: perl - + rinstall node1-node20 - - + + 2. Provision nodes 1 through 20 with the osimage rhels6.4-ppc64-netboot-compute. - - + + .. code-block:: perl - + rinstall node1-node20 osimage=rhels6.4-ppc64-netboot-compute - - + + 3. Provision node1 and start a console to monitor the process. - - + + .. code-block:: perl - + rinstall node1 -c - - + + 4. Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition. - - + + .. code-block:: perl - + rinstall node1 runcmd=bmcsetup - - + + ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From 74cd3645ab286b938a8d8cc4e34c42fc3f6fc35f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0518/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst --- .../references/man8/rmosdistro.8.rst | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst b/docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst index 261498552..51f8268b1 100644 --- a/docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst +++ b/docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst @@ -38,22 +38,22 @@ OPTIONS -\ **-a | -**\ **-all**\ - +\ **-a | -**\ **-all**\ + If specified, try to delete all the OS Distros. - -\ **-f | -**\ **-force**\ - + +\ **-f | -**\ **-force**\ + Remove referenced OS Distros, never prompt. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Show info of rmosdistro usage. - + @@ -62,7 +62,7 @@ RETURN VALUE ************ -Zero: +Zero: The command completed successfully. Nonzero: @@ -76,32 +76,32 @@ EXAMPLES 1. To remove OS Distro "rhels6.2-ppc64" and "sles11.2-ppc64": - - + + .. code-block:: perl - + rmosdistro rhels6.2-ppc64 sles11.2-ppc64 - - + + 2. To remove OS Distro "rhels6.2-ppc64", regardless of whether is referenced by any osimage: - - + + .. code-block:: perl - + rmosdistro -f rhels6.2-ppc64 - - + + 3. To remove all OS Distros: - - + + .. code-block:: perl - + rmosdistro -a - - + + From 7e73a337b3451661016ec01317db735c9022cb9c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0519/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst --- .../references/man8/runsqlcmd.8.rst | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst b/docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst index 7f720347f..1f6790e4b 100644 --- a/docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst +++ b/docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **runsqlcmd**\ +\ **runsqlcmd**\ \ **runsqlcmd**\ [\ **-h | -**\ **-help**\ ] @@ -37,7 +37,7 @@ DESCRIPTION *********** -The runsqlcmd routine, runs the sql statements contained in the \*.sql files as input to the command against the current running xCAT database. Only DB2,MySQL and PostgreSQL databases are supported. SQLite is not supported. +The runsqlcmd routine, runs the sql statements contained in the \*.sql files as input to the command against the current running xCAT database. Only DB2,MySQL and PostgreSQL databases are supported. SQLite is not supported. If no directory or filelist is provided, the default /opt/xcat/lib/perl/xCAT_schema directory is used. If the directory is input with the -d flag, that directory will be used. If a comma separated list of files is input with the -f flag, those files will be used. @@ -49,48 +49,48 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Displays the usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Displays current code version. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Displays extra debug information. - -\ **-d|-**\ **-dir**\ - + +\ **-d|-**\ **-dir**\ + To use a directory other than the default directory, enter the directory path here. - -\ **-f|-**\ **-files**\ - + +\ **-f|-**\ **-files**\ + Comma separated list of files (full path), wildcard (\*) can be used. - -\ **File format**\ - + +\ **File format**\ + The files must be of the form .sql or _.sql where - + is mysql,pgsql, or db2. Files must have permission 0755. - -\ *sql statement*\ - + +\ *sql statement*\ + Quoted sql statement syntax appropriate for the current database. - + @@ -101,52 +101,52 @@ EXAMPLES 1. To run the database appropriate \*.sql files in /opt/xcat/lib/perl/xCAT_schema : - - + + .. code-block:: perl - + runsqlcmd - - + + 2. To run the database appropriate \*.sql files in /tmp/mysql: - - + + .. code-block:: perl - + runsqlcmd -d /tmp/mysql - - + + 3. To run the database appropriate \*.sql files in the input list: - - + + .. code-block:: perl - + runsqlcmd -f "/tmp/mysql/test*,/tmp/mysql/test1*" - - + + 4. To checkout one DB2 sql file: - - + + .. code-block:: perl - + runsqlcmd -f /tmp/db2/test_db2.sql - - + + 5. To run the following command to the database: - - + + .. code-block:: perl - + runsqlcmd "Select * from site;" - - + + From b4f37fc60945eadd80918cc9281b4fab697bb5d6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0520/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst --- .../references/man8/setupiscsidev.8.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst b/docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst index 18b14391f..ab4b2beee 100644 --- a/docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst +++ b/docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **setupiscsidev**\ [\ **-s|-**\ **-size**\ ] \ *noderange*\ +\ **setupiscsidev**\ [\ **-s|-**\ **-size**\ ] \ *noderange*\ \ **setupiscsidev**\ [\ **-h|-**\ **-help|-v|-**\ **-version**\ ] @@ -40,22 +40,22 @@ OPTIONS -\ **-s|-**\ **-size**\ - +\ **-s|-**\ **-size**\ + The size of the LUN that should be created. Default is 4096. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Display version. - -\ **-h|-**\ **-help**\ - + +\ **-h|-**\ **-help**\ + Display usage message. - + From ccff54afb9382762ce65471cb7ff99e03d126d44 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0521/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/tabch.8.rst --- .../admin-guides/references/man8/tabch.8.rst | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/tabch.8.rst b/docs/source/guides/admin-guides/references/man8/tabch.8.rst index de11ce5ad..109b5705e 100644 --- a/docs/source/guides/admin-guides/references/man8/tabch.8.rst +++ b/docs/source/guides/admin-guides/references/man8/tabch.8.rst @@ -72,63 +72,63 @@ EXAMPLES 1. To add a node=node1 to the nodelist table with groups=all: - - + + .. code-block:: perl - + tabch node=node1 nodelist.groups=all - - + + 2. To add a keyword (tftpdir) and value (/tftpboot) to the site table: - - + + .. code-block:: perl - + tabch key=tftpdir site.value=/tftpboot - - + + 3. To add node1 to the nodetype table with os=rhel5: - - + + .. code-block:: perl - + tabch node=node1 nodetype.os=rhel5 - - + + 4. To change node1 in nodetype table setting os=sles: - - + + .. code-block:: perl - + tabch node=node1 nodetype.os=sles - - + + 5. To change node1 by appending otherpkgs to the postbootscripts field in the postscripts table: - - + + .. code-block:: perl - + tabch node=node1 postscripts.postbootscripts+=otherpkgs - - + + 6. To delete node1 from nodetype table: - - + + .. code-block:: perl - + tabch -d node=node1 nodetype - - + + From abaac35fd06825e388d327c89b57776d38f9af76 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0522/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/tabdump.8.rst --- .../references/man8/tabdump.8.rst | 142 +++++++++--------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/tabdump.8.rst b/docs/source/guides/admin-guides/references/man8/tabdump.8.rst index 1f5efbc42..7b67d827f 100644 --- a/docs/source/guides/admin-guides/references/man8/tabdump.8.rst +++ b/docs/source/guides/admin-guides/references/man8/tabdump.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **tabdump**\ +\ **tabdump**\ \ **tabdump**\ [\ **-d**\ ] [\ *table*\ ] @@ -54,40 +54,40 @@ OPTIONS -\ **-?|-h|-**\ **-help**\ - +\ **-?|-h|-**\ **-help**\ + Display usage message. - -\ **-d**\ - + +\ **-d**\ + Show descriptions of the tables, instead of the contents of the tables. If a table name is also specified, descriptions of the columns (attributes) of the table will be displayed. Otherwise, a summary of each table will be displayed. - -\ **-n**\ - + +\ **-n**\ + Shows the most recent number of entries as supplied on the -n flag from the auditlog or eventlog table. - -\ **-f**\ - + +\ **-f**\ + File name or path to file in which to dump the table. Without this the table is dumped to stdout. Using the -f flag allows the table to be dumped one record at a time. If tables are very large, dumping to stdout can cause problems such as running out of memory. - + \ **-w**\ \ *'attr==val'*\ \ **-w**\ \ *'attr=~val'*\ ... - + Use one or multiple -w flags to specify the selection string that can be used to select particular rows of the table. See examples. - + Operator descriptions: - - + + .. code-block:: perl - + == Select nodes where the attribute value is exactly this value. != Select nodes where the attribute value is not this specific value. > Select nodes where the attribute value is greater than this specific value. @@ -96,8 +96,8 @@ OPTIONS <= Select nodes where the attribute value is less than or equal to this specific value. =~ Select nodes where the attribute value matches the SQL LIKE value. !~ Select nodes where the attribute value matches the SQL NOT LIKE value. - - + + @@ -123,105 +123,105 @@ EXAMPLES 1. To display the contents of the site table: - - + + .. code-block:: perl - + tabdump site - - + + 2. To display the contents of the nodelist table where the groups attribute is compute : - - + + .. code-block:: perl - + tabdump -w 'groups==compute' nodelist - - + + 3. To display the contents of the nodelist table where the groups attribute is comput% where % is a wildcard and can represent any string and the status attribute is booted : - - + + .. code-block:: perl - + tabdump -w 'groups=~comput%' -w 'status==booted' nodelist - - + + 4. To display the records of the auditlog on date 2011-04-18 11:30:00 : - - + + .. code-block:: perl - + tabdump -w 'audittime==2011-04-18 11:30:00' auditlog - - + + 5. To display the records of the auditlog starting on 2011-04-18: - - + + .. code-block:: perl - + tabdump -w 'audittime>2011-04-18 11:30:00' auditlog - - + + 6. To display the 10 most recent entries in the auditlog: - - + + .. code-block:: perl - + tabdump -n 10 auditlog - - + + 7. To see what tables exist in the xCAT database: - - + + .. code-block:: perl - + tabdump - - + + 8. To back up all the xCAT database tables, instead of running \ **tabdump**\ multiple times, you can use the \ **dumpxCATdb**\ command as follows: - - + + .. code-block:: perl - + dumpxCATdb -p /tmp/xcatbak - - + + See the \ **dumpxCATdb**\ man page for details. - + 9. To display a summary description of each table: - - + + .. code-block:: perl - + tabdump -d - - + + 10. To display a description of each column in the nodehm table: - - + + .. code-block:: perl - + tabdump -d nodehm - - + + From 5e525aa9cfe2ba43400df1db6d3fe03855bd7eeb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0523/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/tabedit.8.rst --- .../references/man8/tabedit.8.rst | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/tabedit.8.rst b/docs/source/guides/admin-guides/references/man8/tabedit.8.rst index 7da620f7c..0cfdc0260 100644 --- a/docs/source/guides/admin-guides/references/man8/tabedit.8.rst +++ b/docs/source/guides/admin-guides/references/man8/tabedit.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **tabedit**\ \ *table*\ +\ **tabedit**\ \ *table*\ \ **tabedit**\ [\ **-?**\ | \ **-h**\ | \ **-**\ **-help**\ ] @@ -43,10 +43,10 @@ OPTIONS -\ **-?|-h|-**\ **-help**\ - +\ **-?|-h|-**\ **-help**\ + Display usage message. - + @@ -57,11 +57,11 @@ ENVIRONMENT VARIABLES TABEDITOR - + The editor that should be used to edit the table, for example: vi, vim, emacs, oocalc, pico, gnumeric, nano. If \ **TABEDITOR**\ is not set, the value from \ **EDITOR**\ will be used. If \ **EDITOR**\ is not set, it will default to vi. - + @@ -87,13 +87,13 @@ EXAMPLES 1. To edit the site table: - - + + .. code-block:: perl - + tabedit site - - + + From cbdb9a993f5ce12073165c65fcea0074755131ad Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0524/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/tabprune.8.rst --- .../references/man8/tabprune.8.rst | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/tabprune.8.rst b/docs/source/guides/admin-guides/references/man8/tabprune.8.rst index 58c489334..8eb9f39c5 100644 --- a/docs/source/guides/admin-guides/references/man8/tabprune.8.rst +++ b/docs/source/guides/admin-guides/references/man8/tabprune.8.rst @@ -21,7 +21,7 @@ SYNOPSIS \ **tabprune**\ [\ **eventlog | auditlog**\ ] [\ **-V**\ ] [\ **-i**\ \ *recid*\ | \ **-n**\ \ *number of records*\ | \ **-p**\ \ *percentage*\ | \ **-d**\ \ *number of days*\ | \ **-a**\ ] -\ **tabprune**\ \ *tablename*\ \ **-a**\ +\ **tabprune**\ \ *tablename*\ \ **-a**\ \ **tabprune**\ [\ **-h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ] @@ -40,47 +40,47 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Display usage message. - -\ **-V**\ - + +\ **-V**\ + Verbose mode. This will cause tabprune to display the records that are being deleted from the table, in case you want to redirect them to a file to archive them. - -\ **-a**\ - + +\ **-a**\ + Remove all records from the input table name. This option can be used on any xCAT table. - -\ **-i**\ \ *recid number*\ - + +\ **-i**\ \ *recid number*\ + Remove the records whose recid is less than the input recid number. - -\ **-n**\ \ *number*\ - + +\ **-n**\ \ *number*\ + Remove the number of records input. - -\ **-p**\ \ *percent*\ - + +\ **-p**\ \ *percent*\ + Remove the number of records input. - -\ **-d**\ \ *number of days*\ - + +\ **-d**\ \ *number of days*\ + Remove all records that occurred >= than number of days ago. - + @@ -106,63 +106,63 @@ EXAMPLES 1. To remove all the records in the eventlog table: - - + + .. code-block:: perl - + tabprune eventlog -a - - + + 2. To remove all the records in the eventlog table saving the deleted records in eventlog.csv: - - + + .. code-block:: perl - + tabprune eventlog -V -a > eventlog.csv - - + + 3. To remove all the records before recid=200 in the auditlog table: - - + + .. code-block:: perl - + tabprune auditlog -i 200 - - + + 4. To remove 400 records from the auditlog table and display the remove records: - - + + .. code-block:: perl - + tabprune auditlog -V -n 400 - - + + 5. To remove 50% of the eventlog table: - - + + .. code-block:: perl - + tabprune eventlog -p 50 - - + + 6. To remove all records that occurred >= 5 days ago in the eventlog: - - + + .. code-block:: perl - + tabprune eventlog -d 5 - - + + From bb81e2f3ed9fe70c22cce6f75722fdf1021a3c15 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0525/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/tabrestore.8.rst --- .../references/man8/tabrestore.8.rst | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/tabrestore.8.rst b/docs/source/guides/admin-guides/references/man8/tabrestore.8.rst index 10b6c2331..25318187d 100644 --- a/docs/source/guides/admin-guides/references/man8/tabrestore.8.rst +++ b/docs/source/guides/admin-guides/references/man8/tabrestore.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **tabrestore**\ [\ **-a**\ ] \ *table.csv*\ +\ **tabrestore**\ [\ **-a**\ ] \ *table.csv*\ \ **tabrestore**\ [\ **-?**\ | \ **-h**\ | \ **-**\ **-help**\ ] @@ -47,22 +47,22 @@ OPTIONS -\ **-?|-h|-**\ **-help**\ - +\ **-?|-h|-**\ **-help**\ + Display usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Display version. - -\ **-a|-**\ **-addrows**\ - + +\ **-a|-**\ **-addrows**\ + Add rows from the CSV file to the table instead of replacing the table with the CSV file. - + @@ -88,42 +88,42 @@ EXAMPLES 1. To replace the rows in the mp table with the rows in the mp.csv file: - - + + .. code-block:: perl - + tabrestore mp.csv - - + + The file mp.csv could contain something like: - - + + .. code-block:: perl - + #node,mpa,id,comments,disable "blade","|\D+(\d+)|amm(($1-1)/14+1)|","|\D+(\d+)|(($1-1)%14+1)|",, - - + + 2. To add the rows in the mp.csv file to the rows in the mp table: - - + + .. code-block:: perl - + tabrestore -a mp.csv - - + + 3. To restore database tables from restore_directory that we dumped with dumpxCATdb: - - + + .. code-block:: perl - + restorexCATdb -p restore_directory - - + + From b3c8d1303693aca15716da6aad4065822ec42832 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0526/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/winstall.8.rst --- .../references/man8/winstall.8.rst | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/winstall.8.rst b/docs/source/guides/admin-guides/references/man8/winstall.8.rst index e939b5554..cbf27cf7f 100644 --- a/docs/source/guides/admin-guides/references/man8/winstall.8.rst +++ b/docs/source/guides/admin-guides/references/man8/winstall.8.rst @@ -15,7 +15,7 @@ Name **************** -\ **Synopsis**\ +\ **Synopsis**\ **************** @@ -27,7 +27,7 @@ Name ******************* -\ **Description**\ +\ **Description**\ ******************* @@ -39,102 +39,102 @@ It will then run \ **wcons**\ on the noderange. *************** -\ **Options**\ +\ **Options**\ *************** -\ **boot**\ - +\ **boot**\ + Instruct network boot loader to be skipped, generally meaning boot to hard disk - -\ *imagename*\ | \ **osimage=**\ \ *imagename*\ - + +\ *imagename*\ | \ **osimage=**\ \ *imagename*\ + Prepare server for installing a node using the specified os image. The os image is defined in the \ *osimage*\ table and \ *linuximage*\ table. If the \ *imagename*\ is omitted, the os image name will be obtained from \ *nodetype.provmethod*\ for the node. - -\ **-**\ **-ignorekernelchk**\ - + +\ **-**\ **-ignorekernelchk**\ + Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel. - -\ **runimage=**\ \ *task*\ - + +\ **runimage=**\ \ *task*\ + If you would like to run a task after deployment, you can define that task with this attribute. - -\ **runcmd=bmcsetup**\ - + +\ **runcmd=bmcsetup**\ + This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC for basic remote access. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table. - -\ **shell**\ - + +\ **shell**\ + This instructs the node to boot to the xCAT genesis environment, and present a shell prompt on console. The node will also be able to be sshed into and have utilities such as wget, tftp, scp, nfs, and cifs. It will have storage drivers available for many common systems. - -\ **-h | -**\ **-help**\ - + +\ **-h | -**\ **-help**\ + Display usage message. - -\ **-v | -**\ **-version**\ - + +\ **-v | -**\ **-version**\ + Display version. - -\ **-u | -**\ **-uefimode**\ - + +\ **-u | -**\ **-uefimode**\ + For BMC-based servers, to specify the next boot mode to be "UEFI Mode". - -\ **-V | -**\ **-verbose**\ - + +\ **-V | -**\ **-verbose**\ + Verbose output. - + **************** -\ **Examples**\ +\ **Examples**\ **************** 1. Provision nodes 1 through 20, using their current configuration. - - + + .. code-block:: perl - + winstall node1-node20 - - + + 2. Provision nodes 1 through 20 with the osimage rhels6.4-ppc64-netboot-compute. - - + + .. code-block:: perl - + winstall node1-node20 osimage=rhels6.4-ppc64-netboot-compute - - + + ************************ -\ **See**\ \ **Also**\ +\ **See**\ \ **Also**\ ************************ From 7095abf0e169a6180ff20cad729e696bb06b61e5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0527/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst --- .../references/man8/xcatconfig.8.rst | 122 +++++++++--------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst b/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst index 85a089555..4002f73e8 100644 --- a/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst +++ b/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst @@ -46,80 +46,80 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Displays the usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Displays the release version of the code. - -\ **-V|-**\ **-verbose**\ - + +\ **-V|-**\ **-verbose**\ + Displays verbose messages. - -\ **-i|-**\ **-initialinstall**\ - + +\ **-i|-**\ **-initialinstall**\ + The install option is normally run as a post operation from the rpm xCAT.spec file during the initial install of xCAT on the Management Node. It will setup the root ssh keys, ssh node keys, xCAT credentials, initialize the database, export directories, start syslog and other daemons as needed after the initial install of xCAT. - -\ **-u|-**\ **-updateinstall**\ - + +\ **-u|-**\ **-updateinstall**\ + The update install option is normally run as a post operation from the rpm xCAT.spec file during an update install of xCAT on the Management Node. It will check the setup the root ssh keys, ssh node keys, xCAT credentials, database, exported directories, syslog and the state of daemons needed by xCAT, after the updateinstall of xCAT. If setup is required, it will perform the operation. It will restart the necessary daemons. - -\ **-k|-**\ **-sshkeys**\ - + +\ **-k|-**\ **-sshkeys**\ + This option will remove and regenerate the root id_rsa keys. It should only be used, if the keys are deleted or corrupted. The keys must then be distributed to the nodes by installing, running updatenode -k, or using xdsh -K option, for root to be able to ssh to the nodes without being prompted for a password. rspconfig will need to be run to distribute the key to the MM and HMCs. Any device, we need to ssh from the MN to the device will also have to be updated with the new ssh keys. - -\ **-s|-**\ **-sshnodehostkeys**\ - + +\ **-s|-**\ **-sshnodehostkeys**\ + This option will remove and regenerate the node host ssh keys. It should only be used, if the keys are deleted or are corrupted. The keys must then be redistribute to the nodes by installing, running updatenode -k or using xdcp or pcp to copy the keys from /etc/xcat/hostkeys directory to the /etc/ssh directory on the nodes. - -\ **-c|-**\ **-credentials**\ - + +\ **-c|-**\ **-credentials**\ + This option will remove all xcat credentials for root and any userids where credentials have been created. It will regenerate roots credentials, but the admin will have to add back all the userid credentials needed with the /opt/xcat/share/xcat/scripts/setup-local-client.sh command. It should only be used, if they are deleted or become corrupted. The root credentials must be redistributed to the service nodes by installing the service node or using updatenode -k. makeconservercf must be rerun to pick up the new credentials, and conserver must be stopped and started. - -\ **-d|-**\ **-database**\ - + +\ **-d|-**\ **-database**\ + This option will reinitialize the basic xCAT database table setup. It will not remove any new database entries that have been added, but it is strongly suggested that you backup you database (dumpxCATdb) before using it. - -\ **-f|-**\ **-force**\ - + +\ **-f|-**\ **-force**\ + The force option may be used after the install to reinitialize the Management Node. This option will regenerate keys, credential and reinitialize the site table. This option should be used, if keys or credentials become corrupt or lost. Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stopped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs. A new set of common ssh host keys will have been generated for the nodes. If you wish your nodes to be able to ssh to each other with out password intervention, then you should redistribute these new keys to the nodes. If the nodes hostkeys are updated then you will need to remove their entries from the known_hosts files on the management node before using ssh, xdsh, xdcp. Redistribute credentials and ssh keys to the service nodes and ssh keys to the nodes by using the updatenode -k command. - -\ **-m|-**\ **-mgtnode**\ - + +\ **-m|-**\ **-mgtnode**\ + This option will add the Management Node to the database with the correct attributes set to be recognized by xCAT. This should be run after the hostname of the Management Node is set to the name that will resolve to the cluster-facing NIC. - -\ **-t|-**\ **-tunables**\ - + +\ **-t|-**\ **-tunables**\ + This option will set tunable parameters on the Management and Service nodes recommended for your Linux cluster. It will only set them during initial install, if you run xcatconfig -f or xcatconfig -t. - + @@ -130,52 +130,52 @@ EXAMPLES 1. To force regeneration of keys and credentials and reinitialize the site table: - - + + .. code-block:: perl - + xcatconfig -f - - + + 2. To regenerate root's ssh keys: - - + + .. code-block:: perl - + xcatconfig -k - - + + 3. To regenerate node host ssh keys: - - + + .. code-block:: perl - + xcatconfig -s - - + + 4. To regenerate node host ssh keys and credentials: - - + + .. code-block:: perl - + xcatconfig -s -c - - + + 5. To add the Management Node to the DB: - - + + .. code-block:: perl - + xcatconfig -m - - + + From 16a0c1870639da18049e01af298152cbaac5b330 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0528/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/xcatd.8.rst --- .../admin-guides/references/man8/xcatd.8.rst | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/xcatd.8.rst b/docs/source/guides/admin-guides/references/man8/xcatd.8.rst index 80061339d..adb1479d4 100644 --- a/docs/source/guides/admin-guides/references/man8/xcatd.8.rst +++ b/docs/source/guides/admin-guides/references/man8/xcatd.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **xcatd**\ +\ **xcatd**\ *********** @@ -41,33 +41,33 @@ EXAMPLES 1. To start/stop/restart xcatd on Linux, enter: - - + + .. code-block:: perl - - service xcatd start - - service xcatd stop - + + service xcatd start + + service xcatd stop + service xcatd restart - - + + 2. To start/stop/restart xcatd on AIX, enter: - - + + .. code-block:: perl - + restartxcatd - + or - + startsrc -s xcatd - + stopsrc -s xcatd - - + + From 44a6f09a29e27202bdbd6cff5d5c9fc19aea88c3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0529/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst --- .../references/man8/xcatdebug.8.rst | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst b/docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst index 6a32f61e7..ce0dc1705 100644 --- a/docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst +++ b/docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst @@ -30,15 +30,15 @@ DESCRIPTION xCAT offers two trace facilities to debug the xCAT: -\ **Subroutine calling trace**\ +\ **Subroutine calling trace**\ Display the calling trace for subroutine when it is called. The trace message includes: The name of the called subroutine; The arguments which passed to the called subroutine; The calling stack of the subroutine. By default, the trace will be enabled to all the subroutines in the xcatd and plugin modules. The target subroutine can be configured by configuration file or through xcatdebug command line. The flag \ **-c**\ is used to specify the subroutine list for \ **subroutine calling trace**\ , it can only work with \ **-f**\ . The value of \ **-c**\ can be a configuration file or a subroutine list. - \ **configuration file**\ : a file contains multiple lines of \ **SUBROUTINE_DEFINITION**\ - \ **subroutine list**\ : \ **SUBROUTINE_DEFINITION | SUBROUTINE_DEFINITION|...**\ + \ **configuration file**\ : a file contains multiple lines of \ **SUBROUTINE_DEFINITION**\ + \ **subroutine list**\ : \ **SUBROUTINE_DEFINITION | SUBROUTINE_DEFINITION|...**\ \ **SUBROUTINE_DEFINITION**\ : is the element for the \ **-c**\ to specify the subroutine list. @@ -53,7 +53,7 @@ Otherwise, the package name of the plugin should be specified. The trace log will be written to /var/log/xcat/subcallingtrace. The log file subcallingtrace will be backed up for each running of the \ **xcatdebug -f enable**\ . -\ **Commented trace log**\ +\ **Commented trace log**\ The trace log code is presented as comments in the code of xCAT. In general mode, it will be kept as comments. But in debug mode, it will be commented back as common code to display the trace log. @@ -88,39 +88,39 @@ OPTIONS -\ **-f**\ - +\ **-f**\ + Enable or disable the \ **subroutine calling trace**\ . - + For \ **enable**\ , if ignoring the \ **-c**\ flag, all the subroutines in the xcatd and plugin modules will be enabled. - + For \ **disable**\ , all the subroutines which has been enabled by \ **-f enable**\ will be disabled. \ **-c**\ will be ignored. - -\ **-c**\ - + +\ **-c**\ + Specify the configuration file or subroutine list. - - - \ **configuration file**\ : a file contains multiple lines of \ **SUBROUTINE_DEFINITION**\ + + + \ **configuration file**\ : a file contains multiple lines of \ **SUBROUTINE_DEFINITION**\ e.g. (plugin_command) xCAT_plugin::DBobjectdefs(defls,process_request) xCAT::DBobjUtils(getobjdefs) - - \ **subroutine list**\ : a string like \ **SUBROUTINE_DEFINITION | SUBROUTINE_DEFINITION|...**\ + + \ **subroutine list**\ : a string like \ **SUBROUTINE_DEFINITION | SUBROUTINE_DEFINITION|...**\ e.g. "(plugin_command)|xCAT_plugin::DBobjectdefs(defls,process_request)|xCAT::DBobjUtils(getobjdefs)" - -\ **-d**\ - + +\ **-d**\ + Enable or disable the \ **commented trace log**\ . - - Note: The xcatd will be restarted for the performing of \ **-d**\ - + + Note: The xcatd will be restarted for the performing of \ **-d**\ + @@ -131,62 +131,62 @@ EXAMPLES 1. Enable the \ **subroutine calling trace**\ for all the subroutines in the xcatd and plugin modules. - - + + .. code-block:: perl - + xcatdebug -f enable - - + + 2. Enable the \ **subroutine calling trace**\ for the subroutines configured in the /opt/xcat/share/xcat/samples/tracelevel0 - - + + .. code-block:: perl - + xcatdebug -f enable -c /opt/xcat/share/xcat/samples/tracelevel0 - - + + 3. Enable the \ **subroutine calling trace**\ for the plugin_command in xcatd and defls,process_request in the xCAT_plugin::DBobjectdefs module. - - + + .. code-block:: perl - + xcatdebug -f enable -c "xCAT_plugin::DBobjectdefs(defls,process_request)|(plugin_command)" - - + + 4. Disable the \ **subroutine calling trace**\ for all the subroutines which have been enabled by \ **xcatdebug -f enable**\ . - - + + .. code-block:: perl - + xcatdebug -f disable - - -5. Enable the \ **commented trace log**\ - - + + +5. Enable the \ **commented trace log**\ + + .. code-block:: perl - + xcatdebug -d enable - - -6. Enable both the \ **subroutine calling trace**\ and \ **commented trace log**\ - - + + +6. Enable both the \ **subroutine calling trace**\ and \ **commented trace log**\ + + .. code-block:: perl - + xcatdebug -f enable -c /opt/xcat/share/xcat/samples/tracelevel0 -d enable - - + + From 39173f004ab0a48aa5dfea757ffedde0498a05e7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0530/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst --- .../references/man8/xcatsetup.8.rst | 282 +++++++++--------- 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst b/docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst index 355cc6cb6..011d5506e 100644 --- a/docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst +++ b/docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **xcatsetup**\ [\ **-s|-**\ **-stanzas**\ \ *stanza-list*\ ] [\ **-**\ **-yesreallydeletenodes**\ ] \ *cluster-config-file*\ +\ **xcatsetup**\ [\ **-s|-**\ **-stanzas**\ \ *stanza-list*\ ] [\ **-**\ **-yesreallydeletenodes**\ ] \ *cluster-config-file*\ \ **xcatsetup**\ [\ **-?**\ | \ **-h**\ | \ **-**\ **-help**\ | \ **-v**\ | \ **-**\ **-version**\ ] @@ -36,51 +36,51 @@ the hardware that is connected to the service and cluster networks. The typical 1. - + Install the xCAT software on the management node - + 2. - + Create the cluster config file and run xcatsetup - + 3. - + Put hardware control passwords in the ppchcp or ppcdirect database table - + 4. - + Run makenetworks and makedhcp - + 5. - + Run the discovery commands (lsslp, mkhwconn, rspconfig) as described in the System P Hardware Management cookbook. - + 6. - + Configure and start services using makehosts, makedns, mkconserver.cf, etc. - + 7. - + Create the images that should be installed or booted on the nodes - + 8. - + Run nodeset and rpower/rnetboot to boot up the nodes. - + The \ **xcatsetup**\ command is intended as a quick way to fill out the database for a cluster that has very regular @@ -140,16 +140,16 @@ This sample configuration file is for a 2 building block cluster. # ISR network topology. For example, one of the following: 128D, 64D, 32D, 16D, 8D, 4D, 2D, 1D topology = 32D # The nameservers in site table will be set with the value of master automatically. - + xcat-service-lan: # IP range used for DHCP. If you set the entry, the networks table will be filled # automatically with this range and the dhcp interface will be set in the site table. dhcp-dynamic-range = 50.0.0.0-50.0.0.200 - + xcat-hmcs: hostname-range = hmc1-hmc2 starting-ip = 10.200.1.1 - + xcat-frames: # these are the connections to the frames hostname-range = frame[1-6] @@ -166,12 +166,12 @@ This sample configuration file is for a 2 building block cluster. # bpa-b-1-starting-ip = 10.231.2.1 # This assumes you have 2 service LANs: a primary service LAN 40.x.y.z/255.0.0.0 that all of the port 0's # are connected to, and a backup service LAN 41.x.y.z/255.0.0.0 that all of the port 1's are connected to. - # "x" is the frame number and "z" is the bpa/fsp id (1 for the first BPA/FSP in the Frame/CEC, 2 for the + # "x" is the frame number and "z" is the bpa/fsp id (1 for the first BPA/FSP in the Frame/CEC, 2 for the # second BPA/FSP in the Frame/CEC). For BPAs "y" is always be 0 and for FSPs "y" is the cec id. vlan-1 = 40 vlan-2 = 41 - - + + xcat-cecs: # These are the connections to the CECs. Either form of hostname is supported. #hostname-range = cec01-cec64 @@ -189,12 +189,12 @@ This sample configuration file is for a 2 building block cluster. #fsp-b-0-starting-ip = 10.230.4.1 #fsp-a-1-starting-ip = 10.231.3.1 #fsp-b-1-starting-ip = 10.231.4.1 - - + + xcat-building-blocks: num-frames-per-bb = 3 num-cecs-per-bb = 32 - + xcat-lpars: num-lpars-per-cec = 8 # If you set these, then do not set the corresponding attributes in the other node stanzas below. @@ -205,7 +205,7 @@ This sample configuration file is for a 2 building block cluster. aliases = -hf0 # ml0 is for aix. For linux, use bond0 instead. otherinterfaces = -hf1:11.1.1.1,-hf2:12.1.1.1,-hf3:13.1.1.1,-ml0:14.1.1.1 - + xcat-service-nodes: num-service-nodes-per-bb = 2 # which cecs within the bldg block that the SNs are located in @@ -216,7 +216,7 @@ This sample configuration file is for a 2 building block cluster. # this value is the same format as the hosts.otherinterfaces attribute except # the IP addresses are starting IP addresses #otherinterfaces = -hf0:10.10.1.1,-hf1:10.11.1.1,-hf2:10.12.1.1,-hf3:10.13.1.1,-ml0:10.14.1.1 - + xcat-storage-nodes: num-storage-nodes-per-bb = 3 # which cecs within the bldg block that the storage nodes are located in @@ -225,7 +225,7 @@ This sample configuration file is for a 2 building block cluster. #starting-ip = 10.20.1.1 #aliases = -hf0 #otherinterfaces = -hf1:10.21.1.1,-hf2:10.22.1.1,-hf3:10.23.1.1,-ml0:10.24.1.1 - + xcat-compute-nodes: #hostname-range = n001-n502 #starting-ip = 10.30.1.1 @@ -312,16 +312,16 @@ VPD data or supernode numbers at this time. xcat-site: use-direct-fsp-control = 1 - + xcat-frames: hostname-range = frame[1-2] - + xcat-cecs: #hostname-range = cec[01-24] hostname-range = f[1-2]c[01-12] num-cecs-per-frame = 12 - - + + xcat-lpars: hostname-range = f[1-2]c[01-12]p[01,05,09,13,17,21,25,29] @@ -335,154 +335,154 @@ The following lists which database attributes are filled in as a result of each in the stanza, some attributes might not be filled in. -\ **xcat-site**\ - +\ **xcat-site**\ + site table: domain, nameservers, topology - -\ **xcat-hmcs**\ - + +\ **xcat-hmcs**\ + site table: ea_primary_hmc, ea_backup_hmc - + nodelist table: node, groups (all HMCs (hmc) ), hidden - + hosts table: node, ip - + ppc table: node, comments - + nodetype table: node, nodetype - -\ **xcat-frames**\ - + +\ **xcat-frames**\ + nodelist table: node, groups (all frames (frame) ), hidden - + ppc table: node, id, hcp, nodetype, sfp - + nodetype table: node, nodetype - + nodehm table: node, mgt - + vpd table: node, serial, mtm, side - -\ **xcat-bpas**\ - + +\ **xcat-bpas**\ + nodelist table: node, groups (bpa,all) , hidden - + ppc table: node, id, hcp, nodetype, parent - + nodetype table: node, nodetype - + nodehm table: node, mgt - + vpd table: node, serial, mtm, side - -\ **xcat-cecs**\ - + +\ **xcat-cecs**\ + nodelist table: node, groups (all CECs (cec), all CECs in a frame (cec) ), hidden - + ppc table: node, supernode, hcp, id, parent - + nodetype table: node, nodetype - + nodehm table: node, mgt - + nodegroup table: groupname, grouptype, members, wherevals (all nodes in a CEC (nodes) ) - + nodepos: rack, u - -\ **xcat-fsps**\ - + +\ **xcat-fsps**\ + nodelist table: node, groups (fsp,all), hidden - + ppc table: node, id, hcp, nodetype, parent - + nodetype table: node, nodetype - + nodehm table: node, mgt - + vpd table: node, serial, mtm, side - -\ **xcat-building-blocks**\ - + +\ **xcat-building-blocks**\ + site table: sharedtftp, sshbetweennodes(service) - + ppc table: node, parent (for frame) - -\ **xcat-service-nodes**\ - + +\ **xcat-service-nodes**\ + nodelist table: node, groups (all service nodes (service), all service nodes in a BB (bbservice) ) - + hosts table: node, ip, hostnames, otherinterfaces - + ppc table: node, id, hcp, parent - + nodetype table: node, nodetype, arch - + nodehm table: node, mgt, cons - + noderes table: netboot - + servicenode table: node, nameserver, dhcpserver, tftpserver, nfsserver, conserver, monserver, ftpserver, nimserver, ipforward - + nodegroup table: groupname, grouptype, members, wherevals (all nodes under a service node (nodes) ) - + nodepos: rack, u - -\ **xcat-storage-nodes**\ - + +\ **xcat-storage-nodes**\ + nodelist table: node, groups (all storage nodes (storage), all storage nodes in a BB (bbstorage) ) - + hosts table: node, ip, hostnames, otherinterfaces - + ppc table: node, id, hcp, parent - + nodetype table: node, nodetype, arch - + nodehm table: node, mgt, cons - + noderes table: netboot, xcatmaster, servicenode - + nodepos: rack, u - -\ **xcat-compute-nodes**\ - + +\ **xcat-compute-nodes**\ + nodelist table: node, groups (all compute nodes (compute) ) - + hosts table: node, ip, hostnames, otherinterfaces - + ppc table: node, id, hcp, parent - + nodetype table: node, nodetype, arch - + nodehm table: node, mgt, cons - + noderes table: netboot, xcatmaster, servicenode - + nodepos: rack, u - -\ **ll-config**\ - + +\ **ll-config**\ + postscripts: postscripts - + @@ -493,36 +493,36 @@ OPTIONS -\ **-s|-**\ **-stanzas**\ \ *stanza-list*\ - +\ **-s|-**\ **-stanzas**\ \ *stanza-list*\ + A comma-separated list of stanza names that \ **xcatsetup**\ should process in the configuration file. If not specified, it will process all the stanzas that start with 'xcat' and some other stanzas that give xCAT hints about how to set up the HPC products. - + This option should only be specified if you have already run \ **xcatsetup**\ earlier with the stanzas that occur before this in the configuration file. Otherwise, objects will be created that refer back to other objects that do not exist in the database. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Command Version. - -\ **-?|-h|-**\ **-help**\ - + +\ **-?|-h|-**\ **-help**\ + Display usage message. - -\ **-**\ **-yesreallydeletenodes**\ - + +\ **-**\ **-yesreallydeletenodes**\ + Delete the nodes represented in the cluster config file, instead of creating them. This is useful if your first attempt with the cluster config file wasn't quite right and you want to start over. But use this option with extreme caution, because it will potentially delete a lot of nodes. If the only thing you have done so far in your database is add nodes by running \ **xcatsetup**\ , then it is safe to use this option to start over. If you have made other changes to your database, you should first back it up using dumpxCATdb(1)|dumpxCATdb.1 before using this option. - + @@ -549,45 +549,45 @@ EXAMPLES 1. Use the sample config.txt file at the beginning of this man page to create all the objects/nodes for a 2 building block cluster. - - + + .. code-block:: perl - + xcatsetup config.txt - - + + The output: - - + + .. code-block:: perl - + Defining site attributes... Defining HMCs... Defining frames... Defining CECs... Defining building blocks... Defining LPAR nodes... - - + + 2. Use the simpler config file shown earlier in this man page to create just the frame and cec objects: - - + + .. code-block:: perl - + xcatsetup config-simple.txt - - + + The output: - - + + .. code-block:: perl - + Defining frames... Defining CECs... - - + + From 1d93ef1005687f0e5f5cd957856303972d3143cf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0531/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst --- .../references/man8/xcatsnap.8.rst | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst b/docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst index 330cad684..6474da807 100644 --- a/docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst +++ b/docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **xcatsnap**\ +\ **xcatsnap**\ \ **xcatsnap**\ [\ **-h | -**\ **-help**\ ] @@ -46,28 +46,28 @@ OPTIONS -\ **-h|-**\ **-help**\ - +\ **-h|-**\ **-help**\ + Displays the usage message. - -\ **-v|-**\ **-version**\ - + +\ **-v|-**\ **-version**\ + Displays the release version of the code. - -\ **-B|-**\ **-bypass**\ - + +\ **-B|-**\ **-bypass**\ + Runs in bypass mode, use if the xcatd daemon is hung. - -\ **-d|-**\ **-dir**\ - + +\ **-d|-**\ **-dir**\ + The directory to put the snap information. Default is /tmp/xcatsnap. - + @@ -84,22 +84,22 @@ EXAMPLES 1. Run the xcatsnap routine in bypass mode and put info in /tmp/mydir : - - + + .. code-block:: perl - + xcatsnap -B -d /tmp/mydir - - + + 2. To run the xcatsnap routine and use default directory /tmp/xcatsnap : - - + + .. code-block:: perl - + xcatsnap - - + + From 0d94f9f31b45f27b9509761f0ecd547913fdab65 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0532/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst --- .../guides/admin-guides/references/tools/detect_dhcpd.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst b/docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst index fa33e4a73..dbfa8fb43 100644 --- a/docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst +++ b/docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst @@ -6,12 +6,12 @@ detect_dhcpd Usage: detect_dhcpd -i interface [-m macaddress] [-t timeout] [-V] This command can be used to detect the dhcp server in a network for a specific mac address. - + Options: -i interface: The interface which facing the target network. -m macaddress: The mac that will be used to detect dhcp server. Recommend to use the real mac - of the node that will be netboot. If no specified, the mac of interface which + of the node that will be netboot. If no specified, the mac of interface which specified by -i will be used. -t timeout: The time to wait to detect the dhcp messages. The default value is 10s. - + Author: Wang, Xiao Peng From dbb1600e7c7eaae97b6de643c776fafdff3214af Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0533/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/tools/mac2linklocal.rst --- .../guides/admin-guides/references/tools/mac2linklocal.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/tools/mac2linklocal.rst b/docs/source/guides/admin-guides/references/tools/mac2linklocal.rst index 3bcf2ec6e..94d008419 100644 --- a/docs/source/guides/admin-guides/references/tools/mac2linklocal.rst +++ b/docs/source/guides/admin-guides/references/tools/mac2linklocal.rst @@ -1,9 +1,9 @@ mac2linklocal ============= -:: +:: - Usage: mac2linklocal -m + Usage: mac2linklocal -m Determines the IPv6 link local address that is appropriate for a NIC, based on its MAC. From cf77eae1e1ba38a9e03a1e75c81a64b524e9dfb1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0534/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/tools/mktoolscenter.rst --- .../references/tools/mktoolscenter.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/guides/admin-guides/references/tools/mktoolscenter.rst b/docs/source/guides/admin-guides/references/tools/mktoolscenter.rst index 23b42d978..fa5877c04 100644 --- a/docs/source/guides/admin-guides/references/tools/mktoolscenter.rst +++ b/docs/source/guides/admin-guides/references/tools/mktoolscenter.rst @@ -4,17 +4,17 @@ mktoolscenter :: Usage: mktoolscenter - --ph - --pp - --puser - --ppw - -l + --ph + --pp + --puser + --ppw + -l -s - --nfsserver - --nfspath - --profilename + --nfsserver + --nfspath + --profilename --help - + Updates IBM system x server hardware using IBM Bootable Media Creator. - + Author: Jim Turner From c8fc594e177ef0b578c2d715a9b164e72e612bd8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0535/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/tools/nodesw.rst --- docs/source/guides/admin-guides/references/tools/nodesw.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/admin-guides/references/tools/nodesw.rst b/docs/source/guides/admin-guides/references/tools/nodesw.rst index 3d5bc4dbf..93a88567e 100644 --- a/docs/source/guides/admin-guides/references/tools/nodesw.rst +++ b/docs/source/guides/admin-guides/references/tools/nodesw.rst @@ -6,7 +6,7 @@ nodesw nodesw changes the vlan of a node to a specified vlan requires xCAT 2.0, Switch configured with SNMP sets, and only tested on SMC8648T nodesw -h|--help - nodesw [-v] vlan + nodesw [-v] vlan nodesw [-v] show Author: Vallard Benincosa From 2084805453949c20653a2214057db242715d8477 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0536/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/tools/reorgtbls.rst --- .../source/guides/admin-guides/references/tools/reorgtbls.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/tools/reorgtbls.rst b/docs/source/guides/admin-guides/references/tools/reorgtbls.rst index a544a13e9..5f1863ebd 100644 --- a/docs/source/guides/admin-guides/references/tools/reorgtbls.rst +++ b/docs/source/guides/admin-guides/references/tools/reorgtbls.rst @@ -4,11 +4,11 @@ reorgtbls :: DB2 Table Reorganization utility. - This script can be set as a cron job or run on the command line to reorg the xcatdb DB2 database tables. It automatically added as a cron job, if you use the db2sqlsetup command to create your DB2 database setup for xCAT. + This script can be set as a cron job or run on the command line to reorg the xcatdb DB2 database tables. It automatically added as a cron job, if you use the db2sqlsetup command to create your DB2 database setup for xCAT. Usage: --V - Verbose mode --h - usage --t -comma delimited list of tables. Without this flag it reorgs all tables in the xcatdb database . - + Author: Lissa Valletta From b8a96c0f9555af960192cb65d9803be1085c16da Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0537/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/tools/rmblade.rst --- .../source/guides/admin-guides/references/tools/rmblade.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/guides/admin-guides/references/tools/rmblade.rst b/docs/source/guides/admin-guides/references/tools/rmblade.rst index 150883fb2..776a15a99 100644 --- a/docs/source/guides/admin-guides/references/tools/rmblade.rst +++ b/docs/source/guides/admin-guides/references/tools/rmblade.rst @@ -8,11 +8,11 @@ rmblade Response to SNMP for monsetting to remove blade from xCAT when trap is recieved. Pipe the MM IP address and blade slot number into this cmd. - Example: + Example: 1. user removes a blade from the chassis 2. snmp trap setup to point here 3. this script removes the blade configuration from xCAT - 4. so if blade is placed in new slot or back in then xCAT goes + 4. so if blade is placed in new slot or back in then xCAT goes through rediscover process again. - + Author: Jarrod Johnson From 300534ef0ec5e71008c0774ffbb20b1b9b088fad Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0538/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/tools/rmnodecfg.rst --- .../source/guides/admin-guides/references/tools/rmnodecfg.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/tools/rmnodecfg.rst b/docs/source/guides/admin-guides/references/tools/rmnodecfg.rst index c571f185f..545e2b0b4 100644 --- a/docs/source/guides/admin-guides/references/tools/rmnodecfg.rst +++ b/docs/source/guides/admin-guides/references/tools/rmnodecfg.rst @@ -3,9 +3,9 @@ rmnodecfg :: - Usage: rmnodecfg [-h|--help] + Usage: rmnodecfg [-h|--help] - Removes the configuration of a node so that the next time you reboot + Removes the configuration of a node so that the next time you reboot it, it forces it to go through the discovery process. This does not remove it completely from xCAT. You may want to do this command before running noderm to completely purge the system of the node From 54906df18b4173c992a8f68bcc84447b29121f4b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0539/1681] Remove trailing spaces in file docs/source/guides/admin-guides/references/tools/test_hca_state.rst --- .../references/tools/test_hca_state.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/source/guides/admin-guides/references/tools/test_hca_state.rst b/docs/source/guides/admin-guides/references/tools/test_hca_state.rst index abe5e6781..89a14c08d 100644 --- a/docs/source/guides/admin-guides/references/tools/test_hca_state.rst +++ b/docs/source/guides/admin-guides/references/tools/test_hca_state.rst @@ -17,12 +17,12 @@ test_hca_state is passed to "egrep" and can be a simple string or a regular expression. - Purpose: - + Purpose: + This tool provides a quick and easily repeatable method of validating key InfiniBand adapter (HCA) and node based InfiniBand - settings across an entire cluster. - + settings across an entire cluster. + Having consistent OFED settings, and even HCA firmware, can be very important for a properly functioning InfiniBand fabric. This tool can help you confirm that your nodes are using the settings you @@ -55,7 +55,7 @@ test_hca_state rate: 10 Gb/sec (4X) symbol_error: 0 port_rcv_errors: 0 - + IPoIB recv_queue_size: 8192 send_queue_size: 8192 @@ -67,14 +67,14 @@ test_hca_state Mode: datagram MTU: 4092 Mode: up - - + + # # This example uses a FILTER on the word 'firmware'. In this case, we've - # upgraded the firmware across rack11 and rack12. + # upgraded the firmware across rack11 and rack12. # # - On rack11, we've also restarted the IB stack (/etc/init.d/openibd - # restart) to activate the new firmware. + # restart) to activate the new firmware. # # - Rack 12 has also been updated, as we can see from the 'Firmware # installed' line, but it's nodes are still running with their prior @@ -86,12 +86,12 @@ test_hca_state ==================================== Firmware installed: 2.30.3200 Firmware active: 2.30.3200 - + ==================================== rack12 ==================================== Firmware installed: 2.30.3200 Firmware active: 2.11.1260 - - + + Author: Brian Finley From 299ab9127409c65f7321b7f391127aaeb6c3515d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0540/1681] Remove trailing spaces in file docs/source/guides/install-guides/apt/automatic_install.rst --- docs/source/guides/install-guides/apt/automatic_install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/apt/automatic_install.rst b/docs/source/guides/install-guides/apt/automatic_install.rst index 84dd06fd8..dc926cb7f 100644 --- a/docs/source/guides/install-guides/apt/automatic_install.rst +++ b/docs/source/guides/install-guides/apt/automatic_install.rst @@ -3,4 +3,4 @@ Automatic Install Using ``go-xcat`` .. include:: ../common_sections.rst :start-after: BEGIN_automatic_install - :end-before: END_automatic_install + :end-before: END_automatic_install From 91fd00b3819a7589522f54671fde92ec7fe7fda4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0541/1681] Remove trailing spaces in file docs/source/guides/install-guides/apt/configure_xcat.rst --- docs/source/guides/install-guides/apt/configure_xcat.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/apt/configure_xcat.rst b/docs/source/guides/install-guides/apt/configure_xcat.rst index 8098b4068..45eff55ec 100644 --- a/docs/source/guides/install-guides/apt/configure_xcat.rst +++ b/docs/source/guides/install-guides/apt/configure_xcat.rst @@ -8,7 +8,7 @@ Internet Repository **[xcat-core]** -From the xCAT download page, find the build you want to install and add to ``/etc/apt/sources.list``. +From the xCAT download page, find the build you want to install and add to ``/etc/apt/sources.list``. To configure the xCAT development build, add the following line to ``/etc/apt/sources.list``: :: From a1ded245df318a242bc8333c7d32af55561e478b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0542/1681] Remove trailing spaces in file docs/source/guides/install-guides/apt/manual_install.rst --- docs/source/guides/install-guides/apt/manual_install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/apt/manual_install.rst b/docs/source/guides/install-guides/apt/manual_install.rst index 0f048e5f0..956f5650c 100644 --- a/docs/source/guides/install-guides/apt/manual_install.rst +++ b/docs/source/guides/install-guides/apt/manual_install.rst @@ -3,7 +3,7 @@ Manual Install Using Software Repositories .. include:: ../common_sections.rst :start-after: BEGIN_install_xcat_introduction - :end-before: END_install_xcat_introduction + :end-before: END_install_xcat_introduction xCAT is installed by configuring software repositories for ``xcat-core`` and ``xcat-dep`` and using yum package manager. The repositories can be publicly hosted or locally hosted. From e0daa6708d71b831d25e6d3fe927b09c98fd01d1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0543/1681] Remove trailing spaces in file docs/source/guides/install-guides/apt/prepare_mgmt_node.rst --- .../guides/install-guides/apt/prepare_mgmt_node.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst index c6e4115be..97ccac2ec 100644 --- a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst @@ -45,10 +45,10 @@ By setting properties on the Management Node before installing the xCAT software #. To set the hostname of *xcatmn.cluster.com*: :: - hostname xcatmn.cluster.com + hostname xcatmn.cluster.com + + #. Add the hostname to the ``/etc/hostname`` and ``/etc/hosts`` to persist the hostname on reboot. - #. Add the hostname to the ``/etc/hostname`` and ``/etc/hosts`` to persist the hostname on reboot. - #. Reboot or run ``service hostname restart`` to allow the hostname to take effect and verify the hostname command returns correctly: * ``hostname`` @@ -56,4 +56,4 @@ By setting properties on the Management Node before installing the xCAT software #. Reduce the risk of the Management Node IP address being lost by setting the interface IP to **STATIC** in the ``/etc/network/interfaces`` configuration file. -#. Configure any domain search strings and nameservers using the ``resolvconf`` command. +#. Configure any domain search strings and nameservers using the ``resolvconf`` command. From eacaefbdcfdb48d713d2d743070a5b49c642b3c7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0544/1681] Remove trailing spaces in file docs/source/guides/install-guides/apt/verify_xcat.rst --- docs/source/guides/install-guides/apt/verify_xcat.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/apt/verify_xcat.rst b/docs/source/guides/install-guides/apt/verify_xcat.rst index d2d09c535..fcecd973d 100644 --- a/docs/source/guides/install-guides/apt/verify_xcat.rst +++ b/docs/source/guides/install-guides/apt/verify_xcat.rst @@ -3,4 +3,4 @@ Verify xCAT Installation .. include:: ../common_sections.rst :start-after: BEGIN_verifying_xcat - :end-before: END_verifying_xcat + :end-before: END_verifying_xcat From 8a9ebeb077f22db418f0285ff59ff9c22be97bf2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0545/1681] Remove trailing spaces in file docs/source/guides/install-guides/common_sections.rst --- .../guides/install-guides/common_sections.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/install-guides/common_sections.rst b/docs/source/guides/install-guides/common_sections.rst index 203b6cea9..f803deea1 100644 --- a/docs/source/guides/install-guides/common_sections.rst +++ b/docs/source/guides/install-guides/common_sections.rst @@ -1,7 +1,7 @@ .. BEGIN_see_release_notes -For the current list of operating systems supported and verified by the development team for the different releases of xCAT, see the :doc:`xCAT2 Release Notes `. +For the current list of operating systems supported and verified by the development team for the different releases of xCAT, see the :doc:`xCAT2 Release Notes `. **Disclaimer** These instructions are intended to only be guidelines and specific details may differ slightly based on the operating system version. Always refer to the operating system documentation for the latest recommended procedures. @@ -33,7 +33,7 @@ The system requirements for your xCAT management node largely depend on the size xCAT consists of two software packages: ``xcat-core`` and ``xcat-dep`` -#. **xcat-core** xCAT's main software package and is provided in one of the following options: +#. **xcat-core** xCAT's main software package and is provided in one of the following options: * **Latest Release (Stable) Builds** @@ -50,7 +50,7 @@ xCAT consists of two software packages: ``xcat-core`` and ``xcat-dep`` #. **xcat-dep** xCAT's dependency package. This package is provided as a convenience for the user and contains dependency packages required by xCAT that are not provided by the operating system. -.. END_install_xcat_introduction +.. END_install_xcat_introduction .. BEGIN_installation_methods @@ -68,7 +68,7 @@ The following sections describe the different methods for installing xCAT. chmod +x /tmp/go-xcat #. Run the ``go-xcat`` tool: :: - + /tmp/go-xcat install # installs the latest stable version of xCAT /tmp/go-xcat -x devel install # installs the latest development version of xCAT @@ -126,7 +126,7 @@ The following sections describe the different methods for installing xCAT. **[xcat-dep]** -Unless you are downloading ``xcat-dep`` to match a specific package tested with a GA release, it's recommended to download the latest version of xcat-dep. +Unless you are downloading ``xcat-dep`` to match a specific package tested with a GA release, it's recommended to download the latest version of xcat-dep. #. Download xcat-dep: :: @@ -153,7 +153,7 @@ Unless you are downloading ``xcat-dep`` to match a specific package tested with **[xcat-dep]** -Unless you are downloading ``xcat-dep`` to match a specific package tested with a GA release, it's recommended to download the latest version of xcat-dep. +Unless you are downloading ``xcat-dep`` to match a specific package tested with a GA release, it's recommended to download the latest version of xcat-dep. #. Download xcat-dep: :: @@ -205,7 +205,7 @@ Quick verification of the xCAT Install can be done running the following steps: Starting and Stopping --------------------- -xCAT is started automatically after the installation, but the following commands can be used to start, stop, restart, and check xCAT status. +xCAT is started automatically after the installation, but the following commands can be used to start, stop, restart, and check xCAT status. * start xCAT: :: @@ -228,5 +228,5 @@ xCAT is started automatically after the installation, but the following commands [systemd] systemctl status xcatd.service -.. END_verifying_xcat +.. END_verifying_xcat From 3eab245db8055c10d1e635e91dc2fc559bf4eccd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0546/1681] Remove trailing spaces in file docs/source/guides/install-guides/index.rst --- docs/source/guides/install-guides/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/index.rst b/docs/source/guides/install-guides/index.rst index 09a92b510..af31e607d 100644 --- a/docs/source/guides/install-guides/index.rst +++ b/docs/source/guides/install-guides/index.rst @@ -9,4 +9,4 @@ Install Guides yum/index.rst zypper/index.rst apt/index.rst - maintenance/index.rst + maintenance/index.rst From 3c059c899daca46f57dee233a88261a290828701 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0547/1681] Remove trailing spaces in file docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst --- .../guides/install-guides/maintenance/backup_restore_xcat.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst b/docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst index 47af4ffe9..43831f11a 100644 --- a/docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst +++ b/docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst @@ -12,7 +12,7 @@ If need to backup xcat database, you can use :doc:`dumpxCATdb ` command like below. :: - xcatsnap -B -d + xcatsnap -B -d Restore User Data From 1c3f83651539769205a580b00a1c8fad22431f80 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0548/1681] Remove trailing spaces in file docs/source/guides/install-guides/maintenance/uninstall_xcat.rst --- .../maintenance/uninstall_xcat.rst | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/guides/install-guides/maintenance/uninstall_xcat.rst b/docs/source/guides/install-guides/maintenance/uninstall_xcat.rst index be28e918a..c3e84774b 100644 --- a/docs/source/guides/install-guides/maintenance/uninstall_xcat.rst +++ b/docs/source/guides/install-guides/maintenance/uninstall_xcat.rst @@ -18,7 +18,7 @@ Clean Up xCAT Related Configuration Keeping xCAT nodes information in ``/etc/hosts`` is harmless, but if you really want to remove them from ``/etc/hosts`` run: :: - makehosts -d all + makehosts -d all 4. To clean up the node information from DNS (optional) @@ -49,14 +49,14 @@ Remove xCAT Files 1. Remove the xCAT RPMs There is no easy way to identify all xCAT packages. For packages shipped by xCAT, you can remove them by using the commands below. - + [RHEL and SLES] :: yum remove '*xcat*' yum remove '*xCAT*' - [Ubuntu] :: - + [Ubuntu] :: + dpkg -l | awk '/xcat/ { print $2 }' To do an even more thorough cleanup, use links below to get a list of RPMs installed by xCAT. Some RPMs may not to be installed in a specific environment. @@ -64,32 +64,32 @@ Remove xCAT Files * XCAT Core Packages List (xcat-core) [RHEL and SLES] :: - + http://xcat.org/files/xcat/repos/yum//xcat-core/ [Ubuntu] :: - + http://xcat.org/files/xcat/repos/apt//xcat-core/pool/main - - * XCAT Dependency Packages (xcat-dep) + + * XCAT Dependency Packages (xcat-dep) [RHEL and SLES] :: - + http://xcat.org/files/xcat/repos/yum/xcat-dep// [Ubuntu] :: - + http://xcat.org/files/xcat/repos/apt/xcat-dep/pool/main - When ``yum install xCAT`` is used to install xCAT, dependency RPMs provided by the Operating System will be installed. Keeping those rpms installed on the system is harmless. + When ``yum install xCAT`` is used to install xCAT, dependency RPMs provided by the Operating System will be installed. Keeping those rpms installed on the system is harmless. 2. Remove xCAT certificate file :: rm -rf /root/.xcat -3. Remove xCAT data files +3. Remove xCAT data files By default, xCAT uses SQLite, remove SQLite data files under ``/etc/xcat/``. :: @@ -108,7 +108,7 @@ Remove xCAT Files /etc/rsyslogd.d/xCAT-* /var/log/xcat /opt/xcat/ - /mnt/xcat + /mnt/xcat Remove Databases ---------------- From 2a325f4ee922f8ebe131ccac949401bb9c351396 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0549/1681] Remove trailing spaces in file docs/source/guides/install-guides/yum/automatic_install.rst --- docs/source/guides/install-guides/yum/automatic_install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/yum/automatic_install.rst b/docs/source/guides/install-guides/yum/automatic_install.rst index 84dd06fd8..dc926cb7f 100644 --- a/docs/source/guides/install-guides/yum/automatic_install.rst +++ b/docs/source/guides/install-guides/yum/automatic_install.rst @@ -3,4 +3,4 @@ Automatic Install Using ``go-xcat`` .. include:: ../common_sections.rst :start-after: BEGIN_automatic_install - :end-before: END_automatic_install + :end-before: END_automatic_install From d89949ce4fd532be2a48c9b3f832ac33071f679c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0550/1681] Remove trailing spaces in file docs/source/guides/install-guides/yum/manual_install.rst --- docs/source/guides/install-guides/yum/manual_install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/yum/manual_install.rst b/docs/source/guides/install-guides/yum/manual_install.rst index 0f048e5f0..956f5650c 100644 --- a/docs/source/guides/install-guides/yum/manual_install.rst +++ b/docs/source/guides/install-guides/yum/manual_install.rst @@ -3,7 +3,7 @@ Manual Install Using Software Repositories .. include:: ../common_sections.rst :start-after: BEGIN_install_xcat_introduction - :end-before: END_install_xcat_introduction + :end-before: END_install_xcat_introduction xCAT is installed by configuring software repositories for ``xcat-core`` and ``xcat-dep`` and using yum package manager. The repositories can be publicly hosted or locally hosted. From 4372daa44d9a5e88a78d0deed842b2ac01eeafa2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0551/1681] Remove trailing spaces in file docs/source/guides/install-guides/yum/prepare_mgmt_node.rst --- .../guides/install-guides/yum/prepare_mgmt_node.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst b/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst index 7dbc7d0d7..7e266eb46 100644 --- a/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst @@ -15,9 +15,9 @@ Configure the Base OS Repository xCAT uses the yum package manager on RHEL Linux distributions to install and resolve dependency packages provided by the base operating system. Follow this section to create the repository for the base operating system on the Management Node -#. Copy the DVD iso file to ``/tmp`` on the Management Node. +#. Copy the DVD iso file to ``/tmp`` on the Management Node. This example will use file ``RHEL-LE-7.1-20150219.1-Server-ppc64le-dvd1.iso`` - + #. Mount the iso to ``/mnt/iso/rhels7.1`` on the Management Node. :: mkdir -p /mnt/iso/rhels7.1 @@ -41,12 +41,12 @@ By setting properties on the Management Node before installing the xCAT software #. To set the hostname of *xcatmn.cluster.com*: :: - hostname xcatmn.cluster.com + hostname xcatmn.cluster.com #. Add the hostname to the ``/etc/sysconfig/network`` in order to persist the hostname on reboot. - - #. Reboot the server and verify the hostname by running the following commands: + + #. Reboot the server and verify the hostname by running the following commands: * ``hostname`` * ``hostname -d`` - should display the domain From d080ec7e050b086127e5bef8ac4d53571b9f71fe Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0552/1681] Remove trailing spaces in file docs/source/guides/install-guides/yum/verify_xcat.rst --- docs/source/guides/install-guides/yum/verify_xcat.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/yum/verify_xcat.rst b/docs/source/guides/install-guides/yum/verify_xcat.rst index d2d09c535..fcecd973d 100644 --- a/docs/source/guides/install-guides/yum/verify_xcat.rst +++ b/docs/source/guides/install-guides/yum/verify_xcat.rst @@ -3,4 +3,4 @@ Verify xCAT Installation .. include:: ../common_sections.rst :start-after: BEGIN_verifying_xcat - :end-before: END_verifying_xcat + :end-before: END_verifying_xcat From 8caa67cabc19c02a7f0b330344ce1ee9661498ff Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0553/1681] Remove trailing spaces in file docs/source/guides/install-guides/zypper/automatic_install.rst --- docs/source/guides/install-guides/zypper/automatic_install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/zypper/automatic_install.rst b/docs/source/guides/install-guides/zypper/automatic_install.rst index 84dd06fd8..dc926cb7f 100644 --- a/docs/source/guides/install-guides/zypper/automatic_install.rst +++ b/docs/source/guides/install-guides/zypper/automatic_install.rst @@ -3,4 +3,4 @@ Automatic Install Using ``go-xcat`` .. include:: ../common_sections.rst :start-after: BEGIN_automatic_install - :end-before: END_automatic_install + :end-before: END_automatic_install From e48c20cece4c7f4cd5f567463c0c9b4e66b4e5c1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0554/1681] Remove trailing spaces in file docs/source/guides/install-guides/zypper/index.rst --- docs/source/guides/install-guides/zypper/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/zypper/index.rst b/docs/source/guides/install-guides/zypper/index.rst index 253711f78..d19a52a73 100644 --- a/docs/source/guides/install-guides/zypper/index.rst +++ b/docs/source/guides/install-guides/zypper/index.rst @@ -11,4 +11,4 @@ Installation Guide for SUSE Linux Enterprise Server :maxdepth: 2 prepare_mgmt_node.rst - install.rst + install.rst From 888c32e8f1286c72191f4481c9e28efcb1da1209 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0555/1681] Remove trailing spaces in file docs/source/guides/install-guides/zypper/manual_install.rst --- docs/source/guides/install-guides/zypper/manual_install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/zypper/manual_install.rst b/docs/source/guides/install-guides/zypper/manual_install.rst index 0f048e5f0..956f5650c 100644 --- a/docs/source/guides/install-guides/zypper/manual_install.rst +++ b/docs/source/guides/install-guides/zypper/manual_install.rst @@ -3,7 +3,7 @@ Manual Install Using Software Repositories .. include:: ../common_sections.rst :start-after: BEGIN_install_xcat_introduction - :end-before: END_install_xcat_introduction + :end-before: END_install_xcat_introduction xCAT is installed by configuring software repositories for ``xcat-core`` and ``xcat-dep`` and using yum package manager. The repositories can be publicly hosted or locally hosted. From 7e9a01f7cb4d7c92361eccbee24b11bb99070df7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0556/1681] Remove trailing spaces in file docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst --- .../guides/install-guides/zypper/prepare_mgmt_node.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst b/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst index fd52e4387..1c2323748 100644 --- a/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst +++ b/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst @@ -20,7 +20,7 @@ xCAT uses the zypper package manager on SLES Linux distributions to install and #. Copy the DVD iso file to ``/tmp`` on the Management Node: :: # This example will use SLE-12-Server-DVD-ppc64le-GM-DVD1.iso - + #. Mount the iso to ``/mnt/iso/sles12`` on the Management Node. :: mkdir -p /mnt/iso/sles12 @@ -44,12 +44,12 @@ By setting properties on the Management Node before installing the xCAT software #. To set the hostname of *xcatmn.cluster.com*: :: - hostname xcatmn.cluster.com + hostname xcatmn.cluster.com #. Add the hostname to the ``/etc/hostname`` in order to persist the hostname on reboot. - - #. Reboot the server and verify the hostname by running the following commands: + + #. Reboot the server and verify the hostname by running the following commands: * ``hostname`` * ``hostname -d`` - should display the domain From dcb5cf5382e171fc879a5fbc3b51d2d7af8c4597 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0557/1681] Remove trailing spaces in file docs/source/guides/install-guides/zypper/verify_xcat.rst --- docs/source/guides/install-guides/zypper/verify_xcat.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/guides/install-guides/zypper/verify_xcat.rst b/docs/source/guides/install-guides/zypper/verify_xcat.rst index d2d09c535..fcecd973d 100644 --- a/docs/source/guides/install-guides/zypper/verify_xcat.rst +++ b/docs/source/guides/install-guides/zypper/verify_xcat.rst @@ -3,4 +3,4 @@ Verify xCAT Installation .. include:: ../common_sections.rst :start-after: BEGIN_verifying_xcat - :end-before: END_verifying_xcat + :end-before: END_verifying_xcat From efae7b1640e704b5c34d737af7b3c4db51e06030 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0558/1681] Remove trailing spaces in file docs/source/help.rst --- docs/source/help.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/help.rst b/docs/source/help.rst index 15e0dde1e..e9f65642f 100644 --- a/docs/source/help.rst +++ b/docs/source/help.rst @@ -3,10 +3,10 @@ Need Help xCAT is now on `GitHub! `_ -For support, we encourage the use of the GitHub issues system. +For support, we encourage the use of the GitHub issues system. * `xcat-core `_ * `confluent `_ - * `documentation `_ issues can be opened against xcat-core project + * `documentation `_ issues can be opened against xcat-core project The older email list is still available: xcat-user@list.sourceforge.net From 3c920a818f545182ec6fd94ebb6bd058ed57673a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0559/1681] Remove trailing spaces in file docs/source/index.rst --- docs/source/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 32ec86a95..f971139ad 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -17,8 +17,8 @@ renderfarms, online gaming infrastructure, and whatever tomorrows next buzzword You've reached xCAT documentation site, The main page product page is http://xcat.org -**xCAT** is an open source project hosted on `GitHub `_. -Go to GitHub to view the source, open issues, ask questions, and participate in the project. +**xCAT** is an open source project hosted on `GitHub `_. +Go to GitHub to view the source, open issues, ask questions, and participate in the project. Enjoy! From 07f074842e0ef3959a14699ddce0a57db3574fac Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0560/1681] Remove trailing spaces in file docs/source/overview/architecture.rst --- docs/source/overview/architecture.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/overview/architecture.rst b/docs/source/overview/architecture.rst index 07004e672..c794023ee 100644 --- a/docs/source/overview/architecture.rst +++ b/docs/source/overview/architecture.rst @@ -18,10 +18,10 @@ Network Services (dhcp, tftp, http,etc): The various network services necessary to perform Operating System deployment over the network. xCAT will bring up and configure the network services automatically without any intervention from the System Administrator. Service Processor (SP): - A module embedded in the hardware server used to perform the out-of-band hardware control. (e.g. Integrated Management Module (IMM), Flexible Service Processor (FSP), Baseboard Management Controller (BMC), etc) + A module embedded in the hardware server used to perform the out-of-band hardware control. (e.g. Integrated Management Module (IMM), Flexible Service Processor (FSP), Baseboard Management Controller (BMC), etc) Management network: - The network used by the Management Node (or Service Node) to install operating systems and manage the nodes. The Management Node and in-band Network Interface Card (NIC) of the nodes are connected to this network. If you have a large cluster utilizing Service Nodes, sometimes this network is segregated into separate VLANs for each Service Node. + The network used by the Management Node (or Service Node) to install operating systems and manage the nodes. The Management Node and in-band Network Interface Card (NIC) of the nodes are connected to this network. If you have a large cluster utilizing Service Nodes, sometimes this network is segregated into separate VLANs for each Service Node. Service network: The network used by the Management Node (or Service Node) to control the nodes using out-of-band management using the Service Processor. If the Service Processor is configured in shared mode (meaning the NIC of the Service process is used for the SP and the host), then this network can be combined with the management network. From fd715e0343e7d4690aa95f8e9dd95fc09ed7896b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0561/1681] Remove trailing spaces in file docs/source/overview/differentiators.rst --- docs/source/overview/differentiators.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/overview/differentiators.rst b/docs/source/overview/differentiators.rst index eb015c76b..10b27dcc9 100644 --- a/docs/source/overview/differentiators.rst +++ b/docs/source/overview/differentiators.rst @@ -28,7 +28,7 @@ Differentiators * Built in Automatic discovery - No need to power on one machine at a time for discovery. Nodes that fail can be replaced and back in action simply by powering the new one on. + No need to power on one machine at a time for discovery. Nodes that fail can be replaced and back in action simply by powering the new one on. * RestFUL API From 65184f961ce2219267625fce8459f4a6833274ff Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0562/1681] Remove trailing spaces in file docs/source/overview/features.rst --- docs/source/overview/features.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/overview/features.rst b/docs/source/overview/features.rst index 176d6b82a..d29c0d3d0 100644 --- a/docs/source/overview/features.rst +++ b/docs/source/overview/features.rst @@ -3,7 +3,7 @@ Features #. Discover the hardware servers - * Manually define + * Manually define * MTMS-based discovery * Switch-based discovery * Sequential-based discovery From a8afaff0d32e2718803def415d0d8c2488c1b71d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0563/1681] Remove trailing spaces in file docs/source/overview/xcat2_release.rst --- docs/source/overview/xcat2_release.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/overview/xcat2_release.rst b/docs/source/overview/xcat2_release.rst index f16994b55..dc55d75e0 100644 --- a/docs/source/overview/xcat2_release.rst +++ b/docs/source/overview/xcat2_release.rst @@ -1,7 +1,7 @@ xCAT2 Release Information ========================= -The following table is a summary of the new operating system (OS), hardware, and features that are added to each xCAT release. The OS and hardware listed in the table have been fully tested with xCAT. For a more detailed list of new function, bug fixes, restrictions and known problems, refer to the individual release notes for a specific release. +The following table is a summary of the new operating system (OS), hardware, and features that are added to each xCAT release. The OS and hardware listed in the table have been fully tested with xCAT. For a more detailed list of new function, bug fixes, restrictions and known problems, refer to the individual release notes for a specific release. * **RHEL** - Red Hat Enterprise Linux * **SLES** - Suse Linux Enterprise Server @@ -115,14 +115,14 @@ xCAT 2.13.x | /XCAT_2.13.6_Release_Notes>`_ | | | /delete/check | | | | | | | | | | rspconfig retrieve OpenBMC ip/ | -| | | | netmask/gateway information | +| | | | netmask/gateway information | | | | |- nodeset performance enhancement | | | | | (Phase 3) | | | | | | | | | | Dispatch request to the | -| | | | specified service nodes with | +| | | | specified service nodes with | | | | | 'disjointdhcps' | -| | | | | +| | | | | | | | | Enhance the output of nodeset | | | | | in hierarchical cluster | | | | | | @@ -155,7 +155,7 @@ xCAT 2.13.x | | | | tool xcat-test | | | | |- Service node pool support for | | | | | rhels7 ppc64le diskless | -| | | |- Mellanox cumulus switch ZTP | +| | | |- Mellanox cumulus switch ZTP | | | | | based discovery and | | | | | auto-configuration | | | | |- Performance enhancements | @@ -362,9 +362,9 @@ xCAT 2.9.x | | | | | +---------------------------------+---------------+-------------+----------------------------------+ -.. [#] xCAT 2.9.1 onwards provides support for Kernel-based Virtual Machines (KVM) and requires an operating system that ships the ``perl-Sys-Virt`` package. +.. [#] xCAT 2.9.1 onwards provides support for Kernel-based Virtual Machines (KVM) and requires an operating system that ships the ``perl-Sys-Virt`` package. -xCAT 2.8.x +xCAT 2.8.x ---------- +---------------------------------+---------------+-------------+----------------------------------+ From 2430bf09cf1726f6ce70cb372a106ae69c2ea26b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0564/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst --- .../references/coral/cluster_mgmt/firmware/ipmi.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst b/docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst index 354326e82..f40e5a58d 100644 --- a/docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst +++ b/docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst @@ -7,11 +7,11 @@ The process for updating firmware on the IBM Power9 Server (Boston) is documente Collect the required files -------------------------- -Collect the following files and put them into a directory on the Management Node. +Collect the following files and put them into a directory on the Management Node. * pUpdate utility * .pnor for host - * .bin for bmc + * .bin for bmc If running ``rflash`` in Hierarchy, the firmware files/directory must be accessible on the Service Nodes. @@ -20,14 +20,14 @@ Flash Firmware Using xCAT ``rflash`` command, specify the directory containing the files with the ``-d`` option. :: - rflash -d /path-to-directory/ + rflash -d /path-to-directory/ -The ``pUpdate`` utility is leveraged in doing the firmware update against the target node and will do the following: +The ``pUpdate`` utility is leveraged in doing the firmware update against the target node and will do the following: * power off the host * flash bmc and reboot * flash host - * power on the host + * power on the host Monitor the progress for the nodes by looking at the files under ``/var/log/xcat/rflash/``. From ccee750a2d52ea00b5263e5df2d9f8fa8f5d83c6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0565/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst --- .../references/coral/cluster_mgmt/firmware/openbmc/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst index 4f841ef1a..e28dd0cef 100644 --- a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst +++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst @@ -1,7 +1,7 @@ OpenBMC Firmware Update ======================= -.. toctree:: +.. toctree:: :maxdepth: 2 unattended.rst From 612bebb4d325d6c1ae3640b1f178bb1f36ad9648 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0566/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst --- .../coral/cluster_mgmt/firmware/openbmc/manually.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst index 1f3c88160..56bd50a76 100644 --- a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst +++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst @@ -1,10 +1,10 @@ Manual Firmware Flash ===================== -.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst +.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst :start-after: BEGIN_flashing_OpenBMC_Servers :end-before: END_flashing_OpenBMC_Servers -.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst +.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst :start-after: BEGIN_Validation_OpenBMC_firmware :end-before: END_Validation_OpenBMC_firmware From 86bfc2a4ace9d9fc755a066da2b81ecdac3747aa Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0567/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst --- .../coral/cluster_mgmt/firmware/openbmc/unattended.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst index 21e8d9915..c391ae4ca 100644 --- a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst +++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst @@ -1,10 +1,10 @@ Unattended Firmware Flash ========================= -.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst +.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst :start-after: BEGIN_unattended_OpenBMC_flashing :end-before: END_unattended_OpenBMC_flashing -.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst +.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst :start-after: BEGIN_Validation_OpenBMC_firmware :end-before: END_Validation_OpenBMC_firmware From 9a9a054d0ec07f20ecd3842161b08747af6cf1a1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0568/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/scalability/python/index.rst --- .../references/coral/cluster_mgmt/scalability/python/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst index 97c275cc5..c1a05e403 100644 --- a/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst @@ -1,7 +1,7 @@ Python framework ================ -When testing the scale up of xCAT commands against OpenBMC REST API, it was evident that the Perl framework of xCAT did not scale well and was not sending commands to the BMCs in a true parallel fashion. +When testing the scale up of xCAT commands against OpenBMC REST API, it was evident that the Perl framework of xCAT did not scale well and was not sending commands to the BMCs in a true parallel fashion. The team investigated the possibility of using Python framework. This support is implemented using Python 2.x framework. From 9d1a7d7dd6e1359df18d3142fc0f175aaa5e0235 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0569/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst --- .../coral/cluster_mgmt/scalability/python/install/disable.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst index 40c54c64b..e55a63f5a 100644 --- a/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst @@ -1,7 +1,7 @@ Disable Python Framework ======================== -By default, if ``xCAT-openbmc-py`` is installed and Python files are there, xCAT will default to running the Python framework. +By default, if ``xCAT-openbmc-py`` is installed and Python files are there, xCAT will default to running the Python framework. A site table attribute is created to allow the ability to control between Python and Perl. From 36aec13c3ee40506ac00d18503341fe9d0971ed6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0570/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst --- .../coral/cluster_mgmt/scalability/python/install/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst index 70c74418e..8e8490f6e 100644 --- a/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst @@ -1,7 +1,7 @@ Installation ============ -A new RPM is created that contains the Python code: ``xCAT-openbmc-py``. The Python code requires additonal Python libraries that may not be available as an operating system provided package. The following will help resolve the dependencies. +A new RPM is created that contains the Python code: ``xCAT-openbmc-py``. The Python code requires additonal Python libraries that may not be available as an operating system provided package. The following will help resolve the dependencies. .. toctree:: From ddd80db91222233e755060b475d8484fd4ab2849 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0571/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst --- .../scalability/python/install/rpm.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst index 32efaaa19..52d1a59e9 100644 --- a/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst @@ -1,9 +1,9 @@ -Using RPM (recommended) +Using RPM (recommended) ======================= **Support is only for RHEL 7.5 for Power LE (Power 9)** -The following repositories should be configured on your Management Node (and Service Nodes). +The following repositories should be configured on your Management Node (and Service Nodes). * RHEL 7.5 OS Repository * RHEL 7.5 Extras Repository @@ -12,13 +12,13 @@ The following repositories should be configured on your Management Node (and Ser #. Configure the MN/SN to the RHEL 7.5 OS Repo -#. Configure the MN/SN to the RHEL 7.5 Extras Repo +#. Configure the MN/SN to the RHEL 7.5 Extras Repo #. Configure the MN/SN to the EPEL Repo (https://fedoraproject.org/wiki/EPEL) -#. Create a local Fedora28 Repo and Configure the MN/SN to the FC28 Repo +#. Create a local Fedora28 Repo and Configure the MN/SN to the FC28 Repo - Here's an example to configure the Fedora 28 repo at ``/install/repos/fc28`` + Here's an example to configure the Fedora 28 repo at ``/install/repos/fc28`` #. Make the target repo directory on the MN: :: @@ -27,13 +27,13 @@ The following repositories should be configured on your Management Node (and Ser #. Download the rpms from the Internet: :: cd /install/repos/fc28/ppc64le/Packages - wget https://www.rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/p/python2-gevent-1.2.2-2.fc28.ppc64le.rpm + wget https://www.rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/p/python2-gevent-1.2.2-2.fc28.ppc64le.rpm wget https://www.rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/p/python2-greenlet-0.4.13-2.fc28.ppc64le.rpm #. Create a yum repo in that directory: :: cd /install/repos/fc28/ppc64le/ - createrepo . + createrepo . #. Install ``xCAT-openbmc-py`` using ``yum``: :: From f039cc0aaa099ef9e4f18939c9953a59e73224e2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0572/1681] Remove trailing spaces in file docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst --- .../coral/cluster_mgmt/scalability/python/performance.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst index 35a01be28..af082e80f 100644 --- a/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst @@ -30,9 +30,9 @@ The following commands are currently supported: Data ---- -The following graph shows performance gains in the Python code implementation of ``mgt=openbmc`` when compared to the Perl implementation. +The following graph shows performance gains in the Python code implementation of ``mgt=openbmc`` when compared to the Perl implementation. -rpower state +rpower state ```````````````````````` This chart gathers data points on a single 18-node frame, up to 4 frames (72-nodes). From 484bb26e9daeb41d08edd3d31d42bcee6fb43d40 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0573/1681] Remove trailing spaces in file docs/source/references/coral/discovery/compute/index.rst --- docs/source/references/coral/discovery/compute/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/discovery/compute/index.rst b/docs/source/references/coral/discovery/compute/index.rst index f685c63b8..0a5bd12ca 100644 --- a/docs/source/references/coral/discovery/compute/index.rst +++ b/docs/source/references/coral/discovery/compute/index.rst @@ -5,5 +5,5 @@ Compute Nodes :maxdepth: 2 discover.rst - validation.rst + validation.rst From 5d5bd7c8d90ee56ba3b68137d764c9287618d4dd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0574/1681] Remove trailing spaces in file docs/source/references/coral/discovery/index.rst --- docs/source/references/coral/discovery/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/discovery/index.rst b/docs/source/references/coral/discovery/index.rst index 3d7984876..1d52a6aff 100644 --- a/docs/source/references/coral/discovery/index.rst +++ b/docs/source/references/coral/discovery/index.rst @@ -9,5 +9,5 @@ Discovery mid_sw/index.rst servicenode/index.rst edge_sw/index.rst - compute/index.rst - + compute/index.rst + From 7d7f36607962f996079f640ca20ddedd0cc824e3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0575/1681] Remove trailing spaces in file docs/source/references/coral/discovery/servicenode/index.rst --- docs/source/references/coral/discovery/servicenode/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/discovery/servicenode/index.rst b/docs/source/references/coral/discovery/servicenode/index.rst index 23ff6169e..018fca8cf 100644 --- a/docs/source/references/coral/discovery/servicenode/index.rst +++ b/docs/source/references/coral/discovery/servicenode/index.rst @@ -5,5 +5,5 @@ Service Nodes :maxdepth: 2 discover.rst - validation.rst + validation.rst From 28598750c331b70c8f4309bfd8422dd825e6d109 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0576/1681] Remove trailing spaces in file docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst --- .../coral/ha/ha_mgmt_node_with_shared_data.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst b/docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst index 0d62646ee..0537cccd8 100644 --- a/docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst +++ b/docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst @@ -44,14 +44,14 @@ Use ``xcatha.py -d`` to disable and stop all related services: :: Configure Virtual IP ```````````````````` -Existing xCAT management node IP should be configured as Virtual IP address, the Virtual IP address should be non-persistent, it needs to be re-configured right after the management node is rebooted. This non-persistent Virtual IP address is designed to avoid ip address conflict when the original primary management node is recovered with this Virtual IP address configured. Since the Virtual IP is non-persistent, the network interface should have a persistent IP address. +Existing xCAT management node IP should be configured as Virtual IP address, the Virtual IP address should be non-persistent, it needs to be re-configured right after the management node is rebooted. This non-persistent Virtual IP address is designed to avoid ip address conflict when the original primary management node is recovered with this Virtual IP address configured. Since the Virtual IP is non-persistent, the network interface should have a persistent IP address. #. Configure another IP on primary management node for network interface as static IP, for example, ``10.5.106.70``: #. Configure ``10.5.106.70`` as static IP:: ip addr add 10.5.106.70/8 dev eth0 - + #. Edit ``ifcfg-eth0`` file as:: DEVICE="eth0" @@ -70,16 +70,16 @@ Existing xCAT management node IP should be configured as Virtual IP address, the #. Add ``10.5.106.70`` into ``/var/lib/pgsql/data/pg_hba.conf``:: - host all all 10.5.106.7/32 md5 + host all all 10.5.106.7/32 md5 - #. Add ``10.5.106.70`` into ``listen_addresses`` variable in ``/var/lib/pgsql/data/postgresql.conf``:: + #. Add ``10.5.106.70`` into ``listen_addresses`` variable in ``/var/lib/pgsql/data/postgresql.conf``:: listen_addresses = 'localhost,10.5.106.7,10.5.106.70' #. Modify provision network entry ``mgtifname`` as ``eth0:0`` on primary management node:: - + tabedit networks - "10_0_0_0-255_0_0_0","10.0.0.0","255.0.0.0","eth0:0","10.0.0.103",,"",,,,,,,,,,,"1500",, + "10_0_0_0-255_0_0_0","10.0.0.0","255.0.0.0","eth0:0","10.0.0.103",,"",,,,,,,,,,,"1500",, Configure Shared Data ````````````````````` @@ -164,10 +164,10 @@ Activate Backup xCAT Management Node to be Primary Management Node #. Switch to ``PostgreSQL`` database -#. Disable and deactivate services using ``xcatha.py -d`` on both ``xcatmn2`` and ``xcatmn1`` +#. Disable and deactivate services using ``xcatha.py -d`` on both ``xcatmn2`` and ``xcatmn1`` #. Remove Virtual IP from primary xCAT Management Node ``xcatmn1``:: - + ip addr del 10.5.106.7/8 dev eth0:0 #. Configure Virtual IP on ``xcatmn2`` From da0a94b5b8aaeccb875165c4f15c2f3ef7d05ffe Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0577/1681] Remove trailing spaces in file docs/source/references/coral/ha/index.rst --- docs/source/references/coral/ha/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/ha/index.rst b/docs/source/references/coral/ha/index.rst index 93e8d663c..15a0ca208 100644 --- a/docs/source/references/coral/ha/index.rst +++ b/docs/source/references/coral/ha/index.rst @@ -4,4 +4,4 @@ HA .. toctree:: :maxdepth: 2 - ha_mgmt_node_with_shared_data.rst + ha_mgmt_node_with_shared_data.rst From 8c4cca53b6e04886f2ed040711bea8fbb293dac2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0578/1681] Remove trailing spaces in file docs/source/references/coral/index.rst --- docs/source/references/coral/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/index.rst b/docs/source/references/coral/index.rst index c89735c71..5e28d2137 100644 --- a/docs/source/references/coral/index.rst +++ b/docs/source/references/coral/index.rst @@ -1,7 +1,7 @@ CORAL ===== -CORAL stands for Collaboration of Oak Ridge, Argonne, and Livermore and is solution that IBM is building for the Department of Energy to superseed its current cluster of Supercomputers. +CORAL stands for Collaboration of Oak Ridge, Argonne, and Livermore and is solution that IBM is building for the Department of Energy to superseed its current cluster of Supercomputers. .. toctree:: @@ -9,6 +9,6 @@ CORAL stands for Collaboration of Oak Ridge, Argonne, and Livermore and is solut cluster_mgmt/index.rst known_issues/index.rst - ha/index.rst + ha/index.rst .. mn/index.rst .. discovery/index.rst From 89755021f59db36d953268642329ea4ccba8a328 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0579/1681] Remove trailing spaces in file docs/source/references/coral/known_issues/genesis_base.rst --- docs/source/references/coral/known_issues/genesis_base.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/known_issues/genesis_base.rst b/docs/source/references/coral/known_issues/genesis_base.rst index c01b4848a..3df864a89 100644 --- a/docs/source/references/coral/known_issues/genesis_base.rst +++ b/docs/source/references/coral/known_issues/genesis_base.rst @@ -13,8 +13,8 @@ Work-around xCAT cannot ship a kernel based on RHEL distribution, so the customer needs to build a version of the ``xCAT-genesis-base`` on-site using a server running Red Hat Enterprise Linux. 1. Download the latest timestamp version of the ``xCAT-genesis-builder`` RPM provided here: http://xcat.org/files/xcat/xcat-dep/2.x_Linux/beta/ - -2. Install the ``xCAT-genesis-builder`` RPM on a node that is installed with the RHEL version being deployed. + +2. Install the ``xCAT-genesis-builder`` RPM on a node that is installed with the RHEL version being deployed. 3. Build the ``xCAT-genesis-base`` RPM: :: From ddb89f7e36f93457e234162c193de470f669f9d4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0580/1681] Remove trailing spaces in file docs/source/references/coral/known_issues/openbmc/2_13_8.rst --- docs/source/references/coral/known_issues/openbmc/2_13_8.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/known_issues/openbmc/2_13_8.rst b/docs/source/references/coral/known_issues/openbmc/2_13_8.rst index d5502f9be..957c40a03 100644 --- a/docs/source/references/coral/known_issues/openbmc/2_13_8.rst +++ b/docs/source/references/coral/known_issues/openbmc/2_13_8.rst @@ -3,5 +3,5 @@ Issue `#4264 `_ -In attempt to improve the performance of the REST calls to OpenBMC and reduce the time spent in a timeout, we fail too soon here before the BMC has a chance to respond. +In attempt to improve the performance of the REST calls to OpenBMC and reduce the time spent in a timeout, we fail too soon here before the BMC has a chance to respond. From 592a14851b784352ed1bca2c1d9e236fbf051542 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0581/1681] Remove trailing spaces in file docs/source/references/coral/known_issues/openbmc/SW402273.rst --- .../source/references/coral/known_issues/openbmc/SW402273.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/known_issues/openbmc/SW402273.rst b/docs/source/references/coral/known_issues/openbmc/SW402273.rst index b1a07e688..7c3105f3d 100644 --- a/docs/source/references/coral/known_issues/openbmc/SW402273.rst +++ b/docs/source/references/coral/known_issues/openbmc/SW402273.rst @@ -5,9 +5,9 @@ SW402273 - Unable to tell the firmware level that is actually running on the nod * **Reported:** 1738B (ibm-v1.99.10-0-r7) * **Fixed:** 1740B (ibm-v1.99.10-0-r13) -**Issue:** +**Issue:** -Until 1740B firmware (> ibm-v1.99.10-0-r13), there's no method provided by OpenBMC to indicate the active running firmware on the node. Until the BMC is rebooted or the HOST is rebooted, the Active firmware may or may not really be running. +Until 1740B firmware (> ibm-v1.99.10-0-r13), there's no method provided by OpenBMC to indicate the active running firmware on the node. Until the BMC is rebooted or the HOST is rebooted, the Active firmware may or may not really be running. If you are running a version that prints the following message from ``rflash``: :: From b70a1646416e8e8e8f18e69a1ddd51e490967395 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0582/1681] Remove trailing spaces in file docs/source/references/coral/known_issues/openbmc/SW404161.rst --- .../source/references/coral/known_issues/openbmc/SW404161.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/known_issues/openbmc/SW404161.rst b/docs/source/references/coral/known_issues/openbmc/SW404161.rst index e955fdeab..a3d3405db 100644 --- a/docs/source/references/coral/known_issues/openbmc/SW404161.rst +++ b/docs/source/references/coral/known_issues/openbmc/SW404161.rst @@ -5,7 +5,7 @@ SW404161 - Firmware do not self extract tar, causing rflash cannot find ID to ac * **Reported:** 1738A (ibm-v1.99.10-0-r7) * **Fixed:** 1742D (ibm-v1.99.10-0-113-r10) -**Issue:** +**Issue:** Firmware is not extracted and could not be found by rflash to activate :: @@ -20,7 +20,7 @@ Firmware is not extracted and could not be found by rflash to activate :: c650f07p27: Could not find ID for firmware ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d to activate, waiting 10 seconds and retry... c650f07p27: Error: Could not find firmware ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d after waiting 60 seconds. -**Work-around:** Use one of the following methods: +**Work-around:** Use one of the following methods: * Reboot the BMC before flashing firmware: ``rpower <> bmcreboot`` * ssh into bmc and run: ``systemctl restart xyz.openbmc_project.Software.Version.service`` From 1d8fc9df1cd5161707eba3209877c15fd7e941c3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0583/1681] Remove trailing spaces in file docs/source/references/coral/known_issues/openbmc/SW406771.rst --- .../coral/known_issues/openbmc/SW406771.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/references/coral/known_issues/openbmc/SW406771.rst b/docs/source/references/coral/known_issues/openbmc/SW406771.rst index 145844d86..d02460327 100644 --- a/docs/source/references/coral/known_issues/openbmc/SW406771.rst +++ b/docs/source/references/coral/known_issues/openbmc/SW406771.rst @@ -5,7 +5,7 @@ SW406771 - Duplicate FW ID or 2 BMC firmware active at the same time * **Reported:** 1740A (ibm-v1.99.10-0-r11-0-g9c65260) * **Fixed:** 1742 or higher -**Issue:** +**Issue:** At some point after 1740A firmware, ``ibm-v1.99.10-0-r11-0-g9c65260``, the hashing algorithm to create the ID on the BMC was chagned by the Firmware team. This allows for the same firmware to potentially have two different IDs resulting in two active running BMC firmware. @@ -15,7 +15,7 @@ At some point after 1740A firmware, ``ibm-v1.99.10-0-r11-0-g9c65260``, the hashi Upgrade from 1740A ------------------ -If you are running 1740A, you will need to get two BMC firmware levels from your IBM representative. +If you are running 1740A, you will need to get two BMC firmware levels from your IBM representative. This example will cover flashing from 1740A to 1742D, using 1742C as the recovery flash level. @@ -47,7 +47,7 @@ This example will cover flashing from 1740A to 1742D, using 1742C as the recover mid05tor12cn13: 9e55358e BMC Active ibm-v1.99.10-0-r11-0-g9c65260 mid05tor12cn13: 221d9020 Host Active(*) IBM-witherspoon-redbud-ibm-OP9_v1.19_1.33 mid05tor12cn13: 6e71e1af BMC Active(*) ibm-v1.99.10-113-g65edf7d-r10-0-gcdf7635 - mid05tor12cn13: f6590ce0 BMC Active(+) ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d <--- 1742C + mid05tor12cn13: f6590ce0 BMC Active(+) ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d <--- 1742C mid05tor12cn13: #. Delete the bad hash firmware: ``rflash -d 6e71e1af`` @@ -59,7 +59,7 @@ This example will cover flashing from 1740A to 1742D, using 1742C as the recover mid05tor12cn13: ID Purpose State Version mid05tor12cn13: ------------------------------------------------------- mid05tor12cn13: 221d9020 Host Active(*) IBM-witherspoon-redbud-ibm-OP9_v1.19_1.33 - mid05tor12cn13: efc8a851 BMC Active(*) ibm-v1.99.10-113-g65edf7d-r10-0-gcdf7635 <--- good hash + mid05tor12cn13: efc8a851 BMC Active(*) ibm-v1.99.10-113-g65edf7d-r10-0-gcdf7635 <--- good hash mid05tor12cn13: f6590ce0 BMC Active ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d mid05tor12cn13: @@ -77,8 +77,8 @@ If you have two active BMCs:: f7n02: f6590ce0 BMC Active(*) ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d f7n02: -There's no way to de-activate one manually, recover by doing the following: +There's no way to de-activate one manually, recover by doing the following: #. Flash the BMC to the previous level of the firmware and reboot BMC #. Delete the duplicate firmware using ``rflash -d `` -#. Re-flash the BMC to the target level and reboot the BMC. +#. Re-flash the BMC to the target level and reboot the BMC. From 942df66acbbb6e96239c2c4d5a5a121ea02676e1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0584/1681] Remove trailing spaces in file docs/source/references/coral/known_issues/openbmc/SW407037.rst --- .../coral/known_issues/openbmc/SW407037.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/source/references/coral/known_issues/openbmc/SW407037.rst b/docs/source/references/coral/known_issues/openbmc/SW407037.rst index 5f939ede3..d3947a6c1 100644 --- a/docs/source/references/coral/known_issues/openbmc/SW407037.rst +++ b/docs/source/references/coral/known_issues/openbmc/SW407037.rst @@ -3,27 +3,27 @@ SW407037 - bmcsetup does not successfully configure the IP (Sev1) * **Issue:** `SW407037 `_ * **Reported:** 1742C (ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d) -* **Fixed:** Fixed in xCAT after 11/07/17 `#4242 `_ +* **Fixed:** Fixed in xCAT after 11/07/17 `#4242 `_ -**Issue:** +**Issue:** -OpenBMC firmware has problems with ipmi inband support of the ``access on`` comamnd and the work around is to use the ``raw 0x06 0x40`` instead. In early Sept, we switched to using ``access on`` because the implementation looked like it was working, since then we have found some issues with it and recommendation is to revert back to the raw command. +OpenBMC firmware has problems with ipmi inband support of the ``access on`` comamnd and the work around is to use the ``raw 0x06 0x40`` instead. In early Sept, we switched to using ``access on`` because the implementation looked like it was working, since then we have found some issues with it and recommendation is to revert back to the raw command. See related issues describing potential problems: * https://github.com/openbmc/openbmc/issues/2493 * https://github.com/openbmc/openbmc/issues/2492 -This problem is very severe because if the network is not configured correctly, the access to the BMC is lost. +This problem is very severe because if the network is not configured correctly, the access to the BMC is lost. **Work-around** -Use one of the following work arounds: +Use one of the following work arounds: #. Install a version of xCAT built after November, 07, 2017 which includes the fix. (**Recommended**) #. Manually patch bmcsetup using changes in PR: https://github.com/xcat2/xcat-core/pull/4247, then run ``mknb ppc64`` -#. Patch the system with provided patch: +#. Patch the system with provided patch: #. Download patch file: https://github.com/xcat2/xcat-core/files/1451181/bmcsetup.4242.patch.txt @@ -32,7 +32,7 @@ Use one of the following work arounds: #. ``cd /opt/xcat/share/xcat/netboot/genesis/ppc64/fs/usr/bin`` #. ``patch -p0 < /tmp/bmcsetup.4242.patch.txt`` - + #. ``mknb ppc64`` From fbcf9ef0243ce3d60a608938b82a8d9aeb41b171 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0585/1681] Remove trailing spaces in file docs/source/references/coral/known_issues/openbmc/index.rst --- docs/source/references/coral/known_issues/openbmc/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/known_issues/openbmc/index.rst b/docs/source/references/coral/known_issues/openbmc/index.rst index 0f01bb3f9..03ae246fc 100644 --- a/docs/source/references/coral/known_issues/openbmc/index.rst +++ b/docs/source/references/coral/known_issues/openbmc/index.rst @@ -1,4 +1,4 @@ -OpenBMC Management Issues +OpenBMC Management Issues ========================= xCAT @@ -17,7 +17,7 @@ Please see the `2.13.8 Release Notes Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0586/1681] Remove trailing spaces in file docs/source/references/coral/mn/index.rst --- docs/source/references/coral/mn/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/mn/index.rst b/docs/source/references/coral/mn/index.rst index 55f5cb559..0df5b471e 100644 --- a/docs/source/references/coral/mn/index.rst +++ b/docs/source/references/coral/mn/index.rst @@ -1,12 +1,12 @@ Management Node =============== -The Management Node should be installed with a RHEL Operating System. The following guides describe the process of installation, configuration and validation of xCAT on the Management Node. +The Management Node should be installed with a RHEL Operating System. The following guides describe the process of installation, configuration and validation of xCAT on the Management Node. .. toctree:: :maxdepth: 2 install.rst - configure/index.rst + configure/index.rst validate/index.rst From 85b09a74b31d8483f2535725efc9992b88822c81 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0587/1681] Remove trailing spaces in file docs/source/references/coral/mn/install.rst --- docs/source/references/coral/mn/install.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/coral/mn/install.rst b/docs/source/references/coral/mn/install.rst index 92baff000..d0547d859 100644 --- a/docs/source/references/coral/mn/install.rst +++ b/docs/source/references/coral/mn/install.rst @@ -1,4 +1,4 @@ -Install +Install ======= @@ -13,4 +13,4 @@ Install the following RPMs Management Node. They are used by various tools xCAT Install xCAT ------------ -See :ref:`rhel_install_guide` for detailed xCAT installation instructions. +See :ref:`rhel_install_guide` for detailed xCAT installation instructions. From 13057856cc076177ef08892535f549cbdd0f54b1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0588/1681] Remove trailing spaces in file docs/source/references/index.rst --- docs/source/references/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/references/index.rst b/docs/source/references/index.rst index 7a3d6402a..63cb8dd23 100644 --- a/docs/source/references/index.rst +++ b/docs/source/references/index.rst @@ -1,11 +1,11 @@ Reference Implementation ======================== -Reference documentation created for management of large clusters using xCAT. +Reference documentation created for management of large clusters using xCAT. .. toctree:: :maxdepth: 2 coral/index.rst percs/index.rst - + From ea9939a4982624709b7117794888438ef95a658e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0589/1681] Remove trailing spaces in file docs/source/security/2015/20150312_openssl.rst --- docs/source/security/2015/20150312_openssl.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/security/2015/20150312_openssl.rst b/docs/source/security/2015/20150312_openssl.rst index aa9a9e096..a40bc494c 100644 --- a/docs/source/security/2015/20150312_openssl.rst +++ b/docs/source/security/2015/20150312_openssl.rst @@ -1,19 +1,19 @@ 2015-03-12 - OpenSSL Vulnerabilities (FREAK) ============================================= -OpenSSL announced security fixes on 01/08/15 in the following bulletin: https://www-origin.openssl.org/news/secadv/20150108.txt +OpenSSL announced security fixes on 01/08/15 in the following bulletin: https://www-origin.openssl.org/news/secadv/20150108.txt Advisory CVEs ------------- * CVE-2015-0204 **RSA silently downgrades to EXPORT_RSA [Client]** (Severity: Low) -FREAK vulnerability CVE-2015-0204 is involved when 'RSA_EXPORT' ssl cipher suit is used in ssl server/client. +FREAK vulnerability CVE-2015-0204 is involved when 'RSA_EXPORT' ssl cipher suit is used in ssl server/client. Action ------ -xCAT does not use RSA_EXPORT ciphers for ssl communication by default. However, xCAT does allow user to choose the ciphers from the site.xcatsslciphers attribute. +xCAT does not use RSA_EXPORT ciphers for ssl communication by default. However, xCAT does allow user to choose the ciphers from the site.xcatsslciphers attribute. Make sure you do not put RSA_EXPORT related ciphers in this attribute. From 5c642e2f786af13f74708c51d57c82bca5bd4fa7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0590/1681] Remove trailing spaces in file docs/source/security/2015/20150324_openssl.rst --- docs/source/security/2015/20150324_openssl.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/security/2015/20150324_openssl.rst b/docs/source/security/2015/20150324_openssl.rst index d7080600b..1ba5aa5b3 100644 --- a/docs/source/security/2015/20150324_openssl.rst +++ b/docs/source/security/2015/20150324_openssl.rst @@ -1,7 +1,7 @@ -2015-03-24 - OpenSSL Vulnerabilities +2015-03-24 - OpenSSL Vulnerabilities ==================================== -OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This feature only applies on 64 bit x86 architecture platforms that support AES NI instructions. A defect in the implementation of "multiblock" can cause a segmentation fault within OpenSSL, thus enabling a potential DoS attack. +OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This feature only applies on 64 bit x86 architecture platforms that support AES NI instructions. A defect in the implementation of "multiblock" can cause a segmentation fault within OpenSSL, thus enabling a potential DoS attack. This issue affects OpenSSL version: 1.0.2 @@ -9,4 +9,4 @@ This issue affects OpenSSL version: 1.0.2 Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. Upgrade OpenSSL to 1.0.2a or higher. +xCAT uses OpenSSL for client-server communication but **does not** ship it. Upgrade OpenSSL to 1.0.2a or higher. From cae349866885414573c62a49e2022d21556730a7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0591/1681] Remove trailing spaces in file docs/source/security/2015/20150403_openssl.rst --- docs/source/security/2015/20150403_openssl.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/security/2015/20150403_openssl.rst b/docs/source/security/2015/20150403_openssl.rst index 12262015c..762822f90 100644 --- a/docs/source/security/2015/20150403_openssl.rst +++ b/docs/source/security/2015/20150403_openssl.rst @@ -1,14 +1,14 @@ 2015-04-03 - OpenSSL Vulnerabilities (BAR MITZVAH) ================================================== -The RC4 Bar mitzvah attack is an attack on the SSL/TLS protocols when both the client and server have RC4 enabled. +The RC4 Bar mitzvah attack is an attack on the SSL/TLS protocols when both the client and server have RC4 enabled. -* http://www.darkreading.com/attacks-breaches/ssl-tls-suffers-bar-mitzvah-attack-/d/d-id/1319633 +* http://www.darkreading.com/attacks-breaches/ssl-tls-suffers-bar-mitzvah-attack-/d/d-id/1319633 * http://www.imperva.com/docs/HII_Attacking_SSL_when_using_RC4.pdf. Action ------ -xCAT uses OpenSSL shipped with OS distribution for client-server communication. It does not use RC4 ciphers explicitly. However, it allows user to specify xcatsslciphers on the site table for ssl communication. It is recommended that the user not specify RC4 ciphers to avoid the Bar mitzvah attack. +xCAT uses OpenSSL shipped with OS distribution for client-server communication. It does not use RC4 ciphers explicitly. However, it allows user to specify xcatsslciphers on the site table for ssl communication. It is recommended that the user not specify RC4 ciphers to avoid the Bar mitzvah attack. -It is also recommended that the user go to the OS distribution to get latest OpenSSL package for the fix of this problem. +It is also recommended that the user go to the OS distribution to get latest OpenSSL package for the fix of this problem. From be61ae056456f1b29629ff5b7f55b98861e09c79 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0592/1681] Remove trailing spaces in file docs/source/security/2015/20150519_openssl.rst --- docs/source/security/2015/20150519_openssl.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2015/20150519_openssl.rst b/docs/source/security/2015/20150519_openssl.rst index 35220c4d0..0affd1f4a 100644 --- a/docs/source/security/2015/20150519_openssl.rst +++ b/docs/source/security/2015/20150519_openssl.rst @@ -4,7 +4,7 @@ Advisory CVEs ------------- -* CVE-2015-3456 - **(aka VENOM) is a security flaw in the QEMU's Floppy Disk Controller (FDC) emulation.** +* CVE-2015-3456 - **(aka VENOM) is a security flaw in the QEMU's Floppy Disk Controller (FDC) emulation.** VENOM vulnerability could expose virtual machines on unpatched host systems @@ -22,6 +22,6 @@ The VENOM bug (CVE-2015-3456) exists in the virtual Floppy Disk Controller for t Action ------ -xCAT does not ship any rpms that have QEMU component directly. However xCAT does make system calls to QEMU when doing KVM/Xen visualization. If you are using xCAT to manage KVM or Xen hosts and quests, get the latest rpms that have QEMU component from the os distro and do a upgrade on both xCAT management node and the KVM/Xen hosts. +xCAT does not ship any rpms that have QEMU component directly. However xCAT does make system calls to QEMU when doing KVM/Xen visualization. If you are using xCAT to manage KVM or Xen hosts and quests, get the latest rpms that have QEMU component from the os distro and do a upgrade on both xCAT management node and the KVM/Xen hosts. From d0da3d406ba544a665c49407b5f6aa45c9dfa6e3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0593/1681] Remove trailing spaces in file docs/source/security/2015/20150520_openssl.rst --- docs/source/security/2015/20150520_openssl.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/security/2015/20150520_openssl.rst b/docs/source/security/2015/20150520_openssl.rst index 9bb2ae6bd..4a0be5f77 100644 --- a/docs/source/security/2015/20150520_openssl.rst +++ b/docs/source/security/2015/20150520_openssl.rst @@ -15,6 +15,6 @@ Refer to the following openssl link for more details regarding the fix: https:// Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. It uses the default ciphers from openssl. It also allows the user to customize it through site.xcatsslversion and site.xcatsslciphers. Make sure you do not enable DH or DHE ciphers. +xCAT uses OpenSSL for client-server communication but **does not** ship it. It uses the default ciphers from openssl. It also allows the user to customize it through site.xcatsslversion and site.xcatsslciphers. Make sure you do not enable DH or DHE ciphers. Get the latest openssl package from the os distros and upgrade it on all the xCAT management nodes, the service nodes and xCAT client nodes. From ce54f9f12a776433883cf375266e6984c8932a5b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0594/1681] Remove trailing spaces in file docs/source/security/2015/20151203_openssl.rst --- docs/source/security/2015/20151203_openssl.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2015/20151203_openssl.rst b/docs/source/security/2015/20151203_openssl.rst index da5e9e772..bc4f9f9c0 100644 --- a/docs/source/security/2015/20151203_openssl.rst +++ b/docs/source/security/2015/20151203_openssl.rst @@ -36,7 +36,7 @@ Advisory CVEs Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. +It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. From e0c9507c50c9601b0c77d831977e752bdde3eeb8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0595/1681] Remove trailing spaces in file docs/source/security/2015/index.rst --- docs/source/security/2015/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/security/2015/index.rst b/docs/source/security/2015/index.rst index 4da7c1928..4e4c29845 100644 --- a/docs/source/security/2015/index.rst +++ b/docs/source/security/2015/index.rst @@ -1,4 +1,4 @@ -2015 Notices +2015 Notices ============ .. toctree:: From ca3c70b161e0ed5d888dc3e62b9456721a7f6102 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0596/1681] Remove trailing spaces in file docs/source/security/2016/20160115_openssl.rst --- docs/source/security/2016/20160115_openssl.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2016/20160115_openssl.rst b/docs/source/security/2016/20160115_openssl.rst index 32dcee2a3..5d0a3ebe2 100644 --- a/docs/source/security/2016/20160115_openssl.rst +++ b/docs/source/security/2016/20160115_openssl.rst @@ -11,9 +11,9 @@ Advisory CVEs Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. +It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. From 09bba64b0004be9dd33debf57a2158efbb61b159 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0597/1681] Remove trailing spaces in file docs/source/security/2016/20160128_openssl.rst --- docs/source/security/2016/20160128_openssl.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/security/2016/20160128_openssl.rst b/docs/source/security/2016/20160128_openssl.rst index a4b5f567a..ed1f2f536 100644 --- a/docs/source/security/2016/20160128_openssl.rst +++ b/docs/source/security/2016/20160128_openssl.rst @@ -8,14 +8,14 @@ Advisory CVEs * CVE-2016-0701 - **DH small subgroups** (Severity:High) - This issue affects OpenSSL version 1.0.2. + This issue affects OpenSSL version 1.0.2. OpenSSL 1.0.2 users should upgrade to 1.0.2f * CVE-2015-3197 - **SSLv2 doesn't block disabled ciphers** (Severity:Low) - This issue affects OpenSSL versions 1.0.2 and 1.0.1. + This issue affects OpenSSL versions 1.0.2 and 1.0.1. - OpenSSL 1.0.2 users should upgrade to 1.0.2f + OpenSSL 1.0.2 users should upgrade to 1.0.2f OpenSSL 1.0.1 users should upgrade to 1.0.1r @@ -24,5 +24,5 @@ Action xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. +It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. From b31bedbe7f5fee0c39e4b553377233bde8a075e3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0598/1681] Remove trailing spaces in file docs/source/security/2016/20160301_openssl.rst --- .../source/security/2016/20160301_openssl.rst | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/source/security/2016/20160301_openssl.rst b/docs/source/security/2016/20160301_openssl.rst index aa466cfb3..4d69040ba 100644 --- a/docs/source/security/2016/20160301_openssl.rst +++ b/docs/source/security/2016/20160301_openssl.rst @@ -8,61 +8,61 @@ Advisory CVEs * CVE-2016-0800 - **Cross-protocol attack on TLS using SSLv2 (DROWN)** (Severity:High) - This issue affects OpenSSL versions 1.0.1 and 1.0.2. - - OpenSSL 1.0.2 users should upgrade to 1.0.2g + This issue affects OpenSSL versions 1.0.1 and 1.0.2. + + OpenSSL 1.0.2 users should upgrade to 1.0.2g OpenSSL 1.0.1 users should upgrade to 1.0.1s * CVE-2016-0705 - **Double-free in DSA code** (Severity:Low) This issue affects OpenSSL versions 1.0.2 and 1.0.1. - OpenSSL 1.0.2 users should upgrade to 1.0.2g + OpenSSL 1.0.2 users should upgrade to 1.0.2g OpenSSL 1.0.1 users should upgrade to 1.0.1s * CVE-2016-0798 - **Memory leak in SRP database lookups** (Severity:Low) - + This issue affects OpenSSL versions 1.0.2 and 1.0.1. - OpenSSL 1.0.2 users should upgrade to 1.0.2g + OpenSSL 1.0.2 users should upgrade to 1.0.2g OpenSSL 1.0.1 users should upgrade to 1.0.1s * CVE-2016-0797 - **BN_hex2bn/BN_dec2bn NULL pointer deref/heap corruption** (Severity:Low) - + This issue affects OpenSSL versions 1.0.2 and 1.0.1. - OpenSSL 1.0.2 users should upgrade to 1.0.2g + OpenSSL 1.0.2 users should upgrade to 1.0.2g OpenSSL 1.0.1 users should upgrade to 1.0.1s * CVE-2016-0797 - **Fix memory issues in BIO_*printf functions** (Severity:Low) - + This issue affects OpenSSL versions 1.0.2 and 1.0.1. - OpenSSL 1.0.2 users should upgrade to 1.0.2g + OpenSSL 1.0.2 users should upgrade to 1.0.2g OpenSSL 1.0.1 users should upgrade to 1.0.1s * CVE-2016-0702 - **Side channel attack on modular exponentiation** (Severity:Low) - + This issue affects OpenSSL versions 1.0.2 and 1.0.1. - OpenSSL 1.0.2 users should upgrade to 1.0.2g + OpenSSL 1.0.2 users should upgrade to 1.0.2g OpenSSL 1.0.1 users should upgrade to 1.0.1s * CVE-2016-0703 - **Divide-and-conquer session key recovery in SSLv2** (Severity:High) - + This issue affected OpenSSL versions 1.0.2, 1.0.1l, 1.0.0q, 0.9.8ze and all earlier versions. It was fixed in OpenSSL 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf * CVE-2016-0704 - **Bleichenbacher oracle in SSLv2** (Severity:Moderate) - + This issue affected OpenSSL versions 1.0.2, 1.0.1l, 1.0.0q, 0.9.8ze and all earlier versions. It was fixed in OpenSSL 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. Regarding CVE-2016-0800, xCAT also does not use SSLv2 layer but uses the newer TLS transport layer security. +xCAT uses OpenSSL for client-server communication but **does not** ship it. Regarding CVE-2016-0800, xCAT also does not use SSLv2 layer but uses the newer TLS transport layer security. -It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. +It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. From d5d066c06c8791f2c1f65de47063f9228383f123 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0599/1681] Remove trailing spaces in file docs/source/security/2016/20160503_openssl.rst --- docs/source/security/2016/20160503_openssl.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/source/security/2016/20160503_openssl.rst b/docs/source/security/2016/20160503_openssl.rst index 33b94836b..5b58f1060 100644 --- a/docs/source/security/2016/20160503_openssl.rst +++ b/docs/source/security/2016/20160503_openssl.rst @@ -9,7 +9,7 @@ Advisory CVEs * CVE-2016-2108 - **Memory corruption in the ASN.1 encoder** (Severity:High) This issue affects all OpenSSL version prior to April 2015 - + OpenSSL 1.0.2 users should upgrade to 1.0.2c OpenSSL 1.0.1 users should upgrade to 1.0.1o @@ -21,12 +21,12 @@ Advisory CVEs OpenSSL 1.0.1 users should upgrade to 1.0.1t * CVE-2016-2105 - **EVP_EncodeUpdate overflow** (Severity:Low) - + OpenSSL 1.0.2 users should upgrade to 1.0.2h OpenSSL 1.0.1 users should upgrade to 1.0.1t * CVE-2016-2106 - **EVP_EncryptUpdate overflow** (Severity:Low) - + OpenSSL 1.0.2 users should upgrade to 1.0.2h OpenSSL 1.0.1 users should upgrade to 1.0.1t @@ -38,7 +38,7 @@ Advisory CVEs * CVE-2016-2176 - **EBCDIC overread** (Severity:Low) - + OpenSSL 1.0.2 users should upgrade to 1.0.2h OpenSSL 1.0.1 users should upgrade to 1.0.1t @@ -46,7 +46,7 @@ Advisory CVEs Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. +It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. From fb33275708026b4e1bba4c1b3cb2171a777b2d06 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0600/1681] Remove trailing spaces in file docs/source/security/2016/20160815_openssl.rst --- docs/source/security/2016/20160815_openssl.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2016/20160815_openssl.rst b/docs/source/security/2016/20160815_openssl.rst index 1a99c972d..62bd9b386 100644 --- a/docs/source/security/2016/20160815_openssl.rst +++ b/docs/source/security/2016/20160815_openssl.rst @@ -10,9 +10,9 @@ Patch: https://github.com/openssl/openssl/commit/0ed26acce328ec16a3aa635f1ca3736 Advisory CVEs ------------- -`CVE-2016-2180 `_ - OpenSSL is vulnerable to a denial of service, caused by an out-of-bounds read in the TS_OBJ_print_bio function. +`CVE-2016-2180 `_ - OpenSSL is vulnerable to a denial of service, caused by an out-of-bounds read in the TS_OBJ_print_bio function. Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. It is highly recommended to keep your OpenSSL levels up-to-date to prevent any potential security threats. +xCAT uses OpenSSL for client-server communication but **does not** ship it. It is highly recommended to keep your OpenSSL levels up-to-date to prevent any potential security threats. From d3d63ef9b98abc91e1149af2f12e4f160f032e49 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0601/1681] Remove trailing spaces in file docs/source/security/2016/20160824_openssl.rst --- docs/source/security/2016/20160824_openssl.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2016/20160824_openssl.rst b/docs/source/security/2016/20160824_openssl.rst index fdf724cc9..436616d49 100644 --- a/docs/source/security/2016/20160824_openssl.rst +++ b/docs/source/security/2016/20160824_openssl.rst @@ -24,8 +24,8 @@ Advisory CVEs Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. +It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. From 65eaa303d03d566a7435c5c50d4220e20ad8e86e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0602/1681] Remove trailing spaces in file docs/source/security/2016/20161130_hard_code_password.rst --- docs/source/security/2016/20161130_hard_code_password.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/security/2016/20161130_hard_code_password.rst b/docs/source/security/2016/20161130_hard_code_password.rst index 80d81a695..307035bde 100644 --- a/docs/source/security/2016/20161130_hard_code_password.rst +++ b/docs/source/security/2016/20161130_hard_code_password.rst @@ -20,7 +20,7 @@ No action is required for xCAT 2.12.3, and higher. If running older versions of xCAT, update xCAT to a higher level code base that has the hard-coded default passwords removed. -The following table describes the recommended update path: +The following table describes the recommended update path: +-------------------------+-----------------------------------------------+---------------------------------------+ | xCAT Version | Action | Release Notes | From 78d0f16ac425afd0fe62a95eb9f50f746cada43b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0603/1681] Remove trailing spaces in file docs/source/security/2016/index.rst --- docs/source/security/2016/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/security/2016/index.rst b/docs/source/security/2016/index.rst index e0db9a230..1550b39e4 100644 --- a/docs/source/security/2016/index.rst +++ b/docs/source/security/2016/index.rst @@ -1,4 +1,4 @@ -2016 Notices +2016 Notices ============ .. toctree:: From 596dbbf7432fd8a0424e3553fa6d91fe31d0892b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0604/1681] Remove trailing spaces in file docs/source/security/2017/20170126_openssl.rst --- docs/source/security/2017/20170126_openssl.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2017/20170126_openssl.rst b/docs/source/security/2017/20170126_openssl.rst index 037ad97cb..2e6a2607b 100644 --- a/docs/source/security/2017/20170126_openssl.rst +++ b/docs/source/security/2017/20170126_openssl.rst @@ -20,8 +20,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. +It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. From 39d91a74cde0daa11bbdda7e7f191f3d3346b09f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0605/1681] Remove trailing spaces in file docs/source/security/2017/20170216_openssl.rst --- docs/source/security/2017/20170216_openssl.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/security/2017/20170216_openssl.rst b/docs/source/security/2017/20170216_openssl.rst index 9f430f713..9af3743d5 100644 --- a/docs/source/security/2017/20170216_openssl.rst +++ b/docs/source/security/2017/20170216_openssl.rst @@ -1,13 +1,13 @@ 2017-02-16 - OpenSSL Vulnerabilities ==================================== -*Feb 16, 2017*, OpenSSL announced the following security advisories: https://www.openssl.org/news/secadv/20170216.txt +*Feb 16, 2017*, OpenSSL announced the following security advisories: https://www.openssl.org/news/secadv/20170216.txt Advisory CVEs ------------- -* CVE-2017-3733 - **Encrypt-Then-Mac renegotiation crash** (Severity:High) +* CVE-2017-3733 - **Encrypt-Then-Mac renegotiation crash** (Severity:High) OpenSSL 1.1.0 users should upgrade to 1.1.0e @@ -18,8 +18,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. +It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. From b74dd9d6920d2622ecf60dfa44fc38d64750345b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0606/1681] Remove trailing spaces in file docs/source/security/2017/20170828_openssl.rst --- docs/source/security/2017/20170828_openssl.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/security/2017/20170828_openssl.rst b/docs/source/security/2017/20170828_openssl.rst index 9592f1f6d..b985ed780 100644 --- a/docs/source/security/2017/20170828_openssl.rst +++ b/docs/source/security/2017/20170828_openssl.rst @@ -1,7 +1,7 @@ 2017-08-28 - OpenSSL Vulnerabilities ==================================== -*Aug 28, 2017*, OpenSSL announced the following security advisories: https://www.openssl.org/news/secadv/20170828.txt +*Aug 28, 2017*, OpenSSL announced the following security advisories: https://www.openssl.org/news/secadv/20170828.txt Advisory CVEs @@ -24,8 +24,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. +It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. From 19593d5dc72070b4a86ed07b655a833690c3fb7b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0607/1681] Remove trailing spaces in file docs/source/security/2017/20171207_openssl.rst --- docs/source/security/2017/20171207_openssl.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2017/20171207_openssl.rst b/docs/source/security/2017/20171207_openssl.rst index 2b1dfb7a3..59cda479c 100644 --- a/docs/source/security/2017/20171207_openssl.rst +++ b/docs/source/security/2017/20171207_openssl.rst @@ -25,8 +25,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. +It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. From 1e25dd702110f1c9fbe7f2ee714068fd8e666832 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0608/1681] Remove trailing spaces in file docs/source/security/2017/20171212_tls.rst --- docs/source/security/2017/20171212_tls.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/security/2017/20171212_tls.rst b/docs/source/security/2017/20171212_tls.rst index 87eeffd86..63cf60467 100644 --- a/docs/source/security/2017/20171212_tls.rst +++ b/docs/source/security/2017/20171212_tls.rst @@ -11,19 +11,19 @@ Advisory CVEs Summary ------- -Transport Layer Security (TLS) is a mechanism for a security transport over network connections, and is defined in RFC 5246. TLS may utilize RSA cryptography to secure the connection, and section 7.4.7 describes how client and server may exchange keys. Implementations that don't closely follow the descriptions in RFC 5246 may leak information to an attacker when they handle PKCS #1 v1.5 padding errors in ways that lets the attacker distinguish between valid and invalid messages. An attacker may utilize discrepancies in TLS error messages to obtain the pre-master secret key private RSA key used by TLS to decrypt sensitive data. This type of attack has become known as a Bleichenbacher attack. CERT/CC previously published CERT Advisory CA-1998-07 for this type of attack. +Transport Layer Security (TLS) is a mechanism for a security transport over network connections, and is defined in RFC 5246. TLS may utilize RSA cryptography to secure the connection, and section 7.4.7 describes how client and server may exchange keys. Implementations that don't closely follow the descriptions in RFC 5246 may leak information to an attacker when they handle PKCS #1 v1.5 padding errors in ways that lets the attacker distinguish between valid and invalid messages. An attacker may utilize discrepancies in TLS error messages to obtain the pre-master secret key private RSA key used by TLS to decrypt sensitive data. This type of attack has become known as a Bleichenbacher attack. CERT/CC previously published CERT Advisory CA-1998-07 for this type of attack. Action ------ -Consider the following recommended actions: +Consider the following recommended actions: 1. Disable TLS RSA -2. Apply an update (if available) +2. Apply an update (if available) -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is highly recommended to keep your OpenSSL levels up-to-date. Obtain the updated software packages from your Operating system distribution channels. +It is highly recommended to keep your OpenSSL levels up-to-date. Obtain the updated software packages from your Operating system distribution channels. From a94b80848d6fa3d6224f0063d4b9bf4c9d9a5c3e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0609/1681] Remove trailing spaces in file docs/source/security/2017/index.rst --- docs/source/security/2017/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/security/2017/index.rst b/docs/source/security/2017/index.rst index 0d2b5039e..dd6842dd6 100644 --- a/docs/source/security/2017/index.rst +++ b/docs/source/security/2017/index.rst @@ -1,4 +1,4 @@ -2017 Notices +2017 Notices ============ .. toctree:: From 09f9486c4a4e3dd3ac311717f74a4d88ca8dfbae Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0610/1681] Remove trailing spaces in file docs/source/security/2018/20180612_openssl.rst --- docs/source/security/2018/20180612_openssl.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2018/20180612_openssl.rst b/docs/source/security/2018/20180612_openssl.rst index e11dc06b0..319573509 100644 --- a/docs/source/security/2018/20180612_openssl.rst +++ b/docs/source/security/2018/20180612_openssl.rst @@ -14,8 +14,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro Action ------ -xCAT uses OpenSSL for client-server communication but **does not** ship it. +xCAT uses OpenSSL for client-server communication but **does not** ship it. -It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. +It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. From c03374cf96e57bc081b9a9e6ffc1fde6ef3b3803 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0611/1681] Remove trailing spaces in file docs/source/security/2018/index.rst --- docs/source/security/2018/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/security/2018/index.rst b/docs/source/security/2018/index.rst index eb736ccb8..cf289fb37 100644 --- a/docs/source/security/2018/index.rst +++ b/docs/source/security/2018/index.rst @@ -1,7 +1,7 @@ -2018 Notices +2018 Notices ============ .. toctree:: :maxdepth: 1 - 20180612_openssl.rst + 20180612_openssl.rst From 25ea5c43e1fb5df2874ceaa1f722923dbcd257f3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0612/1681] Remove trailing spaces in file docs/source/troubleshooting/os_installation/debug_port.rst --- docs/source/troubleshooting/os_installation/debug_port.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/troubleshooting/os_installation/debug_port.rst b/docs/source/troubleshooting/os_installation/debug_port.rst index ac2e8741a..a6e55891a 100644 --- a/docs/source/troubleshooting/os_installation/debug_port.rst +++ b/docs/source/troubleshooting/os_installation/debug_port.rst @@ -12,4 +12,4 @@ Usage: ``runcmdinstaller ""`` Note: Make sure all the commands are quoted by ``""`` To list all the items under the /etc directory in the installer: ``runcmdinstaller c910f03c01p03 "ls /etc"`` - + From a9187b5fe3ee6399279cea53d68c7e86f39f25e2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0613/1681] Remove trailing spaces in file docs/source/troubleshooting/os_installation/log_to_mn_cn.rst --- .../os_installation/log_to_mn_cn.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst b/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst index 007142084..1bb1c5a74 100644 --- a/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst +++ b/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst @@ -45,25 +45,25 @@ The diskless provision logs: * **Pre-Install** logs: the logs of pre-installation scripts, including: - * ``%pre`` section in anaconda, - * ```` section for SUSE and ``partman/early_command`` and ``preseed/early_command`` sections for ubuntu. - * STDOUT and STDERR of the scripts + * ``%pre`` section in anaconda, + * ```` section for SUSE and ``partman/early_command`` and ``preseed/early_command`` sections for ubuntu. + * STDOUT and STDERR of the scripts * debug trace output of bash scripts with ``set -x`` * **Installer** logs: the logs from the os installer itself, i.e, the logs of installation program (anaconda, autoyast and preseed,etc.) -* **Post-Install** logs: the logs of post-installation scripts, including +* **Post-Install** logs: the logs of post-installation scripts, including - * ``%post`` section in anaconda, - * ```` and ```` sections for SUSE and ``preseed/late_command`` section for ubuntu. - * STDOUT and STDERR of the scripts + * ``%post`` section in anaconda, + * ```` and ```` sections for SUSE and ``preseed/late_command`` section for ubuntu. + * STDOUT and STDERR of the scripts * debug trace output of bash scripts with ``set -x`` * **Provision** logs: the logs during the diskless provision. * **PostBootScript** logs: the logs during the post boot scripts execution, which are specified in ``postbootscripts`` attribute of node and osimage definition and run during the 1st reboot after installation. -MN: the logs forwarded to management node: +MN: the logs forwarded to management node: * M1: the installer logs will be forwarded to the MN in ``/var/log/xcat/computes.log`` file. From f6d8e57dbabe47d7bd65a563c811be98e3f8e8c6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0614/1681] Remove trailing spaces in file docs/source/troubleshooting/os_installation/ssh_enable.rst --- docs/source/troubleshooting/os_installation/ssh_enable.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/troubleshooting/os_installation/ssh_enable.rst b/docs/source/troubleshooting/os_installation/ssh_enable.rst index 8f2e94b80..2a60dd98b 100644 --- a/docs/source/troubleshooting/os_installation/ssh_enable.rst +++ b/docs/source/troubleshooting/os_installation/ssh_enable.rst @@ -15,7 +15,7 @@ When ssh access to the installer is enabled, the admin can login into the instal *** login using 'ssh -X root@' *** *** run 'yast' to start the installation *** - Just as the message above suggests, the admin can open 2 sessions and run ``ssh -X root@`` with the configured system password in the ``passwd`` table to login into the installer, then run ``yast`` to continue installation in one session and inspect the installation process in the installer in the other session. + Just as the message above suggests, the admin can open 2 sessions and run ``ssh -X root@`` with the configured system password in the ``passwd`` table to login into the installer, then run ``yast`` to continue installation in one session and inspect the installation process in the installer in the other session. After the installation is finished, the system requires a reboot. The installation will halt again before the system configuration, the console output looks like: :: From 936b4570a33a878b3fbcba5b92da52159c71ddc1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0615/1681] Remove trailing spaces in file makerpm --- makerpm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/makerpm b/makerpm index 8ed19bf24..c65a02da3 100755 --- a/makerpm +++ b/makerpm @@ -23,7 +23,7 @@ function xcat_probe_copy { fi } -function xcat_probe_cleanup { +function xcat_probe_cleanup { RPMNAME=${1} if [ $RPMNAME = "xCAT-probe" ]; then rm -rf ${RPMNAME}/lib/perl/xCAT/ @@ -44,22 +44,22 @@ function makenoarch { else # linux echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..." # TODO: should fix this up, this is a hack for the new build machine - if [ $RPMNAME = "xCAT-UI" ]; then + if [ $RPMNAME = "xCAT-UI" ]; then # Only if the old compiler.jar file does not exist..... - if [ ! -e /xcat2/build/tools/compiler.jar ]; then + if [ ! -e /xcat2/build/tools/compiler.jar ]; then # look for the dynamic location of the compiler.jar file DIRNAME=`dirname $(readlink -f $0)` COMPILER_JAR=`echo "${DIRNAME%%linux_rpm/*}tools/compiler.jar"` - if [ -f $COMPILER_JAR ]; then + if [ -f $COMPILER_JAR ]; then sed -i "s#/xcat2/build/tools/compiler.jar#${COMPILER_JAR}#g" xCAT-UI/xCAT-UI.spec - else + else # In c910, if using the old buildxcat scripts... COMPILER_JAR=`echo "${DIRNAME%%old/*}xcat2/tools/compiler.jar"` - if [ -f $COMPILER_JAR ]; then + if [ -f $COMPILER_JAR ]; then sed -i "s#/xcat2/build/tools/compiler.jar#${COMPILER_JAR}#g" xCAT-UI/xCAT-UI.spec fi fi - fi + fi fi xcat_probe_copy ${RPMNAME} @@ -145,7 +145,7 @@ function makexcat { cp xcat.conf.apach24 $RPMROOT/SOURCES cp xCATSN $RPMROOT/SOURCES cp -a ../xCAT/etc/rsyslog.d $RPMROOT/ - cp -a ../xCAT/etc/logrotate.d $RPMROOT/ + cp -a ../xCAT/etc/logrotate.d $RPMROOT/ cd - >/dev/null elif [ "$RPMNAME" = "xCAT-buildkit" ]; then ARCH="noarch" @@ -175,7 +175,7 @@ function makexcat { function makeironic { RPMNAME="$1" ARCH="$2" - cd `dirname $0`/$RPMNAME + cd `dirname $0`/$RPMNAME cp -rf ironic_baremetal /tmp/ cd /tmp/ironic_baremetal git init @@ -286,7 +286,7 @@ elif [ "$1" = "xCAT-genesis-scripts" ]; then exportEmbed $3 makegenesisscripts $1 $2 elif [ "$1" = "xCAT-OpenStack-ironic" ]; then - makeironic $1 $2 + makeironic $1 $2 else # must be one of the noarch rpms exportEmbed $2 makenoarch $1 From 3aff26a78abb75aaa01bfa0a11d49f8dacd4eb99 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0616/1681] Remove trailing spaces in file perl-xCAT/db2man --- perl-xCAT/db2man | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-xCAT/db2man b/perl-xCAT/db2man index ee73edc5e..7542ae3f4 100755 --- a/perl-xCAT/db2man +++ b/perl-xCAT/db2man @@ -167,7 +167,7 @@ xCAT allows the use of different database applications, depending on the needs o The default database is SQLite, which is a daemonless, zero-config database. But you could instead choose to use something like postgresql for greater scalability and remote access in the hierarchical/service node case. To use a different database or a different location, create -the file /etc/xcat/cfgloc. See the appropriate xCAT docuementation for the format of the file for the database you choose. +the file /etc/xcat/cfgloc. See the appropriate xCAT docuementation for the format of the file for the database you choose. The following example /etc/xcat/cfgloc file is for PostgreSQL: Pg:dbname=xcat;host=|| @@ -265,9 +265,9 @@ expression B<($1-1)%14+1> will evaluate to B<6>. See http://www.perl.com/doc/manual/html/pod/perlre.html for information on perl regular expressions. -=head2 Easy Regular Expressions +=head2 Easy Regular Expressions -As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. For examples, see +As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. For examples, see http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/basic_concepts/xcat_db/regexp_db.html#easy-regular-expressions From bb0b1fa4c181e0693b12a6b27d3b984be5cdfb78 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0617/1681] Remove trailing spaces in file perl-xCAT/debian/copyright --- perl-xCAT/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/debian/copyright b/perl-xCAT/debian/copyright index f61d34dfe..87e60f492 100644 --- a/perl-xCAT/debian/copyright +++ b/perl-xCAT/debian/copyright @@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - + From 112cbad9ca0ef56a2db41fa0624f2ec641b70376 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0618/1681] Remove trailing spaces in file perl-xCAT/xCAT/CFMUtils.pm --- perl-xCAT/xCAT/CFMUtils.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/perl-xCAT/xCAT/CFMUtils.pm b/perl-xCAT/xCAT/CFMUtils.pm index d6a36c659..e0d306503 100644 --- a/perl-xCAT/xCAT/CFMUtils.pm +++ b/perl-xCAT/xCAT/CFMUtils.pm @@ -25,7 +25,7 @@ use xCAT::MsgUtils; =head3 initCFMdir Initialize CFM directories and files. The default layout under cfmdir is: - . + . |-- etc | |-- group.merge -> /etc/group.merge | |-- hosts -> /etc/hosts @@ -42,7 +42,7 @@ use xCAT::MsgUtils; 0 - initialize successfully 1 - initialize failed Globals: - none + none Error: none Example: @@ -116,7 +116,7 @@ sub initCFMdir Update the /etc/passwd, shadow, group merge files under specified CFM directory Arguments: - $cfmdir - CFM directory for osimage + $cfmdir - CFM directory for osimage Returns: 0 - update successfully 1 - update failed @@ -287,7 +287,7 @@ sub setCFMSynclistFile { #----------------------------------------------------------------------------- =head3 updateCFMSynclistFile - Update the synclist file(/install/osimages//synclist.cfm) for CFM function. + Update the synclist file(/install/osimages//synclist.cfm) for CFM function. It will recursively scan the files under cfmdir directory and then add them to CFM synclist file. Note: The files with suffix ".append" will be appended to the dest file(records in "APPEND:" section). @@ -778,8 +778,8 @@ sub getPkgsDiff { #----------------------------------------------------------------------------- -=head3 getIncludefiles - Get the #INCLUDE files from the given file +=head3 getIncludefiles + Get the #INCLUDE files from the given file Arguments: $file - the given file @@ -825,7 +825,7 @@ sub getIncludefiles { #----------------------------------------------------------------------------- =head3 trim - Strip left and right whitspaces for a string + Strip left and right whitspaces for a string Arguments: $string From 5607fbe58d31ea10472bb5f778beb8e6516f296d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0619/1681] Remove trailing spaces in file perl-xCAT/xCAT/CIMUtils.pm --- perl-xCAT/xCAT/CIMUtils.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/perl-xCAT/xCAT/CIMUtils.pm b/perl-xCAT/xCAT/CIMUtils.pm index d13a2e93a..749d81ec0 100644 --- a/perl-xCAT/xCAT/CIMUtils.pm +++ b/perl-xCAT/xCAT/CIMUtils.pm @@ -19,13 +19,13 @@ use Data::Dumper; A hash which includes all the parameters for accessing HTTP server. The valid parameter: ip: The IP address of the HTTP server - user: The user to access HTTP server. - password: The password for the user. + user: The user to access HTTP server. + password: The password for the user. method: The http method. (GET, PUT, POST, DELETE). Default is GET protocol: The protocol which will be used to access HTTP server. (http/https). Default is https format: The format of payload. Default is xml payload: The payload of http - + Example: my %http_params = ( ip => '192.168.1.1', port => '5989', @@ -33,7 +33,7 @@ use Data::Dumper; password => 'admin', method => 'POST', protocol => 'https'); - + =cut =head1 enum_instance () @@ -50,7 +50,7 @@ use Data::Dumper; rc - The return code. 0 - success. > 0 - fail. cim_rc - The return code from CIM server. msg - Output message. - + 2 - Array of instances, each instance is a hash contains lots of properties. 3 - The name path of instance @@ -337,14 +337,14 @@ sub set_property Description: Generate a http request. - Arguments: + Arguments: http_params: A reference to HTTP_PARAMS payload: The payload for the http request. It can be null if the payload has been set in http_params. Return: A hash reference. The valid key includes: rc - The return code. 0 - success. > 0 - fail. - msg - Output message + msg - Output message request - The generated HTTP::Request object =cut From 5a6b851df19fbfb5a8f329fe727465a63fa02e9d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0620/1681] Remove trailing spaces in file perl-xCAT/xCAT/Client.pm --- perl-xCAT/xCAT/Client.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm index 99dcbd3ff..bc090c890 100644 --- a/perl-xCAT/xCAT/Client.pm +++ b/perl-xCAT/xCAT/Client.pm @@ -267,7 +267,7 @@ sub submit_request { } else { print "warning: the client certificates under $homedir/.xcat/ are not setup correctly, please run '/opt/xcat/share/xcat/scripts/setup-local-client.sh"." $ENV{'USER'}' as 'root' to generate the client certificates; otherwise, the SSL connection between xcat client and xcatd will be setup without certificate verification and open to Man-In-The-Middle attacks.\n"; #Using the default of SSL_verify_mode of SSL_VERIFY_NONE for client is deprecated! - #need to specify SSL_verify_mode => SSL_VERIFY_NONE explicitly + #need to specify SSL_verify_mode => SSL_VERIFY_NONE explicitly $client = IO::Socket::SSL->start_SSL($pclient, SSL_verify_mode => SSL_VERIFY_NONE, Timeout => 0, @@ -1338,7 +1338,7 @@ sub handle_response { } if ($desc) { $desc = "[$msgsource]: $desc" if ($showsource && $msgsource); - print "$desc\n"; + print "$desc\n"; } } } From 06759062fbada47433ab4eb54eb867be4366da4c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0621/1681] Remove trailing spaces in file perl-xCAT/xCAT/DBobjUtils.pm --- perl-xCAT/xCAT/DBobjUtils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-xCAT/xCAT/DBobjUtils.pm b/perl-xCAT/xCAT/DBobjUtils.pm index e9745510a..6971a8d86 100755 --- a/perl-xCAT/xCAT/DBobjUtils.pm +++ b/perl-xCAT/xCAT/DBobjUtils.pm @@ -1172,10 +1172,10 @@ sub setobjdefs my $pickvalidattr=0; if ($invalidattr->{$att}->{valid} != 1) { my $tt = $invalidattr->{$att}->{valid}; - #if attribute is set invalid, check if its pre-check attribute exists in group objects, pick the attribute into valid. + #if attribute is set invalid, check if its pre-check attribute exists in group objects, pick the attribute into valid. # ex. like if I want to set hdwctrlpoint I will have - # to match the right value for mgtmethod - # if mgtmethod exists in group objects and its value match the one of only_if value, set hdwctrlpoint valid + # to match the right value for mgtmethod + # if mgtmethod exists in group objects and its value match the one of only_if value, set hdwctrlpoint valid my $conditionkey=$invalidattr->{$att}->{condition}; foreach my $tmpgrp (@tmplgrplist) { if (($DBgroupsattr{$tmpgrp}{$conditionkey}) && ($conditionlist->{$conditionkey} =~ $DBgroupsattr{$tmpgrp}{$conditionkey})) { From 3b800aec1df55bf28a52ee40d16e197ab63f23b7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0622/1681] Remove trailing spaces in file perl-xCAT/xCAT/DSHCLI.pm --- perl-xCAT/xCAT/DSHCLI.pm | 124 +++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm index 9c42d2977..6e4676cfd 100644 --- a/perl-xCAT/xCAT/DSHCLI.pm +++ b/perl-xCAT/xCAT/DSHCLI.pm @@ -414,7 +414,7 @@ sub execute_dsh =head3 _execute_dsh - Wrapper routine for execute_dsh + Wrapper routine for execute_dsh to execute actual dsh call Arguments: @@ -805,7 +805,7 @@ sub fork_fanout_dcp my @dcp_command; my $rsyncfile; - + my %envardict; foreach my $varstr (split(',',$$target_properties{'envar'})){ if($varstr =~ m/(.*)=(.*)/){ @@ -844,7 +844,7 @@ sub fork_fanout_dcp } } - + if (!$$target_properties{'localhost'}) # this is to a remote host { my $target_type = $$target_properties{'type'}; @@ -1025,8 +1025,8 @@ sub fork_fanout_dsh ) = @_; - #get username and passeword for switches - if (($$options{'devicetype'} =~ /EthSwitch/) || + #get username and passeword for switches + if (($$options{'devicetype'} =~ /EthSwitch/) || (($$options{'devicetype'} =~ /IBSwitch/) && !($$options{'user'})) ){ if (@$targets_waiting > 0) { if ($ENV{'DSH_REMOTE_PASSWORD'}) { @@ -1373,7 +1373,7 @@ sub fork_fanout_dsh #print "Command=@dsh_command\n"; #@process_info = xCAT::DSHCore->fork_output($user_target, @dsh_command); - push(@commands, \@dsh_command); + push(@commands, \@dsh_command); @process_info = xCAT::DSHCore->fork_output_for_commands($user_target, @commands); if ($process_info[0] == -2) { @@ -3292,7 +3292,7 @@ sub _resolve_nodes xdsh and just let ssh do it. Stayed to preserve the logic of the old code. Does check if the Management Node is part of the node range and sets - localhost if it is. The MN must be defined in nodelist and with + localhost if it is. The MN must be defined in nodelist and with nodetype.nodetype=mn. Arguments: @@ -3302,13 +3302,13 @@ sub _resolve_nodes Returns: None - + Globals: None - + Error: None - + Example: Comments: @@ -3335,7 +3335,7 @@ sub bld_resolve_nodes_hash xCAT::MsgUtils->message("I", $rsp, $::CALLBACK); } - + my $ostab = xCAT::Table->new('nodetype'); my %oents = %{ $ostab->getNodesAttribs(\@target_list, [qw(provmethod)]) }; @@ -3360,10 +3360,10 @@ sub bld_resolve_nodes_hash if ($ent and $ent->{provmethod} and \ ($ent->{provmethod} ne 'install') and ($ent->{provmethod} ne 'netboot') and ($ent->{provmethod} ne 'statelite')) { - my $imagename = $ent->{provmethod}; + my $imagename = $ent->{provmethod}; my $osimagetab = xCAT::Table->new('osimage', -create => 1); (my $ref) = $osimagetab->getAttribs({ imagename => $imagename }, 'environvar'); - if($ref){ + if($ref){ $envar=$ref->{'environvar'}; } } @@ -4640,7 +4640,7 @@ sub parse_and_run_dcp xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1); return; } - + if ($remotecopycommand !~ /\/(rcp|scp|rsync)$/){ my $rsp = {}; $rsp->{error}->[0] = @@ -4740,7 +4740,7 @@ sub parse_and_run_dcp { $::SYNCSN = 1; } - + # the parsing of the file will fill in an array of postscripts # need to be run if the associated file is updated @@ -4947,13 +4947,13 @@ sub parse_and_run_dcp /.../file1 /..../filex -> /...../dir1 rsync command format - /usr/bin/rsync -Lprgotz /etc/services $pathtoimage/etc/services + /usr/bin/rsync -Lprgotz /etc/services $pathtoimage/etc/services /usr/bin/rsync -Lprgotz /tmp/lissa/file1 /tmp/lissa/file $pathtoimage/tmp/lissa Arguments: Input: sync file - path to image + path to image Returns: Errors if invalid options or the executed dcp command @@ -4978,13 +4978,13 @@ sub rsync_to_image my ($input_file, $image) = @_; my $rc = 0; - + my %osimgenv; if($ENV{'XCAT_OSIMAGE_ENV'}){ foreach my $myenv(split(',',$ENV{'XCAT_OSIMAGE_ENV'})){ if($myenv =~ /\s*(\S+)\s*=\s*(\S+)\s*/) { $osimgenv{$1}=$2; - } + } } } open(INPUTFILE, "< $input_file") || die "File $input_file does not exist\n"; @@ -4996,7 +4996,7 @@ sub rsync_to_image next; } - $line=xCAT::Utils->varsubinline($line,\%osimgenv); + $line=xCAT::Utils->varsubinline($line,\%osimgenv); # process no more lines, do not exec # do not execute postscripts when syncing images @@ -5088,7 +5088,7 @@ sub rsync_to_image =head3 parse_rsync_input_file_on_MN - + This parses the -F rsync input file on the Management node. @@ -5099,7 +5099,7 @@ sub rsync_to_image /.../file1 /..../filex -> /...../dir1 /tmp/file2 -> /tmp/file2 /tmp/file2.post -> /tmp/file2.post - EXECUTE: + EXECUTE: /tmp/file2.post EXECUTEALWAYS: /tmp/myscript1 @@ -5108,11 +5108,11 @@ sub rsync_to_image . Arguments: - Input nodelist,options, pointer to the sync file,flag is + Input nodelist,options, pointer to the sync file,flag is syncing the service node and the directory to syn the files to on the service node based on defaults or the site.SNsyncfiledir attribute, - if syncing a service node for hierarchical support. + if syncing a service node for hierarchical support. Returns: Errors if invalid options or the executed dcp command @@ -5370,7 +5370,7 @@ sub parse_rsync_input_file_on_MN if($remotecopycommand !~ /\/rsync$/ and @::postscripts){ my $rsp = {}; $rsp->{error}->[0] ="key word 'EXECUTE' is unavailable when the remote copy command specified by '-r|--node-rcp' is $remotecopycommand. Does 'EXECUTEALWAYS' work for you?"; - xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1); + xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1); return 1; } @@ -5380,27 +5380,27 @@ sub parse_rsync_input_file_on_MN #------------------------------------------------------------------------------- =head3 - build_append_rsync + build_append_rsync - Handles the + Handles the APPEND: clause in the synclist /tmp/appendfile -> /tmp/receivefile Syncs the append file from the left side of the arrow to the nodes into the site.nodesyncfiledir directory - After we find out which append file are actually changed, we + After we find out which append file are actually changed, we will sync and run and the append script /opt/xcat/share/xcat/script/xdcpappend.sh See build_append_script. Returns: - Files do not exist, rsync errors. + Files do not exist, rsync errors. Globals: Error: - Files do not exist, rsync errors. + Files do not exist, rsync errors. Example: @@ -5495,9 +5495,9 @@ sub build_append_rsync #------------------------------------------------------------------------------- =head3 - build_merge_rsync + build_merge_rsync - Handles the + Handles the MERGE: clause in the synclist /tmp/mypasswd -> /etc/passwd /tmp/mygroup -> /etc/group @@ -5507,13 +5507,13 @@ sub build_append_rsync myshadow into /etc/passwd, /etc/group , /etc/shadow on the nodes. These are the only files supported from MERGE and only on Linux Returns: - Files do not exist, rsync errors. + Files do not exist, rsync errors. Globals: Error: - Files do not exist, rsync errors. + Files do not exist, rsync errors. Example: @@ -5624,7 +5624,7 @@ sub build_merge_rsync Arguments: Input nodelist,options, pointer to the sync file and - the directory to syn the files from + the directory to syn the files from based on defaults or the site.SNsyncfiledir attribute, Returns: @@ -5654,7 +5654,7 @@ sub build_merge_rsync Arguments: Input nodelist,options, pointer to the sync file and - the directory to syn the files from + the directory to syn the files from based on defaults or the site.SNsyncfiledir attribute, Returns: @@ -5758,7 +5758,7 @@ sub parse_rsync_input_file_on_SN # xCAT supports the syncfile format: # file -> file # file -> (noderange for permitted nodes) file - if ($line =~ /(.+) -> (.+)/ || $line =~ /(.+) -> +\((.+)\) +(.+)/) + if ($line =~ /(.+) -> (.+)/ || $line =~ /(.+) -> +\((.+)\) +(.+)/) { $process_line = 1; my $src_file; @@ -5875,7 +5875,7 @@ sub parse_rsync_input_file_on_SN if($remotecopycommand !~ /\/rsync$/ and @::postscripts){ my $rsp = {}; $rsp->{error}->[0] ="key word 'EXECUTE' is unavailable when the remote copy command specified by '-r|--node-rcp' is $remotecopycommand. Does 'EXECUTEALWAYS' work for you?"; - xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1); + xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1); return 1; } @@ -5885,7 +5885,7 @@ sub parse_rsync_input_file_on_SN #------------------------------------------------------------------------------- =head3 - run_rsync_postscripts + run_rsync_postscripts This executes the postscript file on the nodes where the corresponding rsync file was updated @@ -5895,20 +5895,20 @@ sub parse_rsync_input_file_on_SN For example: node1: tmp/test/file1 ( yes it leaves the first / off) This routine must match that list to the input list of postscripts. If there is a match, for example - The postscript file is /tmp/test/file1.post and tmp/test/file1 was - updated, then it builds a xdsh command to the node to run + The postscript file is /tmp/test/file1.post and tmp/test/file1 was + updated, then it builds a xdsh command to the node to run /tmp/test/file1.post. On the service node, the file will be in $syncdir/tmp/test/file1.post. - Also the routine must preserve all other messages returned from rsync, - to return to the admin. It will remove the messages that the files + Also the routine must preserve all other messages returned from rsync, + to return to the admin. It will remove the messages that the files were updated, that is all of from hostname: . Input: the output from the xdcp rsync run : @::postscripts to run Comments: Needs to remove the lines from rsync that are return to let - me know files were updated from the output to determine which - postscripts to run and leave any other messages + me know files were updated from the output to determine which + postscripts to run and leave any other messages to return to the admin. =cut @@ -5991,31 +5991,31 @@ sub run_rsync_postscripts #------------------------------------------------------------------------------- =head3 - &bld_and_run_append + &bld_and_run_append This builds the parm list and executes (xdsh) the append script file on the nodes where the corresponding append file was updated. - The append postscript has been previous sync'd to the nodes. + The append postscript has been previous sync'd to the nodes. These are the scripts after APPEND: in the syncfile rsync returns a list of files that have been updated in the form hostname: For example: node1: tmp/test/file1 ( yes it leaves the first / off) This routine must match that list to the input list of append files. - If there is a match, it will add the append function to - the append script + If there is a match, it will add the append function to + the append script Input: the output from the xdcp rsync run : @::appendlines to run Comments: Needs to remove the lines from rsync that are return to let - me know files were updated from the output to determine which - postscripts to run and leave any other messages + me know files were updated from the output to determine which + postscripts to run and leave any other messages to return to the admin. Runs xdsh with input to call /opt/xcat/share/xcat/scripts/xdcpappend.sh - which will perform the append function on the node. + which will perform the append function on the node. Input is the nodesyncfiledir appendfile:orgfile appendfile2:orgfile2.... =cut @@ -6130,31 +6130,31 @@ sub bld_and_run_append #------------------------------------------------------------------------------- =head3 - &bld_and_run_merge + &bld_and_run_merge This builds the parm list and executes (xdsh) the merge script file on the nodes where the corresponding merge file was updated. - The merge script has been previous sync'd to the nodes. + The merge script has been previous sync'd to the nodes. These are the scripts after MERGE: in the syncfile rsync returns a list of files that have been updated in the form hostname: For example: node1: tmp/test/file1 ( yes it leaves the first / off) This routine must match that list to the input list of merge files. - If there is a match, it will add the merge function to - the merge script + If there is a match, it will add the merge function to + the merge script Input: the output from the xdcp rsync run : @::mergelines to run Comments: Needs to remove the lines from rsync that are return to let - me know files were updated from the output to determine which - postscripts to run and leave any other messages + me know files were updated from the output to determine which + postscripts to run and leave any other messages to return to the admin. Runs xdsh with input to call /opt/xcat/share/xcat/scripts/xdcpmerge.sh - which will perform the merge function on the node. + which will perform the merge function on the node. Input is the nodesyncfiledir mergefile1:orgfile mergefile2:orgfile2....] Note: MERGE is only support on Linux and for /etc/passwd,/etc/shadow, and /etc/group =cut @@ -6281,10 +6281,10 @@ sub bld_and_run_merge #------------------------------------------------------------------------------- =head3 - run_always_rsync_postscript + run_always_rsync_postscript This subroutine runs the xdsh command for all the scripts listed in the - EXECUTEALWAYS: clause of the synclist file. + EXECUTEALWAYS: clause of the synclist file. =cut @@ -6686,7 +6686,7 @@ sub show_dsh_config #------------------------------------------------------------------------------- -=head3 +=head3 get_config Substitute specific keywords in hash From 1f4bd04b72f2923b9987a4c925da8931bcda777c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0623/1681] Remove trailing spaces in file perl-xCAT/xCAT/DSHCore.pm --- perl-xCAT/xCAT/DSHCore.pm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/perl-xCAT/xCAT/DSHCore.pm b/perl-xCAT/xCAT/DSHCore.pm index 4ac392bdf..381e44b94 100644 --- a/perl-xCAT/xCAT/DSHCore.pm +++ b/perl-xCAT/xCAT/DSHCore.pm @@ -29,13 +29,13 @@ use xCAT::Utils; Returns: $pid - process identifer for the forked process - + Globals: None - + Error: None - + Example: $pid = xCAT::DSHCore->fork_no_output('hostname1PID', @command_array); @@ -94,13 +94,13 @@ sub fork_no_output Returns: $pid - process identifer for the forked process - + Globals: None - + Error: None - + Example: $pid = xCAT::DSHCore->fork_no_output('hostname1PID', @command_array); @@ -168,7 +168,7 @@ sub fork_output Forks a process for the given command array and returns the process ID for the forked process and references to all I/O pipes for STDOUT and STDERR. In the child process, it will invoke the xCAT::DSHCore->fork_no_output() - for the first command which is a no-output command and waitpid(). And then execute + for the first command which is a no-output command and waitpid(). And then execute the left commands in the child process. Arguments: @@ -177,13 +177,13 @@ sub fork_output Returns: $pid - process identifer for the forked process - + Globals: None - + Error: None - + Example: $pid = xCAT::DSHCore->fork_output_for_commands('hostname1PID', @command_array); @@ -274,13 +274,13 @@ sub fork_output_for_commands Returns: 1 if the EOF reached on $read_fh undef otherwise - + Globals: None - + Error: None - + Example: Comments: @@ -479,13 +479,13 @@ sub pipe_handler Returns: 1 if the EOF reached on $read_fh undef otherwise - + Globals: None - + Error: None - + Example: Comments: @@ -640,13 +640,13 @@ sub pipe_handler_buffer Returns: @no_response - list of hostnames that did not respond undef if fping is not installed - + Globals: None - + Error: None - + Example: @bad_hosts = xCAT::DSHCore->ping_hostnames(@host_list); From db4d64ee6c6611cbd8604fd3e278bb6a5d495b13 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0624/1681] Remove trailing spaces in file perl-xCAT/xCAT/DiscoveryUtils.pm --- perl-xCAT/xCAT/DiscoveryUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/xCAT/DiscoveryUtils.pm b/perl-xCAT/xCAT/DiscoveryUtils.pm index 874387517..0cbcffa77 100644 --- a/perl-xCAT/xCAT/DiscoveryUtils.pm +++ b/perl-xCAT/xCAT/DiscoveryUtils.pm @@ -9,10 +9,10 @@ $XML::Simple::PREFERRED_PARSER = 'XML::Parser'; use xCAT::MsgUtils; -=head3 update_discovery_data +=head3 update_discovery_data Update the discovery data from the xcat request to discoverydata table to indicate the discovery events arg1 - the request - + =cut sub update_discovery_data { From ef4211bd32ddd3b7e86d160f9e793d9eecba0db2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0625/1681] Remove trailing spaces in file perl-xCAT/xCAT/ExtTab.pm --- perl-xCAT/xCAT/ExtTab.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/perl-xCAT/xCAT/ExtTab.pm b/perl-xCAT/xCAT/ExtTab.pm index f97312e13..133a506bd 100644 --- a/perl-xCAT/xCAT/ExtTab.pm +++ b/perl-xCAT/xCAT/ExtTab.pm @@ -119,9 +119,9 @@ foreach (@extSchema) { =head3 updateTables - It is called by xcatd to generate the user-defined tables - if they do not exist, it also updates the tables if there is - a schema change. + It is called by xcatd to generate the user-defined tables + if they do not exist, it also updates the tables if there is + a schema change. =cut @@ -141,14 +141,14 @@ sub updateTables #-------------------------------------------------------------------------- -=head3 +=head3 Note this is a copy of the one in Table.pm but we cannot use any of the xCAT perl libraries in this routine,since the function was done in the Begin block. - Description: get_filelist + Description: get_filelist Arguments: - directory,filelist,type + directory,filelist,type Returns: The list of sql files to be processed which consists of all the files with .sql and _.sql @@ -228,15 +228,15 @@ sub get_filelist #-------------------------------------------------------------------------- -=head3 +=head3 Note this is a copy of the one in Table.pm but we cannot use any of the xCAT perl libraries in this routine,since the function was done in the - Description: get_xcatcfg + Description: get_xcatcfg Arguments: - none + none Returns: the database name from /etc/xcat/cfgloc or sqlite Globals: From 6a94b4f31a201476fd7814ed21299290397441ad Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0626/1681] Remove trailing spaces in file perl-xCAT/xCAT/FSPUtils.pm --- perl-xCAT/xCAT/FSPUtils.pm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/perl-xCAT/xCAT/FSPUtils.pm b/perl-xCAT/xCAT/FSPUtils.pm index 5320078b6..397f50fe2 100644 --- a/perl-xCAT/xCAT/FSPUtils.pm +++ b/perl-xCAT/xCAT/FSPUtils.pm @@ -32,16 +32,16 @@ use xCAT::MsgUtils qw(verbose_message); #------------------------------------------------------------------------------- -=head3 getHcpAttribs +=head3 getHcpAttribs Description: Build 2 Hashes from ppc/vpd table - one hash is : CEC/Frame is the Key, FSPs/BPAs are the value. + one hash is : CEC/Frame is the Key, FSPs/BPAs are the value. the other is: fsp/bpa is the key, the side is the value. Arguments: $request: this hash will be usded to store the ppc hash and vpd hash $tabs: the hash store the new tables for ppc and bpd. - Returns: + Returns: Globals: none Error: @@ -105,18 +105,18 @@ sub getHcpAttribs #------------------------------------------------------------------------------- -=head3 getIPaddress - Description: +=head3 getIPaddress + Description: Used by DFM related functions. When getting the IPs for CECs' FSPs, or getting the IPs for Frames' BPAs. And the IPs order is A-0,A-1,B-0,B-1. When getting the IP for one FSP or one BPA, if the $nodetocheck it one IP, it will return the IP immediately; if not, it will get the IP of the FSP or BPA. - + Arguments: - $request: Because getIPaddress() is always used for one node after the process fork. Avoiding to + $request: Because getIPaddress() is always used for one node after the process fork. Avoiding to access the DB for each node in the subprocess, we should collect the attributs before process fork, and put the attributes in the $request variable. For the getIpaddress(). - The $request parameter should include the ppc hash which mapping the CEC->FSPs and + The $request parameter should include the ppc hash which mapping the CEC->FSPs and Frames->BPAs, and vpd hash the fsp->side and the bpa->side. $type: the type of the $nodetocheck $nodetocheck: Node name, only one node at a time. @@ -248,11 +248,11 @@ sub getIPaddress =head3 fsp_api_action Description: - invoke the fsp_api to perform the functions + invoke the fsp_api to perform the functions Arguments: - $node_name: - $attrs: an attributes hash + $node_name: + $attrs: an attributes hash $action: the operations on the fsp, bpa or lpar $tooltype: 0 for HMC, 1 for HNM Returns: @@ -428,11 +428,11 @@ sub fsp_api_action { =head3 fsp_state_action Description: - invoke the fsp_api to perform the functions(all_lpars_state) + invoke the fsp_api to perform the functions(all_lpars_state) Arguments: - $node_name: - $attrs: an attributes hash + $node_name: + $attrs: an attributes hash $action: the operations on the fsp, bpa or lpar $tooltype: 0 for HMC, 1 for HNM Returns: @@ -522,11 +522,11 @@ sub fsp_state_action { =head3 fsp_api_create_partition Description: - invoke the fsp_api to perform the functions + invoke the fsp_api to perform the functions Arguments: - $node_name: - $attrs: an attributes hash + $node_name: + $attrs: an attributes hash $action: the operations on the fsp, bpa or lpar $tooltype: 0 for HMC, 1 for HNM Returns: From d98c87ff00fc5d65e90f471863b88c3e6c7d8abd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0627/1681] Remove trailing spaces in file perl-xCAT/xCAT/InstUtils.pm --- perl-xCAT/xCAT/InstUtils.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/perl-xCAT/xCAT/InstUtils.pm b/perl-xCAT/xCAT/InstUtils.pm index a8f987b34..ce5a8a112 100755 --- a/perl-xCAT/xCAT/InstUtils.pm +++ b/perl-xCAT/xCAT/InstUtils.pm @@ -183,7 +183,7 @@ sub myxCATname returns 1 if the hostname is the node I am running on - Gets all the interfcaes defined on this node and sees if + Gets all the interfcaes defined on this node and sees if any of them match the IP of the hostname passed in Arguments: @@ -610,7 +610,7 @@ sub restore_request =head3 taghash - Add a non-numeric tag to any hash keys that are numeric. + Add a non-numeric tag to any hash keys that are numeric. Arguments: Returns: @@ -665,11 +665,11 @@ sub taghash Comments: Based on "os" attr of node definition. If attr is not set, - defaults to OS of current system. + defaults to OS of current system. Example: - my ($rc, $AIXnodes, $Linuxnodes) - = xCAT::InstUtils->getOSnodes(\@noderange) + my ($rc, $AIXnodes, $Linuxnodes) + = xCAT::InstUtils->getOSnodes(\@noderange) =cut @@ -713,7 +713,7 @@ sub getOSnodes =head3 get_server_nodes - Determines the server node names as known by a lists of nodes. + Determines the server node names as known by a lists of nodes. Arguments: $nodes: A list of node names. From 4100f445d42dcf884b04472b13598e0d336a905e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0628/1681] Remove trailing spaces in file perl-xCAT/xCAT/KitPluginUtils.pm --- perl-xCAT/xCAT/KitPluginUtils.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/perl-xCAT/xCAT/KitPluginUtils.pm b/perl-xCAT/xCAT/KitPluginUtils.pm index 082c93b65..a3ea7b21d 100644 --- a/perl-xCAT/xCAT/KitPluginUtils.pm +++ b/perl-xCAT/xCAT/KitPluginUtils.pm @@ -28,13 +28,13 @@ require xCAT::Table; Returns: Return hash table which indexes the node names by kitname (ref) - e.g., + e.g., { "kitname1" => ["node11","node12",...], "kitname2" => ["node21","node22",...] ... } - Examples: + Examples: my @nodes = ("node11", "node12",...); my $result = xCAT::KitPluginUtils->get_kits_used_by_nodes(\@nodes); @@ -89,20 +89,20 @@ sub get_kits_used_by_nodes { =head3 get_kits_used_by_osimages Get the kits used by a list of osimages. An osimage - uses a kit if one or more of the kit's components + uses a kit if one or more of the kit's components are associated with the osimage. Arguments: list of osimage names (ref) Returns: Return hash table which indexes the osimage names by kitname (ref) - e.g., + e.g., { "kitname1" => ["osimage11","osimage12",...], "kitname2" => ["osimage21","osimage22",...] ... } - Examples: + Examples: my @osimages = ("osimage11","osimage12", ...); my $result = xCAT::KitPluginUtils->get_kits_used_by_osimages(\@osimages); @@ -176,15 +176,15 @@ sub get_kits_used_by_osimages { Arguments: list of image profile names (ref) - Returns: Return hash table which indexes the image + Returns: Return hash table which indexes the image profile names by kitname (ref) - e.g., + e.g., { "kitname1" => ["imgprofile11","imgprofile12",...], "kitname2" => ["imgprofile21","imgprofile22",...] ... } - Examples: + Examples: my @imgprofiles = ("imgprofile11","imgprofile12",...); my $result = xCAT::KitPluginUtils->get_kits_used_by_image_profiles(\@imgprofiles); From e57395aa0b71daf91f79ef2dbed2b2db743568fb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0629/1681] Remove trailing spaces in file perl-xCAT/xCAT/MacMap.pm --- perl-xCAT/xCAT/MacMap.pm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm index 9d2cd803a..a3cf3acbe 100644 --- a/perl-xCAT/xCAT/MacMap.pm +++ b/perl-xCAT/xCAT/MacMap.pm @@ -90,14 +90,14 @@ sub namesmatch { MacMap attempts to do it's best to determine whether or not a particular SNMP description of a port matches the user specified value in the configuration. Generally, if the configuration consists of non-stacked switches without line cards, the user should only need to specify the -port number without any characters or / characters. If the configuration contains line cards -or stacked switches, use of that particular switch's appropriate / syntax in generally called -for. The exception being stacked SMC 8848 switches, in which all ports are still single +port number without any characters or / characters. If the configuration contains line cards +or stacked switches, use of that particular switch's appropriate / syntax in generally called +for. The exception being stacked SMC 8848 switches, in which all ports are still single numbers, and the ports on the second switch begin at 57. -If difficulty is encountered, or a switch is attempted with a format that doesn't match any +If difficulty is encountered, or a switch is attempted with a format that doesn't match any existing rule, it is recommended to use snmpwalk on the switch with the .1.3.6.1.2.1.31.1.1.1.1 -OID, and have the switch table port value match exactly the format suggested by that OID. +OID, and have the switch table port value match exactly the format suggested by that OID. =cut @@ -267,7 +267,7 @@ sub scan_qbridge_vlans { Descriptions: Retrieve information (switchport and the mac addresses got for that port) for the specified switch or all switches if no specified. Arguments: - $req: the xcat request hash + $req: the xcat request hash $callback: the function to output information Returns: The hash variable store retrieved inforamtions @@ -368,7 +368,7 @@ sub dump_mac_info { } @{ $ret{$switch}->{$snmpportname}->{MACaddress} } = @{ $self->{macinfo}->{$switch}->{$snmpportname} }; @{ $ret{$switch}->{$snmpportname}->{Vlanid} } = @{ $self->{vlaninfo}->{$switch}->{$snmpportname} }; - @{ $ret{$switch}->{$snmpportname}->{Mtu} } = @{ $self->{mtuinfo}->{$switch}->{$snmpportname} }; + @{ $ret{$switch}->{$snmpportname}->{Mtu} } = @{ $self->{mtuinfo}->{$switch}->{$snmpportname} }; } } } @@ -408,7 +408,7 @@ sub find_mac { #If requesting a cache only check or the cache is a mere 20 seconds old #don't bother querying switches if ($cachedonly or ($self->{timestamp} > (time() - 20))) { return undef; } - + my $runstart = time; $self->refresh_table($discover_switch); #not cached or stale cache, refresh my $runstop = time; @@ -498,7 +498,7 @@ sub refresh_table { #Build hash of switch port names per switch $self->{switches} = {}; - + #get nodetype from nodetype table, build a temp hash my $typehash; my $ntable = xCAT::Table->new('nodetype'); @@ -719,7 +719,7 @@ sub refresh_switch { if($self->{switchparmhash}->{$switch}->{switchtype} eq 'onie'){ #for cumulus switch, the MAC table can be retrieved with ssh - #which is much faster than snmp + #which is much faster than snmp my $mymac; my $myport; @@ -735,11 +735,11 @@ sub refresh_switch { foreach (@res){ if($_ =~ m/^([0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}) dev swp([0-9]+) vlan ([0-9]+) .*/){ $mymac=$1; - $myport=$2; + $myport=$2; $myport=sprintf("%d",$myport); my $macport=$2; my $macvlan=$3; - + #try all the possible port number formats #e.g, "5","swp5","05","swp05" unless(exists $self->{switches}->{$switch}->{$myport}){ @@ -821,7 +821,7 @@ sub refresh_switch { $self->{macinfo}->{$switch}->{ErrorStr} = "This command does not support Mellanox IB Switch"; return; } - } + } last; } @@ -962,7 +962,7 @@ sub refresh_switch { # Skip "permanent" ports if (!defined($mactostate->{$_}) || $mactostate->{$_} != 4) { push @{ $index_to_mac{$index} }, $macstring; - push @{ $index_to_vlan{$index} }, $vlan; + push @{ $index_to_vlan{$index} }, $vlan; } } foreach my $boid (keys %$bridgetoifmap) { From 019ee7ee817ea3702c045a3a8e89f7c7706d97fa Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0630/1681] Remove trailing spaces in file perl-xCAT/xCAT/MsgUtils.pm --- perl-xCAT/xCAT/MsgUtils.pm | 94 +++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/perl-xCAT/xCAT/MsgUtils.pm b/perl-xCAT/xCAT/MsgUtils.pm index d4876281e..466110fd1 100644 --- a/perl-xCAT/xCAT/MsgUtils.pm +++ b/perl-xCAT/xCAT/MsgUtils.pm @@ -73,13 +73,13 @@ This program module file, supports the xcat messaging and logging If address of the callback is not provide, then the message will be displayed to STDERR or STDOUT or added to SYSLOG. See flags below. - - If logging (L) is requested, the message structure - must be a simple string. The routine will convert - it to the appropriate callback structure, if a callback + + If logging (L) is requested, the message structure + must be a simple string. The routine will convert + it to the appropriate callback structure, if a callback is provided. Note for logging xCAT:MsgUtils->start_logging and - xCAT:MstUtils->stop_logging must be used to + xCAT:MstUtils->stop_logging must be used to open and close the log. For compatibility with existing code, the message routine will @@ -120,31 +120,31 @@ This program module file, supports the xcat messaging and logging routine and only use the I flag for the message. If V flag is detected, it will be changed to an I flag. W - warning this is displayed/logged by daemon/Client.pm. - L - Log error to xCAT Log on the local machine. + L - Log error to xCAT Log on the local machine. Routine must have setup log by calling - MsgUtils->start_log routine which returns + MsgUtils->start_log routine which returns $::LOG_FILE_HANDLE. Log is closed with MsgUtils->stop_log routine. Note can be combined with other flags: - LS - Log to xCAT Log and Syslog + LS - Log to xCAT Log and Syslog LSE/LSI - Log to xCAT Log and Syslog and display if this option is used the message must be a simple string. The message routine will format for callback - based on the (D,E,I,W) flag. - + based on the (D,E,I,W) flag. + Here's the meaning of the 1st character, if no callback specified: D - DATA goes to STDOUT E - error. This type of message will be sent to STDERR. si - informational status info (sinfo) - I - informational goes to STDOUT + I - informational goes to STDOUT N - Node informational goes to STDOUT S - Message will be logged to syslog ( severe error) Note S can be combined with other flags for example SE logs message to syslog and is sent to STDERR. SA logs message to syslog and to the auditlog DB table. (only xcatd) - A logs message auditlog DB table only. (only for xcatd) + A logs message auditlog DB table only. (only for xcatd) V - verbose. This flag is not valid, the calling routine should check for verbose mode before calling the message @@ -158,7 +158,7 @@ This program module file, supports the xcat messaging and logging $::LOG_FILE_HANDLE. Log is closed with MsgUtils->stop_log routine. Note can be combined with other flags: - LS - Log to xCAT Log and Syslog + LS - Log to xCAT Log and Syslog LSE/LSI - Log to xCAT Log and Syslog and display Returns: @@ -177,39 +177,39 @@ This program module file, supports the xcat messaging and logging # Message to STDERR xCAT::MsgUtils->message('E', "Operation $value1 failed\n"); - # Message to Syslog + # Message to Syslog xCAT::MsgUtils->message('S', "Host $host not responding\n"); - # Message to Syslog and auditlog table (only used by xcatd) + # Message to Syslog and auditlog table (only used by xcatd) # see tabdump -d auditlog my $rsp = {}; $rsp->{syslogdata}->[0] = "$host not responding\n"; # for syslog # the next data is for auditlog table, audittime added below - $rsp->{userid} ->[0] = $user; - $rsp->{clientname} -> [0] = $client; - $rsp->{clienttype} -> [0] = $clienttype; - $rsp->{command} -> [0] = $command; - $rsp->{noderange} -> [0] = $noderange; - $rsp->{args} -> [0] = $arguments; - $rsp->{status} -> [0] = $status; + $rsp->{userid} ->[0] = $user; + $rsp->{clientname} -> [0] = $client; + $rsp->{clienttype} -> [0] = $clienttype; + $rsp->{command} -> [0] = $command; + $rsp->{noderange} -> [0] = $noderange; + $rsp->{args} -> [0] = $arguments; + $rsp->{status} -> [0] = $status; xCAT::MsgUtils->message('SA', $rsp); - # Message to only auditlog table (only used by xcatd) + # Message to only auditlog table (only used by xcatd) # see tabdump -d auditlog my $rsp = {}; - $rsp->{userid} ->[0] = $user; - $rsp->{clientname} -> [0] = $client; - $rsp->{clienttype} -> [0] = $clienttype; - $rsp->{command} -> [0] = $command; - $rsp->{noderange} -> [0] = $noderange; - $rsp->{args} -> [0] = $arguments; - $rsp->{status} -> [0] = $status; + $rsp->{userid} ->[0] = $user; + $rsp->{clientname} -> [0] = $client; + $rsp->{clienttype} -> [0] = $clienttype; + $rsp->{command} -> [0] = $command; + $rsp->{noderange} -> [0] = $noderange; + $rsp->{args} -> [0] = $arguments; + $rsp->{status} -> [0] = $status; xCAT::MsgUtils->message('A', $rsp); - # Message to Log and Syslog + # Message to Log and Syslog xCAT::MsgUtils->message('LS', "Host $host not responding\n"); - # Message to Log + # Message to Log xCAT::MsgUtils->message('L', "Host $host not responding\n"); Use with callback @@ -273,7 +273,7 @@ This program module file, supports the xcat messaging and logging Returns: - 1 for internal error ( invalid input to the routine) + 1 for internal error ( invalid input to the routine) @@ -669,10 +669,10 @@ sub warn_message $msg = "Host not responding\n"; xCAT::MsgUtils->message("L", $msg); . - + my $rc=xCAT::MsgUtils->stop_logging(); # close log - + =cut #-------------------------------------------------------------------------------- @@ -680,7 +680,7 @@ sub warn_message =head3 start_logging Start logging messages to a logfile. Return the log file handle so it - can be used for updates and to close the file when done logging + can be used for updates and to close the file when done logging using stop_logging. Arguments: @@ -791,9 +791,9 @@ sub stop_logging =head3 backup_logfile - Backup the current logfile. Move logfile to logfile.1. + Backup the current logfile. Move logfile to logfile.1. Shift all other logfiles - (logfile.[1-3]) up one number. The original logfile.4 is removed as in a FIFO. + (logfile.[1-3]) up one number. The original logfile.4 is removed as in a FIFO. Arguments: $logfile ( full path) @@ -852,23 +852,23 @@ sub verbose_message =head3 trace Display different level trace message in syslog. - + Arguments: - $verbose: indicate whether current command is with -V option. 1 is yes and 0 is no. + $verbose: indicate whether current command is with -V option. 1 is yes and 0 is no. $level: the level of trace message, can be one of "I","W","E","D","i","w","e","d". "I" or "i": means information level. "W" or "w": means warning level. "E" or "e": means error level. "D" or "d": means debug level. - + As long as the trace subroutine is called, "information", "warning" and "error" level message will be displayed in syslog. The "debug" level message is displayed in syslog only when any one of the below two conditions is true 1. The current command with -V option. i.e. $verbose=1. - 2. The xcatdebugmode, which is an attribute of site table, equals 1. - + 2. The xcatdebugmode, which is an attribute of site table, equals 1. + If $level is not any one of "I","W","E","D","i","w","e","d", the trace subroutine do nothing. - - $logcontent: the specific message wanted to be displayed in syslog + + $logcontent: the specific message wanted to be displayed in syslog Returns: none @@ -877,7 +877,7 @@ sub verbose_message Note: Label "xcat" and trace message level, such as "INFO", "ERR", "WARNING" AND "DEBUG", will be added before real trace message automatically. It's convenient to filter in syslog. - + Example: xCAT::MsgUtils->trace(1,"D","this is debug trace message"); xCAT::MsgUtils->trace(0,"i","this is information trace message"); @@ -988,7 +988,7 @@ sub perf_log_process =cut #----------------------------------------------------------------- -sub report_node_error +sub report_node_error { shift; my ($cb, $node, $msg) = @_; From 6eed2ff63e2d9e29dc4f3ef45583063e7a7d6f9b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0631/1681] Remove trailing spaces in file perl-xCAT/xCAT/NetworkUtils.pm --- perl-xCAT/xCAT/NetworkUtils.pm | 164 ++++++++++++++++----------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm index 7dba4a965..7e34e7d81 100755 --- a/perl-xCAT/xCAT/NetworkUtils.pm +++ b/perl-xCAT/xCAT/NetworkUtils.pm @@ -47,15 +47,15 @@ This program module file, is a set of network utilities used by xCAT commands. Gets the network domain for a list of nodes - The domain value comes from the network definition + The domain value comes from the network definition associated with the node ip address. - If the network domain is not set then the default is to + If the network domain is not set then the default is to use the site.domain value Arguments: list of nodes - Returns: + Returns: error - undef success - hash ref of domains for each node Globals: @@ -99,18 +99,18 @@ sub getNodeDomains() #------------------------------------------------------------------------------- -=head3 gethostnameandip +=head3 gethostnameandip Works for both IPv4 and IPv6. - Takes either a host name or an IP address string - and performs a lookup on that name, + Takes either a host name or an IP address string + and performs a lookup on that name, returns an array with two elements: the hostname, the ip address - if the host name or ip address can not be resolved, + if the host name or ip address can not be resolved, the corresponding element in the array will be undef Arguments: hostname or ip address Returns: the hostname and the ip address Globals: - + Error: none Example: @@ -139,13 +139,13 @@ sub gethostnameandip() =head3 gethostname Works for both IPv4 and IPv6. Takes an IP address string and performs a lookup on that name, - returns the hostname of the ip address + returns the hostname of the ip address if the ip address can not be resolved, returns undef Arguments: ip address Returns: the hostname Globals: - cache: %::iphosthash + cache: %::iphosthash Error: none Example: @@ -237,7 +237,7 @@ sub gethostname() Error: none Example: - my $ip = xCAT::NetworkUtils->getipaddr($hostname); + my $ip = xCAT::NetworkUtils->getipaddr($hostname); Comments: none =cut @@ -317,7 +317,7 @@ sub getipaddr @addrinfo=Socket6::getaddrinfo($iporhost, 0, $reqfamily, SOCK_STREAM, 6,Socket6::AI_NUMERICHOST()); }else{ @addrinfo=Socket6::getaddrinfo($iporhost, 0, $reqfamily, SOCK_STREAM, 6); - } + } my ($family, $socket, $protocol, $ip, $name) = splice(@addrinfo, 0, 5); unless($reqfamily == AF_INET6){ if($isip){ @@ -369,9 +369,9 @@ sub getipaddr { return undef; } - + my $myip=inet_ntoa($packed_ip); - + unless($isip) { $::hostiphash{$iporhost}{hostip}=$myip; } @@ -409,7 +409,7 @@ sub clearcache #------------------------------------------------------------------------------- =head3 linklocaladdr - Only for IPv6. + Only for IPv6. Takes a mac address, calculate the IPv6 link local address Arguments: mac address @@ -419,7 +419,7 @@ sub clearcache Error: none Example: - my $linklocaladdr = xCAT::NetworkUtils->linklocaladdr($mac); + my $linklocaladdr = xCAT::NetworkUtils->linklocaladdr($mac); Comments: none =cut @@ -474,7 +474,7 @@ sub linklocaladdr { chcek if the ip address is in the subnet Arguments: ip address, netmask, subnet - Returns: + Returns: 1 - if the ip address is in the subnet 0 - if the ip address is NOT in the subnet Globals: @@ -510,7 +510,7 @@ sub ishostinsubnet{ } elsif($mask =~ /^0x/i ) { $maskType=2; } - } + } my $ret=xCAT::NetworkUtils::isInSameSubnet( $ip, $subnet, $mask, $maskType); if(defined $ret and $ret==1){ @@ -630,7 +630,7 @@ sub setup_ipv6_forwarding Arguments: prefix length Returns: - netmask - netmask like ffff:ffff:ffff:ffff:0000:0000:0000:0000 + netmask - netmask like ffff:ffff:ffff:ffff:0000:0000:0000:0000 0 - if the prefix length is not correct Globals: Error: @@ -659,7 +659,7 @@ sub prefixtomask { #------------------------------------------------------------------------------- -=head3 my_ip_in_subnet +=head3 my_ip_in_subnet Get the facing ip for some specific network Arguments: @@ -696,8 +696,8 @@ sub my_ip_in_subnet #------------------------------------------------------------------------------- -=head3 ip_forwarding_enabled - Check if the ip_forward enabled on the system +=head3 ip_forwarding_enabled + Check if the ip_forward enabled on the system Arguments: Returns: @@ -958,23 +958,23 @@ sub my_hexnets Description: Get the hostname of an IP addresses. First from hosts table, and then try system resultion. If there is a shortname, it will be returned. Otherwise it will return long name. If the IP cannot be resolved, return undef; - + Arguments: $ip: the IP to get; - - Returns: + + Returns: Return: the hostname. For an example - + Globals: none - + Error: none - + Example: xCAT::NetworkUtils::get_host_from_ip('192.168.200.1') - + Comments: =cut @@ -989,23 +989,23 @@ sub get_host_from_ip =head3 isPingable Description: Check if an IP address can be pinged - + Arguments: $ip: the IP to ping; - - Returns: + + Returns: Return: 1 indicates yes; 0 indicates no. For an example - + Globals: none - + Error: none - + Example: xCAT::NetworkUtils::isPingable('192.168.200.1') - + Comments: none =cut @@ -1044,25 +1044,25 @@ sub isPingable =head3 my_nets Description: Return a hash ref that contains all subnet and netmask on the mn (or sn). This subroutine can be invoked on both Linux and AIX. - + Arguments: none. - - Returns: + + Returns: Return a hash ref. Each entry will be: =>; For an example: '192.168.200.0/255.255.255.0' => '192.168.200.246'; For an example - + Globals: none - + Error: none - + Example: xCAT::NetworkUtils::my_nets(). - + Comments: none =cut @@ -1208,7 +1208,7 @@ sub my_if_netmap Returns my ip address in the same network with the specified node Linux only Arguments: - nodename + nodename Returns: result and error message or my ip address 1. If node can not be resolved, the return info will be like this: @@ -1216,7 +1216,7 @@ sub my_if_netmap 2. If no IP found that matching the giving node, the return info will be: [2, "The IP address of node $node is in an undefined subnet"]. 3. If IP found: - [0,ip1,ip2,...] + [0,ip1,ip2,...] Globals: none Error: @@ -1276,10 +1276,10 @@ sub my_ip_facing #------------------------------------------------------------------------------- =head3 my_ip_facing_aix - Returns my ip address + Returns my ip address AIX only Arguments: - nodename + nodename Returns: Globals: none @@ -1336,7 +1336,7 @@ sub my_ip_facing_aix =head3 formatNetmask Description: Transform netmask to one of 3 formats (255.255.255.0, 24, 0xffffff00). - + Arguments: $netmask: the original netmask $origType: the original netmask type. The valid value can be 0, 1, 2: @@ -1344,19 +1344,19 @@ sub my_ip_facing_aix Type 1: 24 Type 2: 0xffffff00 $newType: the new netmask type, valid values can be 0,1,2, as above. - - Returns: + + Returns: Return undef if any error. Otherwise return the netmask in new format. - + Globals: none - + Error: none - + Example: xCAT::NetworkUtils::formatNetmask( '24', 1, 0); #return '255.255.255.0'. - + Comments: none =cut @@ -1407,7 +1407,7 @@ sub formatNetmask =head3 isInSameSubnet Description: Check if 2 given IP addresses are in same subnet - + Arguments: $ip1: the first IP $ip2: the second IP @@ -1416,20 +1416,20 @@ sub formatNetmask Type 1: 24 Type 2: 0xffffff00 $masktype: the netmask type, 3 possible values: 0,1,2, as indicated above - - Returns: + + Returns: 1: they are in same subnet undef: not in same subnet - + Globals: none - + Error: none - + Example: xCAT::NetworkUtils::isInSameSubnet( '192.168.10.1', '192.168.10.2', '255.255.255.0', 0); - + Comments: none =cut @@ -1649,8 +1649,8 @@ sub nodeonmynet =head3 getNodeIPaddress Arguments: - Node name only one at a time - Returns: ip address(s) + Node name only one at a time + Returns: ip address(s) Globals: none Error: @@ -1694,7 +1694,7 @@ sub getNodeIPaddress =head3 checkNodeIPaddress Arguments: - Node name only one at a time + Node name only one at a time Returns: a hash object contains IP or Error Globals: none @@ -1939,7 +1939,7 @@ sub gethost_ips #------------------------------------------------------------------------------- -=head3 get_subnet_aix +=head3 get_subnet_aix Description: To get present subnet configuration by parsing the output of 'netstat'. Only designed for AIX. Arguments: @@ -1948,7 +1948,7 @@ sub gethost_ips @aix_nrn : An array with entries in format "net:nic:netmask:flag". Following is an example entry: 9.114.47.224:en0:27:U Globals: - none + none Error: none Example: @@ -1998,7 +1998,7 @@ sub get_subnet_aix =head3 determinehostname and ip address(s) Used on the service node to figure out what hostname and ip address(s) - are valid names and addresses + are valid names and addresses Input: None Output: ipaddress(s),nodename =cut @@ -2044,7 +2044,7 @@ sub determinehostname #----------------------------------------------------------------------------- -=head3 toIP +=head3 toIP IPv4 function to convert hostname to IP address @@ -2171,9 +2171,9 @@ sub isIpaddr #------------------------------------------------------------------------------- -=head3 getNodeNameservers +=head3 getNodeNameservers Description: - Get nameservers of specified nodes. + Get nameservers of specified nodes. The priority: noderes.nameservers > networks.nameservers > site.nameservers Arguments: node: node name list @@ -2229,9 +2229,9 @@ sub getNodeNameservers { #------------------------------------------------------------------------------- -=head3 getNodeNetworkCfg +=head3 getNodeNetworkCfg Description: - Get node network configuration, including "IP, hostname(the nodename),and netmask" by this node's name. + Get node network configuration, including "IP, hostname(the nodename),and netmask" by this node's name. Arguments: node: the nodename @@ -2343,14 +2343,14 @@ sub getNodesNetworkCfg #------------------------------------------------------------------------------- -=head3 get_hdwr_ip +=head3 get_hdwr_ip Description: - Get hardware(CEC, BPA) IP from the hosts table, and then /etc/hosts. + Get hardware(CEC, BPA) IP from the hosts table, and then /etc/hosts. Arguments: node: the nodename(cec, or bpa) Returns: - Return the node IP + Return the node IP -1 - Failed to get the IP. Globals: none @@ -2396,7 +2396,7 @@ sub get_hdwr_ip Arguments: nodes-- an array of nodes. Returns: - a hash that has the node status. The format is: + a hash that has the node status. The format is: {alive=>[node1, node3,...], unreachable=>[node4, node2...]} =cut @@ -2704,25 +2704,25 @@ sub get_all_nicips { ksdevice - Specify network device for Anaconda. For rh6 and earlier. Format: 'ksdevice={$mac|$nicname}' BOOTIF - Specify network device for Anaconda. The boot device which set by pxe. xCAT also set it if the bootload is not pxe. Format 'BOOTIF={$mac}' ifname - Specify a interfacename<->mac pair, it will set the interfacename to the interface which has the . Format 'ifname=$ifname:$mac' - # This will only be generated when linuximage.nodebootif is set. + # This will only be generated when linuximage.nodebootif is set. bootdev - Specify the boot device. Mostly it's used with parameter and when there are multiple params. Format 'bootdev={$mac|$ifname} ip - Specify the network configuration for an interface. Format: 'ip=dhcp', 'ip=$ifname:dhcp' - + netdevice - Specify network device for Linuxrc (Suse bootloader). Format: 'netdevice={$mac|$nicname}' - + netdev - Specify the interfacename which is used by xCAT diskless boot script to select the network interface. Format: 'netdev=$nicname' Reference: Redhat anaconda doc: https://github.com/rhinstaller/anaconda/blob/master/docs/boot-options.txt Suse Linuxrc do: https://en.opensuse.org/SDB:Linuxrc - + Arguments: $installnic <- node.installnic $primarynic <- node.primarynic $macmac <- node.mac $nodebootif <- linuximage.nodebootif - - Returns: + + Returns: $net_params - The key will be the parameter name, the value for the key will be the parameter value. Valid Parameter Name: ksdevice From 888740a97c8723bd34b308b07e8df5e68b7d3017 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0632/1681] Remove trailing spaces in file perl-xCAT/xCAT/ProfiledNodeUtils.pm --- perl-xCAT/xCAT/ProfiledNodeUtils.pm | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/perl-xCAT/xCAT/ProfiledNodeUtils.pm b/perl-xCAT/xCAT/ProfiledNodeUtils.pm index 65cb35804..d12e05fef 100644 --- a/perl-xCAT/xCAT/ProfiledNodeUtils.pm +++ b/perl-xCAT/xCAT/ProfiledNodeUtils.pm @@ -80,7 +80,7 @@ sub get_allocable_staticips_innet $rank - The start number. $amount - The total hostname number to be generated. Returns : numric hostname list - Example : + Example : calling genhosts_with_numric_tmpl("compute#NNnode") will return a list like: ("compute00node", "compute01node", ..."compute98node", "compute99node") =cut @@ -104,7 +104,7 @@ sub genhosts_with_numric_tmpl $prefix - the prefix string of hostname format. $appendix - the appendix string of hostname format $numlen - The number length in hostname format. - Example : + Example : calling split_hostname("compute#NNnode") will return a list like: ("compute", "node", 2) =cut @@ -145,7 +145,7 @@ sub split_hostname $rank - the start number for numric part $amount - the amount of hostnames to be generated. Returns : numric hostname list - Example : + Example : calling gen_numric_hostnames("compute", "node",2) will return a list like: ("compute00node", "compute01node", ..."compute98node", "compute99node") =cut @@ -182,9 +182,9 @@ sub gen_numric_hostnames Returns : hostname format type value: "numric" - numric hostname format. "rack" - rack info hostname format. - Example : + Example : calling get_hostname_format_type("compute#NNnode") will return "numric" - calling get_hostname_format_type("compute-#RR-#NN") will return "rack" + calling get_hostname_format_type("compute-#RR-#NN") will return "rack" =cut #------------------------------------------------------------------------------- @@ -235,8 +235,8 @@ sub get_hostname_format_type { Arguments : $format - rack hostname format $racknum - rack number. Returns : numric hostname format. - Example : - calling rackformat_to_numricformat("compute-#RR-#NN", 1) will return "compute-01-#NN" + Example : + calling rackformat_to_numricformat("compute-#RR-#NN", 1) will return "compute-01-#NN" =cut #------------------------------------------------------------------------------- @@ -385,7 +385,7 @@ sub get_nodes_nic_attrs { =head3 get_netprofile_bmcnet Description : Get bmc network name of a network profile. - Arguments : $nettmpl - network profile name + Arguments : $nettmpl - network profile name Returns : bmc network name of this network profile. =cut @@ -406,7 +406,7 @@ sub get_netprofile_bmcnet { =head3 get_netprofile_provisionnet Description : Get deployment network of a network profile. - Arguments : $nettmpl - network profile name + Arguments : $nettmpl - network profile name Returns : deployment network name of this network profile. =cut @@ -455,11 +455,11 @@ sub get_output_filename Description : Get all chassis in system. Arguments : hashref: if not set, return a array ref. if set, return a hash ref. - type : "all", get all chassis, + type : "all", get all chassis, "cmm", get all chassis whose type is cmm if type not specify, it is 'all' Returns : ref for chassis list. - Example : + Example : my $arrayref = xCAT::ProfiledNodeUtils->get_all_chassis(); my $hashref = xCAT::ProfiledNodeUtils->get_all_chassis(1); my $hashref = xCAT::ProfiledNodeUtils->get_all_chassis(1, 'cmm'); @@ -495,7 +495,7 @@ sub get_all_chassis Arguments : hashref: if not set, return a array ref. if set, return a hash ref. Returns : ref for rack list. - Example : + Example : my $arrayref = xCAT::ProfiledNodeUtils->get_all_rack(); my $hashref = xCAT::ProfiledNodeUtils->get_all_rack(1); =cut @@ -554,7 +554,7 @@ sub get_racks_for_chassises =head3 get_allnode_singleattrib_hash Description : Get all records of a column from a table, then return a hash. - The return hash's keys are the records of this attribute + The return hash's keys are the records of this attribute and values are all set as 1. Arguments : $tabname - the table name. $attr - the attribute name. @@ -636,7 +636,7 @@ sub get_db_switchports Arguments : hashref: if not set, return a array ref. if set, return a hash ref. Returns : ref for CECs list. - Example : + Example : my $arrayref = xCAT::ProfiledNodeUtils->get_all_cecs(); my $hashref = xCAT::ProfiledNodeUtils->get_all_cecs(1); =cut @@ -675,7 +675,7 @@ sub get_all_cecs Description : Get all LPAR ids in system. Arguments : ref of all cecs Returns : ref for LPAR ids hash. - Example : + Example : my $arrayref = xCAT::ProfiledNodeUtils->get_all_lparids(\%allcecs); =cut @@ -1070,12 +1070,12 @@ sub is_kvm_hypv_node #------------------------------------------------------------------------------- =head3 get_nodes_cmm - Description : Get the CMM of nodelist + Description : Get the CMM of nodelist Arguments : $nodelist - the ref of node list array Returns : $cmm - the ref of hash like { "cmm1" => 1, - "cmm2" => 1 + "cmm2" => 1 } =cut @@ -1229,7 +1229,7 @@ sub update_windows_prodkey =head3 check_nicips Description: Check if the nicips defined in MAC file is correct format - Arguments: $installnic: the installnic defined in networkprofile + Arguments: $installnic: the installnic defined in networkprofile $netprofileattrsref: the attributes of all nics in networkprofile $freeipshash: the hash of networks' staticrange $nicips: the string of nicips defined in MAC file @@ -1300,7 +1300,7 @@ sub check_nicips { =head3 gen_chain_for_profiles Description: Generate a chain string based on Network/Hardware/Image profiles. Arguments: $profiles_hash: The reference for profiles hash. - For example: + For example: $profiles_hash = { 'HardwareProfile' => 'IBM_NeXtScale_M4', 'ImageProfile' => 'rhels6.5-x86_64-stateful-compute', 'NetworkProfile' => 'default_network_profile', @@ -1390,10 +1390,10 @@ sub gen_chain_for_profiles { #------------------------------------------------------------------------------- =head3 get_all_vmhosts - Description : Get all vm hosts/hypervisor from DB. + Description : Get all vm hosts/hypervisor from DB. Arguments : N/A Returns : ref for vm hosts/hypervisor hash. - Example : + Example : my $hashref = xCAT::ProfiledNodeUtils->get_all_vmhosts(); =cut From 1870218cc1ac8088a4dd802fc89ee72d5ffacc3f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0633/1681] Remove trailing spaces in file perl-xCAT/xCAT/RSH.pm --- perl-xCAT/xCAT/RSH.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/perl-xCAT/xCAT/RSH.pm b/perl-xCAT/xCAT/RSH.pm index 8a03e9db2..2e5ea48e0 100644 --- a/perl-xCAT/xCAT/RSH.pm +++ b/perl-xCAT/xCAT/RSH.pm @@ -34,13 +34,13 @@ if ($^O eq 'linux') { Returns: A command array for the rsh command with the appropriate arguments as defined in the $config hash table - + Globals: $RSH_CMD - + Error: None - + Example: xCAT::RSH->remote_shell_command($config_hash, '/usr/bin/rsh'); @@ -92,13 +92,13 @@ sub remote_shell_command { Returns: A command array for the rcp command with the appropriate arguments as defined in the $config hash table - + Globals: $RCP_CMD - + Error: None - + Example: xCAT::RSH->remote_copy_command($config_hash, '/usr/bin/rcp'); From c8f977674b7a0b48bd53ffd2b049cf6ebd0718c2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0634/1681] Remove trailing spaces in file perl-xCAT/xCAT/RSYNC.pm --- perl-xCAT/xCAT/RSYNC.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-xCAT/xCAT/RSYNC.pm b/perl-xCAT/xCAT/RSYNC.pm index bd6d6efa3..d36694cf0 100644 --- a/perl-xCAT/xCAT/RSYNC.pm +++ b/perl-xCAT/xCAT/RSYNC.pm @@ -37,18 +37,18 @@ if ($^O eq 'linux') $class - Calling module name (discarded) $config - Reference to copy command configuration hash table $exec_path - Path to rsync executable - $localhost - 1 indicates we are running on the Management Node + $localhost - 1 indicates we are running on the Management Node Returns: A command array for the rsync command with the appropriate arguments as defined in the $config hash table - + Globals: None - + Error: None - + Example: xCAT::RSYNC->remote_copy_command($config_hash, '/usr/bin/rsync'); From c68e3273b141d02b8c2fd714f4b45ee4948aaca1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0635/1681] Remove trailing spaces in file perl-xCAT/xCAT/RemoteShellExp.pm --- perl-xCAT/xCAT/RemoteShellExp.pm | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/perl-xCAT/xCAT/RemoteShellExp.pm b/perl-xCAT/xCAT/RemoteShellExp.pm index a9388d512..15dbf6104 100755 --- a/perl-xCAT/xCAT/RemoteShellExp.pm +++ b/perl-xCAT/xCAT/RemoteShellExp.pm @@ -6,7 +6,7 @@ package xCAT::RemoteShellExp; #----------------------------------------------------------------------------- -=head1 RemoteShellExp +=head1 RemoteShellExp Uses perl Expect to set up ssh passwordless login on the input node list Called from xdsh -K command It works for node and devices ( such as QLogic Switch). @@ -35,12 +35,12 @@ package xCAT::RemoteShellExp; node. DSH_TO_USERID - The userid on the node where the ssh keys will be updated. DSH_ENABLE_SSH - Node to node root passwordless ssh will be setup. - DSH_ZONE_SSHKEYS - directory containing the zones root .ssh keys + DSH_ZONE_SSHKEYS - directory containing the zones root .ssh keys Usage: remoteshellexp - [-t node list] test ssh connection to the node - [-k] Generates the ssh keys needed , for the user on the MN. - [-s node list] copies the ssh keys to the nodes + [-t node list] test ssh connection to the node + [-k] Generates the ssh keys needed , for the user on the MN. + [-s node list] copies the ssh keys to the nodes optional $timeout = timeout value for the expect. Usually from the xdsh -t flag default timeout is 10 seconds exit 0 - good @@ -48,9 +48,9 @@ package xCAT::RemoteShellExp; exit 2 - usage error Examples: -$rc=xCAT::RemoteShellExp->remoteshellexp("k",$callback,$remoteshellcmd,$nodes,$timeout); -$rc=xCAT::RemoteShellExp->remoteshellexp("s",$callback,$remoteshellcmd,$nodes,$timeout); -$rc=xCAT::RemoteShellExp->remoteshellexp("t",$callback,$remoteshellcmd,$nodes,$timeout); +$rc=xCAT::RemoteShellExp->remoteshellexp("k",$callback,$remoteshellcmd,$nodes,$timeout); +$rc=xCAT::RemoteShellExp->remoteshellexp("s",$callback,$remoteshellcmd,$nodes,$timeout); +$rc=xCAT::RemoteShellExp->remoteshellexp("t",$callback,$remoteshellcmd,$nodes,$timeout); =cut @@ -226,10 +226,10 @@ sub remoteshellexp #----------------------------------------------------------------------------- -=head3 gensshkeys +=head3 gensshkeys Generates new ssh keys for the input userid on the MN, if they do not - already exist. Test for id_rsa key existence. + already exist. Test for id_rsa key existence. =cut @@ -355,9 +355,9 @@ sub gensshkeys #----------------------------------------------------------------------------- -=head3 testkeys +=head3 testkeys - Test to see if the remoteshell setup worked + Test to see if the remoteshell setup worked =cut @@ -479,9 +479,9 @@ sub testkeys #------------------------------------------------------------------------------- -=head3 sendnodeskeys +=head3 sendnodeskeys - Setup the ssh keys on the nodes + Setup the ssh keys on the nodes =cut @@ -592,7 +592,7 @@ sub sendnodeskeys my $rsp = {}; $rsp->{error}->[0] = "Permission denied, please make sure the user $to_userid has been created on the node $node and the input password is right\n"; xCAT::MsgUtils->message("E", $rsp, $::CALLBACK); - } + } if (defined($result[1])) { my $msg = $result[1]; @@ -791,9 +791,9 @@ sub sendnodeskeys #------------------------------------------------------------------------------- -=head3 senddeviceskeys +=head3 senddeviceskeys - Setup the ssh keys on the switches + Setup the ssh keys on the switches =cut From 8e7362a03fd695c4264038499136a08948098cf5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0636/1681] Remove trailing spaces in file perl-xCAT/xCAT/SINV.pm --- perl-xCAT/xCAT/SINV.pm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/perl-xCAT/xCAT/SINV.pm b/perl-xCAT/xCAT/SINV.pm index 51852c4cd..1a6887dad 100644 --- a/perl-xCAT/xCAT/SINV.pm +++ b/perl-xCAT/xCAT/SINV.pm @@ -3,11 +3,11 @@ #------------------------------------------------------------------------------ -=head1 SINV +=head1 SINV =head2 Package Description -This program module file supplies a set of utility programs for +This program module file supplies a set of utility programs for the sinv command. @@ -44,8 +44,8 @@ my @errresult; #------------------------------------------------------------------------------ -=head3 usage - Display usage message +=head3 usage + Display usage message =cut @@ -77,8 +77,8 @@ sub usage #------------------------------------------------------------------------------ -=head3 parse_and_run_sinv - Checks input arguments and runs sinv from the plugin +=head3 parse_and_run_sinv + Checks input arguments and runs sinv from the plugin =cut @@ -593,20 +593,20 @@ sub parse_and_run_sinv =head3 buildreport (note originally written only for xdsh but now supports rinv also) - This routine will take the input template and compare against - the output of the dsh command and build a report of the differences. + This routine will take the input template and compare against + the output of the dsh command and build a report of the differences. Read a nodes worth of data from the dsh command Call compareoutput- compares the dsh to the template Get the template and nodename returned from compareoutput and build hash Call writereport to take the hash and write the report to the output file Cleanup - Input (report file, file containing dsh run,template file,template count + Input (report file, file containing dsh run,template file,template count whether to remove the generated templates, original dsh node list, ignorefirsttemplate,exactmatch) If exactmatch is chosen, a diff is done against the template and the output. - If not exactmatch, then each record (line) in the template must be - checked against the node's output to determine, if it exists. + If not exactmatch, then each record (line) in the template must be + checked against the node's output to determine, if it exists. =cut @@ -805,7 +805,7 @@ sub buildreport #------------------------------------------------------------------------------ -=head3 compareoutput +=head3 compareoutput The purpose of this routine is to build sets of nodes that have the same configuration. We will build up to template_cnt sets. If more nodes are not part of these @@ -973,7 +973,7 @@ sub compareoutput #------------------------------------------------------------------------------ -=head3 diffoutput +=head3 diffoutput The purpose of this routine is to build sets of nodes that have the same configuration. We will build up to template_cnt sets. If more nodes are not part of these @@ -1152,9 +1152,9 @@ sub diffoutput #------------------------------------------------------------------------------ -=head3 writereport +=head3 writereport - The purpose of this routine is to write the report to the output file + The purpose of this routine is to write the report to the output file =cut @@ -1313,9 +1313,9 @@ sub writereport #------------------------------------------------------------------------------ -=head3 xdshoutput +=head3 xdshoutput - Check xdsh output - get output from command and pipe to xdshcoll + Check xdsh output - get output from command and pipe to xdshcoll =cut @@ -1370,7 +1370,7 @@ sub xdshoutput #------------------------------------------------------------------------------ -=head3 rinvoutput +=head3 rinvoutput Check rinv output - get output from command @@ -1449,11 +1449,11 @@ sub rinvoutput #------------------------------------------------------------------------------ -=head3 storeresults +=head3 storeresults Runs command output through xdshcoll and stores in /tmp/ store results in $tempfile or $templatepath ( for seed node) based on - $processflag = seednode + $processflag = seednode =cut #------------------------------------------------------------------------------ From 5f7334d9bcb53d58d396a8f566b8f31278aff1cf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0637/1681] Remove trailing spaces in file perl-xCAT/xCAT/SSH.pm --- perl-xCAT/xCAT/SSH.pm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/perl-xCAT/xCAT/SSH.pm b/perl-xCAT/xCAT/SSH.pm index 0f6d0b30e..f7b70fff1 100644 --- a/perl-xCAT/xCAT/SSH.pm +++ b/perl-xCAT/xCAT/SSH.pm @@ -36,14 +36,14 @@ our $ssh_version = xCAT::SSH->validate_ssh_version; Returns: A command array for the ssh command with the appropriate arguments as defined in the $config hash table - + Globals: $ssh_version $SSH_CMD - + Error: None - + Example: xCAT::SSH->remote_shell_command($config_hash, '/usr/bin/ssh'); @@ -99,14 +99,14 @@ sub remote_shell_command { Returns: A command array for the scp command with the appropriate arguments as defined in the $config hash table - + Globals: $ssh_version $SCP_CMD - + Error: None - + Example: xCAT::SSH->remote_copy_command($config_hash, '/usr/bin/scp'); @@ -147,7 +147,7 @@ sub remote_copy_command { { $scpfile = "/tmp/scp_$$config{'dest-host'}"; } - + open SCPCMDFILE, "> $scpfile" or die "Can not open file $scpfile"; if ($$config{'dest-user'}) @@ -183,7 +183,7 @@ sub remote_copy_command { "$exec_path -p -r $src_file_diff_dest $dest_user_host:$dest_dir/$diff_basename\n"; } } - } + } close SCPCMDFILE; chmod 0755, $scpfile; @@ -231,13 +231,13 @@ sub remote_copy_command { Returns: The string 'OpenSSH' if OpenSSH is used undef otherwise - + Globals: $SSH_CMD - + Error: None - + Example: $ssh_version = xCAT::SSH->validate_ssh_version; From 8c57224029594d116eb8fbc84e5cbc7b742b8272 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0638/1681] Remove trailing spaces in file perl-xCAT/xCAT/Schema.pm --- perl-xCAT/xCAT/Schema.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index f5479013c..bd8989e7a 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -213,7 +213,7 @@ qq{ link,ro - The file is readonly, and will be placed in tmpfs on the booted no 'nicmodel' => 'Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc)', 'bootorder' => 'Boot sequence (i.e. net,hd)', 'clockoffset' => 'Whether to have guest RTC synced to "localtime" or "utc" If not populated, xCAT will guess based on the nodetype.os contents.', - 'virtflags' => 'General flags used by the virtualization method. + 'virtflags' => 'General flags used by the virtualization method. For example, in Xen it could, among other things, specify paravirtualized setup, or direct kernel boot. For a hypervisor/dom0 entry, it is the virtualization method (i.e. "xen"). For KVM, the following flag=value pairs are recognized: imageformat=[raw|fullraw|qcow2] raw is a generic sparse file that allocates storage on demand @@ -221,7 +221,7 @@ qq{ link,ro - The file is readonly, and will be placed in tmpfs on the booted no qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level clonemethod=[qemu-img|reflink] qemu-img allows use of qcow2 to generate virtualization layer copy-on-write - reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs + reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs placement_affinity=[migratable|user_migratable|pinned]', 'vncport' => 'Tracks the current VNC display port (currently not meant to be set', 'textconsole' => 'Tracks the Psuedo-TTY that maps to the serial port or console of a VM', @@ -1579,26 +1579,26 @@ zvmivp => { table_desc => 'Stores NIC details.', descriptions => { node => 'The node or group name.', - nicips => 'Comma-separated list of IP addresses per NIC. + nicips => 'Comma-separated list of IP addresses per NIC. To specify one ip address per NIC: !,!,..., for example, eth0!10.0.0.100,ib0!11.0.0.100 To specify multiple ip addresses per NIC: !|,!|,..., for example, eth0!10.0.0.100|fd55::214:5eff:fe15:849b,ib0!11.0.0.100|2001::214:5eff:fe15:849a. The xCAT object definition commands support to use nicips. as the sub attributes. Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address.', - nichostnamesuffixes => 'Comma-separated list of hostname suffixes per NIC. + nichostnamesuffixes => 'Comma-separated list of hostname suffixes per NIC. If only one ip address is associated with each NIC: !,!,..., for example, eth0!-eth0,ib0!-ib0 If multiple ip addresses are associated with each NIC: - !|,!|,..., for example, eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. - The xCAT object definition commands support to use nichostnamesuffixes. as the sub attributes. + !|,!|,..., for example, eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. + The xCAT object definition commands support to use nichostnamesuffixes. as the sub attributes. Note: According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnamesuffixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention', - nichostnameprefixes => 'Comma-separated list of hostname prefixes per NIC. + nichostnameprefixes => 'Comma-separated list of hostname prefixes per NIC. If only one ip address is associated with each NIC: !,!,..., for example, eth0!eth0-,ib0!ib- If multiple ip addresses are associated with each NIC: - !|,!|,..., for example, eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. - The xCAT object definition commands support to use nichostnameprefixes. as the sub attributes. + !|,!|,..., for example, eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. + The xCAT object definition commands support to use nichostnameprefixes. as the sub attributes. Note: According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnameprefixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention', nictypes => 'Comma-separated list of NIC types per NIC. !,!, e.g. eth0!Ethernet,ib0!Infiniband. The xCAT object definition commands support to use nictypes. as the sub attributes.', niccustomscripts => 'Comma-separated list of custom scripts per NIC. !,!, e.g. eth0!configeth eth0, ib0!configib ib0. The xCAT object definition commands support to use niccustomscripts. as the sub attribute @@ -1610,7 +1610,7 @@ zvmivp => { !|,!|, for example, eth0!10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64,ib0!11_0_0_0-255_255_0_0|2001:db8:1:0::/64. The xCAT object definition commands support to use nicnetworks. as the sub attributes.', nicaliases => 'Comma-separated list of hostname aliases for each NIC. Format: eth0!,eth1!| - For multiple aliases per nic use a space-separated list. + For multiple aliases per nic use a space-separated list. For example: eth0!moe larry curly,eth1!tom|jerry', nicextraparams => 'Comma-separated list of extra parameters that will be used for each NIC configuration. If only one ip address is associated with each NIC: From 471f10420235410def5f52dab0269e4269a57c89 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0639/1681] Remove trailing spaces in file perl-xCAT/xCAT/Scope.pm --- perl-xCAT/xCAT/Scope.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/perl-xCAT/xCAT/Scope.pm b/perl-xCAT/xCAT/Scope.pm index 215709361..b1eeaf204 100644 --- a/perl-xCAT/xCAT/Scope.pm +++ b/perl-xCAT/xCAT/Scope.pm @@ -33,7 +33,7 @@ sub split_node_array { my $capacity = shift; if ($max_sub < 2) {return [$source];} - + my @dest = (); my $total = $#{$source} + 1; my $n_sub = int ($total / $capacity); @@ -83,7 +83,7 @@ sub split_node_array { =head3 get_parallel_scope - Convert a request object to an array of multiple requests according to the + Convert a request object to an array of multiple requests according to the splitted node range. Arguments: @@ -112,7 +112,7 @@ sub get_parallel_scope { # Just return the origin one if node range is not big enough. if ($#{$subsets} < 1) { return [$req]; } - my @requests = (); + my @requests = (); foreach (@$subsets) { my $reqcopy = {%$req}; $reqcopy->{node} = $_; @@ -125,7 +125,7 @@ sub get_parallel_scope { =head3 get_broadcast_scope_with_parallel - Convert a request object to an array of multiple requests according to the + Convert a request object to an array of multiple requests according to the splitted node range. Also it replicates the requests to all required service nodes or management node. @@ -186,9 +186,9 @@ sub get_broadcast_scope_with_parallel { =head3 get_broadcast_disjoint_scope_with_parallel - Convert a request object to an array of multiple requests according to the + Convert a request object to an array of multiple requests according to the splitted node range. Also it replicates the requests to all required service - nodes or management node, but the request to a service node will only contains + nodes or management node, but the request to a service node will only contains the node range it manages. Arguments: From db4fa6ab6668618ff9961f86e6f3fa5bb98afe25 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0640/1681] Remove trailing spaces in file perl-xCAT/xCAT/ServiceNodeUtils.pm --- perl-xCAT/xCAT/ServiceNodeUtils.pm | 62 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/perl-xCAT/xCAT/ServiceNodeUtils.pm b/perl-xCAT/xCAT/ServiceNodeUtils.pm index 13051df88..c89fcfe31 100755 --- a/perl-xCAT/xCAT/ServiceNodeUtils.pm +++ b/perl-xCAT/xCAT/ServiceNodeUtils.pm @@ -75,7 +75,7 @@ sub readSNInfo =head3 isServiceReq - Checks the service node table in the database to see + Checks the service node table in the database to see if input Service should be setup on the input service node or Management Node (used by AAsn.pm) @@ -84,7 +84,7 @@ sub readSNInfo hash of services to setup for this service node Globals: $::RUNCMD_RC = 0; good - $::RUNCMD_RC = 1; error + $::RUNCMD_RC = 1; error Error: none Example: @@ -205,13 +205,13 @@ sub isServiceReq #----------------------------------------------------------------------------- -=head3 getAllSN - - Returns an array of all service nodes from service node table +=head3 getAllSN + + Returns an array of all service nodes from service node table Arguments: ALL" - will also return the management node in the array, if - if has been defined in the servicenode table + if has been defined in the servicenode table Returns: array of Service Nodes or empty array, if none Globals: @@ -271,20 +271,20 @@ sub getAllSN #----------------------------------------------------------------------------- -=head3 getSNandNodes - +=head3 getSNandNodes + Returns an hash-array of all service nodes and the nodes they service Arguments: - none + none #----------------------------------------------------------------------------- -=head3 getSNandNodes - +=head3 getSNandNodes + Returns an hash-array of all service nodes and the nodes they service Arguments: - none + none Returns: Service Nodes and the nodes they service or empty , if none Globals: @@ -322,24 +322,24 @@ sub getSNandNodes #----------------------------------------------------------------------------- -=head3 getSNList - +=head3 getSNList + Reads the servicenode table. Will return all the enabled Service Nodes that will setup the input Service ( e.g tftpserver,nameserver,etc) If service is blank, then will return the list of all enabled Service - Nodes. + Nodes. Arguments: - Servicename ( xcat,tftpserver,dhcpserver,conserver,etc) + Servicename ( xcat,tftpserver,dhcpserver,conserver,etc) If no servicename, returns all Servicenodes - "ALL" argument means you also want the MN returned. It can be in the - servicenode list. If no "ALL", take out the MN if it is there. + "ALL" argument means you also want the MN returned. It can be in the + servicenode list. If no "ALL", take out the MN if it is there. Returns: - Array of service node names + Array of service node names Globals: none Error: - 1 - error + 1 - error Example: $sn= xCAT::ServiceNodeUtils->getSNList($servicename) { blah; } $sn= xCAT::ServiceNodeUtils->getSNList($servicename,"ALL") { blah; } @@ -376,7 +376,7 @@ sub getSNList @servicenodes=xCAT::NodeRange::noderange(join(',',map {$_->{node}} @servicenodes)); if($options eq "ALL"){ return @servicenodes; - } + } @servicenodes = $nodetab->getAllAttribsWhere("node in ("."\'".join("\',\'", @servicenodes)."\'".") and groups not like '%__mgmtnode%'",'node'); return map {$_->{node}} @servicenodes; @@ -397,7 +397,7 @@ sub getSNList_orig } my @nodes = $servicenodetab->getAllNodeAttribs([$service]); $servicenodetab->close; - + foreach my $node (@nodes) { if (!defined($service) || ($service eq "")) # want all the service nodes @@ -443,7 +443,7 @@ sub getSNList_orig =head3 get_ServiceNode Will get the Service node ( name or ipaddress) as known by the Management - Node or Node for the input nodename or ipadress of the node + Node or Node for the input nodename or ipadress of the node which can be a Service Node. If the input node is a Service Node then it's Service node is always the Management Node. @@ -711,7 +711,7 @@ sub get_ServiceNode as known by the Management Server or Node for the input nodename or ipadress of the node It will then format the output into a single servicenode key with values - the list of nodes service by that service node. This routine will + the list of nodes service by that service node. This routine will break up pools of service nodes into individual node in the hash unlike get_ServiceNode which leaves the pool as the key. @@ -729,7 +729,7 @@ sub get_ServiceNode specific service like tftp - output: A hash ref of arrays, the key is a single service node + output: A hash ref of arrays, the key is a single service node pointing to a list of nodes that are serviced by that service node 'rra000-m'=>['blade01', 'testnode'] @@ -861,14 +861,14 @@ sub getAIXSNinterfaces #----------------------------------------------------------------------------- -=head3 - - getSNandCPnodes - Take an array of nodes and returns - an array of the service - nodes and an array of the computenode . +=head3 + + getSNandCPnodes - Take an array of nodes and returns + an array of the service + nodes and an array of the computenode . Arguments: - none + none Returns: array of Service Nodes and/or array of compute nodesarray of compute nodes empty array, if none Globals: From 28dc607ff3ab68b84c4cd48494b887b0ff0f0128 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0641/1681] Remove trailing spaces in file perl-xCAT/xCAT/Table.pm --- perl-xCAT/xCAT/Table.pm | 110 ++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm index 4c3405225..99bf2210c 100644 --- a/perl-xCAT/xCAT/Table.pm +++ b/perl-xCAT/xCAT/Table.pm @@ -688,14 +688,14 @@ sub buildcreatestmt #-------------------------------------------------------------------------- -=head3 +=head3 - Description: get_datatype_string ( for mysql,sqlite,postgresql) + Description: get_datatype_string ( for mysql,sqlite,postgresql) Arguments: - Table column,database,types + Table column,database,types Returns: - the datatype for the column being defined + the datatype for the column being defined Globals: Error: @@ -734,14 +734,14 @@ sub get_datatype_string { #-------------------------------------------------------------------------- -=head3 +=head3 - Description: get_datatype_string_db2 ( for DB2) + Description: get_datatype_string_db2 ( for DB2) Arguments: - Table column,database,types,tablename,table schema + Table column,database,types,tablename,table schema Returns: - the datatype for the column being defined + the datatype for the column being defined Globals: Error: @@ -793,12 +793,12 @@ sub get_datatype_string_db2 { #-------------------------------------------------------------------------- -=head3 +=head3 - Description: get_xcatcfg + Description: get_xcatcfg Arguments: - none + none Returns: the database name from /etc/xcat/cfgloc or sqlite Globals: @@ -1106,7 +1106,7 @@ sub new Handles adding attributes Handles removing attributes but does not really remove them from the database. - Handles adding keys + Handles adding keys Arguments: Hash containing Database and Table Handle and schema @@ -1117,9 +1117,9 @@ sub new Error: Example: my $nodelisttab=xCAT::Table->new('nodelist'); - $nodelisttab->updateschema(); + $nodelisttab->updateschema(); $nodelisttab->close(); - + Comments: none @@ -1942,7 +1942,7 @@ sub setAttribs Description: This function sets the attributes for the rows selected by the where clause. Warning, because we support mulitiple databases (SQLite,MySQL and DB2) that - require different syntax. Any code using this routine, must call the + require different syntax. Any code using this routine, must call the Utils->getDBName routine and code the where clause that is appropriate for each supported database. @@ -2294,7 +2294,7 @@ sub setNodesAttribs { Attribute type array Returns: - two layer hash reference (->{nodename}->{attrib} + two layer hash reference (->{nodename}->{attrib} Globals: Error: @@ -2901,7 +2901,7 @@ sub getNodeAttribs_nosub_old =head3 getNodeAttribs_nosub_returnany - Description: not used, kept for reference + Description: not used, kept for reference Arguments: @@ -3244,17 +3244,17 @@ sub getAllEntries When using a general Where clause with SQL statement then because we support mulitiple databases (SQLite,MySQL and DB2) that - require different syntax. Any code using this routine, must call the + require different syntax. Any code using this routine, must call the Utils->getDBName routine and code the where clause that is appropriate for each supported database. When the input is the array of attr val strings, the routine will - build the correct Where clause for the database we are running. + build the correct Where clause for the database we are running. Arguments: Database Handle Where clause - or + or array of attrval strings to be build into a Where clause Returns: Array of attributes @@ -3269,7 +3269,7 @@ sub getAllEntries returns node and group attributes $nodelist->getAllAttribsWhere("groups like '%".$atom."%'",'ALL'); returns all attributes - + Input of attrval strings $nodelist->getAllAttribsWhere(array of attrval,'node','group'); @@ -3358,7 +3358,7 @@ sub getAllAttribsWhere Table handle Attribute list optional hash return style - ( changes the return hash structure format) + ( changes the return hash structure format) Returns: Array of attribute values Globals: @@ -3623,7 +3623,7 @@ sub getAllAttribs Build delete statement and'ing the elements of the hash DELETE FROM nodelist WHERE ("groups" = "compute1" AND "node" = "node1") - If called with no attributes, it will delete all entries in the table. + If called with no attributes, it will delete all entries in the table. $table->delEntries(); $table->commit; Comments: @@ -4107,15 +4107,15 @@ sub getDescriptions { #-------------------------------------------------------------------------- -=head3 isAKey - Description: Checks to see if table field is a table key +=head3 isAKey + Description: Checks to see if table field is a table key Arguments: - Table field - List of keys + Table field + List of keys Returns: 1= is a key - 0 = not a key + 0 = not a key Globals: Error: @@ -4166,12 +4166,12 @@ sub getAutoIncrementColumns { #-------------------------------------------------------------------------- -=head3 +=head3 - Description: get_filelist + Description: get_filelist Arguments: - directory,filelist,type + directory,filelist,type Returns: The list of sql files to be processed which consists of all the files with .sql and _.sql @@ -4185,7 +4185,7 @@ sub getAutoIncrementColumns { my @filelist =get_filelist($directory,$filelist,$type); where type = "sql" or "pm" Note either input a directory path in $directory of an array of - full path to filenames in $filelist. See runsqlcmd for example. + full path to filenames in $filelist. See runsqlcmd for example. =cut @@ -4261,15 +4261,15 @@ sub get_filelist #-------------------------------------------------------------------------- -=head3 +=head3 - Description: delimitcol + Description: delimitcol Arguments: - attribute name + attribute name Returns: The attribute(column) - delimited appropriately for the runnning Database + delimited appropriately for the runnning Database Globals: Error: @@ -4299,24 +4299,24 @@ sub delimitcol { #-------------------------------------------------------------------------- -=head3 +=head3 - Description: buildwhereclause + Description: buildwhereclause Arguments: Array of the following attr val where the operator can be the following: - == - != - =~ - !~ - > - < - >= - <= + == + != + =~ + !~ + > + < + >= + <= Returns: - Where clause with SQL appropriate for the running DB + Where clause with SQL appropriate for the running DB Globals: Error: @@ -4397,15 +4397,15 @@ sub buildWhereClause { =head3 writeAllEntries Description: Read entire table and writes all entries to file - This routine was written specifically for the tabdump + This routine was written specifically for the tabdump command. Arguments: - filename or path + filename or path Returns: 0=good - 1=bad + 1=bad Globals: Error: @@ -4605,18 +4605,18 @@ sub output_table { =head3 getMAXMINEntries - Description: Select the rows in the Table which has the MAX and the row with the + Description: Select the rows in the Table which has the MAX and the row with the Min value for the input attribute. - Currently only the auditlog and evenlog are setup to have such an attribute (recid). + Currently only the auditlog and evenlog are setup to have such an attribute (recid). Arguments: Table handle attribute name ( e.g. recid) Returns: - HASH + HASH max=> max value - min=> min value + min=> min value Globals: Error: @@ -4624,7 +4624,7 @@ sub output_table { Example: my $tabh = xCAT::Table->new($table); - my $recs=$tabh->getEntries("recid"); # returns row with recid max value in database + my $recs=$tabh->getEntries("recid"); # returns row with recid max value in database # and the row with the min value. Comments: From 3cf35a1dbd841ea4ef62a39f4eb57e57f1594e77 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0642/1681] Remove trailing spaces in file perl-xCAT/xCAT/TableUtils.pm --- perl-xCAT/xCAT/TableUtils.pm | 124 +++++++++++++++++------------------ 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/perl-xCAT/xCAT/TableUtils.pm b/perl-xCAT/xCAT/TableUtils.pm index ffe5d88e3..8fde01aa3 100755 --- a/perl-xCAT/xCAT/TableUtils.pm +++ b/perl-xCAT/xCAT/TableUtils.pm @@ -141,27 +141,27 @@ sub list_all_node_groups #-------------------------------------------------------------------------------- -=head3 bldnonrootSSHFiles - - Builds authorized_keyfiles for the non-root id - It must not only contain the public keys for the non-root id - but also the public keys for root - - Arguments: - from_userid -current id running xdsh from the command line - Returns: - - Globals: - $::CALLBACK - Error: - - Example: - xCAT::TableUtils->bldnonrootSSHFiles; - - Comments: - none - -=cut +=head3 bldnonrootSSHFiles + + Builds authorized_keyfiles for the non-root id + It must not only contain the public keys for the non-root id + but also the public keys for root + + Arguments: + from_userid -current id running xdsh from the command line + Returns: + + Globals: + $::CALLBACK + Error: + + Example: + xCAT::TableUtils->bldnonrootSSHFiles; + + Comments: + none + +=cut #-------------------------------------------------------------------------------- @@ -187,7 +187,7 @@ sub bldnonrootSSHFiles if (!(-e "$home/.ssh/id_rsa.pub")) { $rsp->{data}->[0] = "$home/.ssh/id_rsa.pub does not exist!"; - xCAT::MsgUtils->message("I", $rsp, $::CALLBACK); + xCAT::MsgUtils->message("I", $rsp, $::CALLBACK); return 1; } } @@ -213,7 +213,7 @@ sub bldnonrootSSHFiles if(!(-e "$home/.ssh/authorized_keys")){ $rsp->{data}->[0] = "$home/.ssh/authorized_keys does not exist, make sure you have setup the ssh-keys on this service node.\n"; xCAT::MsgUtils->message("E", $rsp, $::CALLBACK); - return (1); + return (1); } $cmd = " cp $home/.ssh/authorized_keys $home/.ssh/tmp/authorized_keys"; } @@ -264,7 +264,7 @@ sub bldnonrootSSHFiles =head3 setupSSH - Generates if needed and Transfers the ssh keys + Generates if needed and Transfers the ssh keys fOr a userid to setup ssh to the input nodes. Arguments: @@ -274,7 +274,7 @@ sub bldnonrootSSHFiles Env Variables: $DSH_FROM_USERID, $DSH_TO_USERID, $DSH_REMOTE_PASSWORD the ssh keys are transferred from the $DSH_FROM_USERID to the $DSH_TO_USERID - on the node(s). The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID + on the node(s). The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID must be obtained by the calling script or from the xdsh client @@ -388,7 +388,7 @@ sub setupSSH unless(open(FILE, ">$home/.ssh/copy.sh")) - { + { $rsp->{data}->[0] ="cannot create file $home/.ssh/copy.sh, please make sure the directory \"$home/.ssh\" exists and ssh keys have been setup on this node!\n"; xCAT::MsgUtils->message("E", $rsp, $::CALLBACK); return 1; @@ -535,10 +535,10 @@ rmdir \"/tmp/$to_userid\" \n"; #-------------------------------------------------------------------------------- -=head3 sendkeysNOzones +=head3 sendkeysNOzones - Transfers the ssh keys - for the root id on the nodes no zones + Transfers the ssh keys + for the root id on the nodes no zones key from ~/.ssh site.sshbetweennodes honored @@ -549,7 +549,7 @@ rmdir \"/tmp/$to_userid\" \n"; Env Variables: $DSH_FROM_USERID, $DSH_TO_USERID, $DSH_REMOTE_PASSWORD the ssh keys are transferred from the $DSH_FROM_USERID to the $DSH_TO_USERID - on the node(s). The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID + on the node(s). The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID must be obtained by the calling script or from the xdsh client @@ -616,13 +616,13 @@ sub sendkeysNOzones #-------------------------------------------------------------------------------- -=head3 sendkeysTOzones +=head3 sendkeysTOzones - Transfers the ssh keys + Transfers the ssh keys for the root id on the nodes using the zone table. If in a zone, then root ssh keys for the node will be taken from the zones ssh keys not ~/.ssh zones are only supported on nodes that are not a service node. - Also for the call to RemoteShellExp, we must group the nodes that are in the same zone + Also for the call to RemoteShellExp, we must group the nodes that are in the same zone Arguments: @@ -632,7 +632,7 @@ sub sendkeysNOzones Env Variables: $DSH_FROM_USERID, $DSH_TO_USERID, $DSH_REMOTE_PASSWORD the ssh keys are transferred from the $DSH_FROM_USERID to the $DSH_TO_USERID - on the node(s). The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID + on the node(s). The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID must be obtained by the calling script or from the xdsh client @@ -778,7 +778,7 @@ sub sendkeysTOzones =head3 cpSSHFiles - Builds authorized_keyfiles for root + Builds authorized_keyfiles for root Arguments: install directory path @@ -932,7 +932,7 @@ sub GetNodeOSARCH #------------------------------------------------------------------------------- =head3 logEventsToDatabase - Logs the given events info to the xCAT's 'eventlog' database + Logs the given events info to the xCAT's 'eventlog' database Arguments: arrayref -- A pointer to an array. Each element is a hash that contains an events. The hash should contain the at least one of the following keys: @@ -946,9 +946,9 @@ sub GetNodeOSARCH id -- The location or the resource name where the event occurred. severity -- The severity of the event. Valid values are: informational, warning, critical. message -- The full description of the event. - rawdata -- The data that associated with the event. + rawdata -- The data that associated with the event. Returns: - (ret code, error message) + (ret code, error message) Example: my @a=(); my $event={ @@ -1021,11 +1021,11 @@ sub logEventsToDatabase #------------------------------------------------------------------------------- =head3 logEventsToTealDatabase - Logs the given events info to the TEAL's 'x_tealeventlog' database + Logs the given events info to the TEAL's 'x_tealeventlog' database Arguments: arrayref -- A pointer to an array. Each element is a hash that contains an events. Returns: - (ret code, error message) + (ret code, error message) =cut @@ -1145,7 +1145,7 @@ sub setAppStatus $status Returns: none - + Globals: none Error: @@ -1533,17 +1533,17 @@ sub get_site_Master #------------------------------------------------------------------------------- -=head3 checkCredFiles +=head3 checkCredFiles Checks the various credential files on the Management Node to make sure the permission are correct for using and transferring to the nodes and service nodes. Also removes /install/postscripts/etc/xcat/cfgloc if found Arguments: - $callback + $callback Returns: 0 - ok Globals: - none + none Error: warnings of possible missing files and directories Example: @@ -1755,15 +1755,15 @@ sub checkCredFiles #------------------------------------------------------------------------------- -=head3 enableSSH +=head3 enableSSH Description: Reads the site.sshbetweennodes attribute and determines - if the input node should be enabled to ssh between nodes + if the input node should be enabled to ssh between nodes Arguments: - $node + $node Returns: 1 = enable ssh - 0 = do not enable ssh + 0 = do not enable ssh Globals: none Error: @@ -1837,23 +1837,23 @@ sub enablessh #------------------------------------------------------------------------------- -=head3 enableSSH +=head3 enableSSH Description: The function is same as enablessh() above. Before using this function, the $sn_hash for noderange, and $groups_hash for site.sshbetweennodes should be got. This is performance improvement. Arguments: $node -- node name - $sn_hash -- if the node is one sn, key is the node name, and value is 1. + $sn_hash -- if the node is one sn, key is the node name, and value is 1. if the node is not a sn, the key isn't in this hash $groups_hash -- there are two keys: 1. Each group in the value of site.sshbetweennodes could be the key - 2. Each node in the groups from the value of site.sshbetweennodes , if the + 2. Each node in the groups from the value of site.sshbetweennodes , if the value isn't ALLGROUPS or NOGROUPS. - + Returns: 1 = enable ssh - 0 = do not enable ssh + 0 = do not enable ssh Globals: none Error: @@ -1923,7 +1923,7 @@ sub enableSSH =head3 getrootimage - Get the directory of root image for a node; + Get the directory of root image for a node; Note: This subroutine only works for diskless node Arguments: @@ -1977,13 +1977,13 @@ sub getrootimage() =head3 getimagenames - Get an array of osimagenames that correspond to the input node array; + Get an array of osimagenames that correspond to the input node array; Arguments: - Array of nodes + Array of nodes Returns: - array of all the osimage names that are the provmethod for the nodes - undef - no osimage names + array of all the osimage names that are the provmethod for the nodes + undef - no osimage names Globals: none Error: @@ -2034,9 +2034,9 @@ sub getimagenames() Arguments: node - tabhd: the handler of 'nodelist' table, + tabhd: the handler of 'nodelist' table, groups: the groups attribute need to be merged. - Can be an array or string. + Can be an array or string. Globals: none Error: @@ -2081,9 +2081,9 @@ sub updatenodegroups { Arguments: node - tabhd: the handler of 'nodelist' table, + tabhd: the handler of 'nodelist' table, groups: the groups that need to be removed. - Can be an array or string. + Can be an array or string. Globals: none Error: From 995c1906b29b0f5d19840f88a1b4d8494d1b2896 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0643/1681] Remove trailing spaces in file perl-xCAT/xCAT/Usage.pm --- perl-xCAT/xCAT/Usage.pm | 104 ++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm index dca66a6b5..1ded2c975 100755 --- a/perl-xCAT/xCAT/Usage.pm +++ b/perl-xCAT/xCAT/Usage.pm @@ -8,7 +8,7 @@ use xCAT::Utils; =head1 xCAT::Usage =head2 Package Description - xCAT usage module. Some commands such as rpower have different implementations + xCAT usage module. Some commands such as rpower have different implementations for different hardware. This module holds the usage string for these kind of commands so that the usage can be referenced from different modules. =cut @@ -24,7 +24,7 @@ my %usage = ( rnetboot [ipl= address]", "rpower" => "", "rpower.common" => - "Usage: + "Usage: Common: rpower [--nodeps] [on|onstandby|off|suspend|reset|stat|state|boot] [-V|--verbose] [-m table.colum==expectedstatus][-m table.colum==expectedstatus...] [-r ] [-t ] rpower [-h|--help|-v|--version] @@ -74,7 +74,7 @@ my %usage = ( ", "rbeacon" =>"", "rbeacon.common" => - "Usage: + "Usage: Common: rbeacon [-h|--help|-v|--version|-V|--verbose] ", @@ -87,7 +87,7 @@ my %usage = ( "rbeacon.openbmc" => "OpenPOWER (OpenBMC) specific: rbeacon [on|off|stat] - ", + ", "rvitals" => "", "rvitals.common" => "Usage: @@ -123,7 +123,7 @@ my %usage = ( reventlog [-h|--help|-v|--version]", "rinv" => "", "rinv.common" => - "Usage: + "Usage: Common: rinv [all|model|serial] [-V|--verbose] rinv [-h|--help|-v|--version] @@ -132,12 +132,12 @@ my %usage = ( "BMC/MPA specific: rinv [model|serial|asset|vpd|deviceid|guid|firm|dimm|mprom|all] OpenPOWER (IPMI) server specific: - rinv [model|serial|deviceid|uuid|guid|vpd|mprom|firm|all] + rinv [model|serial|deviceid|uuid|guid|vpd|mprom|firm|all] ", "rinv.openbmc" => "OpenPOWER (OpenBMC) server specific: rinv [model][serial][firm][cpu][dimm][all] [-V|--verbose] - ", + ", "rinv.end" => "PPC specific(with HMC): rinv [all|bus|config|serial|model|firm] @@ -160,7 +160,7 @@ my %usage = ( "Usage: rsetboot [net|hd|cd|floppy|def|stat] [-u] [-p] rsetboot [-h|--help|-v|--version]", "rbootseq" => - "Usage: + "Usage: Common: rbootseq [-h|--help|-v|--version|-V|--verbose] Blade specific: @@ -172,7 +172,7 @@ my %usage = ( rscan [-h|--help|-v|--version]", "rspconfig" => "", "rspconfig.common" => - "Usage: + "Usage: Common: rspconfig [-h|--help|-v|--version|-V|--verbose] ", @@ -215,7 +215,7 @@ my %usage = ( rspconfig [frame=number] rspconfig [USERID=passwd] [updateBMC=] rspconfig [sshcfg=| - snmpcfg=| + snmpcfg=| pd1=| pd2=| network=<*|[ip],[host],[gateway],[netmask]>| @@ -276,11 +276,11 @@ my %usage = ( "Usage: rspreset ", "getmacs" => - "Usage: + "Usage: Common: getmacs [-h|--help|-v|--version] PPC specific: - getmacs [-F filter] + getmacs [-F filter] getmacs [-M] getmacs [-V| --verbose] [-f] [-d] [--arp] | [-D {[-o] [-S server] [-G gateway] [-C client] | [--noping]}] blade specific: @@ -328,7 +328,7 @@ my %usage = ( Common: chvm [-h|--help|-v|--version] PPC (with HMC) specific: - chvm [-p profile][-V|--verbose] + chvm [-p profile][-V|--verbose] chvm = [=...] PPC (using Direct FSP Management) specific: chvm --p775 [-p ] @@ -373,7 +373,7 @@ my %usage = ( chvm noderange [--setipl ipl_target load_parms parms] chvm noderange [--setpassword password]", "rmvm" => - "Usage: rmvm [--service][-V|--verbose] + "Usage: rmvm [--service][-V|--verbose] rmvm [-h|--help|-v|--version], rmvm [-p] [-f] PPC (using Direct FSP Management) specific: @@ -402,13 +402,13 @@ my %usage = ( makentp [-a|--all] [-V|--verbose]", "rflash" => "", "rflash.common" => - "Usage: + "Usage: Common: rflash [ -h|--help|-v|--version|-V|--verbose] ", "rflash.begin" => "PPC (with HMC) specific: - rflash -p [--activate {concurrent | disruptive}] + rflash -p [--activate {concurrent | disruptive}] rflash {--commit | --recover} PPC (using Direct FSP Management) specific: rflash -p [--activate {disruptive|deferred}] [-d ] @@ -427,42 +427,42 @@ my %usage = ( "mkhwconn" => "Usage: mkhwconn [-h|--help] - + PPC (with HMC) specific: mkhwconn noderange -t [--bind] [-V|--verbose] mkhwconn noderange -p single_hmc [-P HMC passwd] [-V|--verbose] - + PPC (using Direct FSP Management) specific: mkhwconn noderange -t [-T tooltype] [--port port_value] mkhwconn noderange -s [hmcnode] [-P HMC passwd] [-V|--verbose]", "rmhwconn" => "Usage: rmhwconn [-h|--help] - + PPC (with HMC) specific: rmhwconn noderange [-V|--verbose] - + PPC (using Direct FSP Management) specific: rmhwconn noderange [-T tooltype] rmhwconn noderange -s", "lshwconn" => "Usage: lshwconn [-h|--help] - + PPC (with HMC) specific: lshwconn noderange [-V|--verbose] - + PPC (using Direct FSP Management) specific: lshwconn noderange [-T tooltype] lshwconn noderange -s", "renergy" => "Usage: - renergy [-h | --help] - renergy [-v | --version] + renergy [-h | --help] + renergy [-v | --version] Power 6 server specific : renergy noderange [-V] { all | { [savingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] } } - renergy noderange [-V] { {savingstatus}={on | off} | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage } + renergy noderange [-V] { {savingstatus}={on | off} | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage } Power 7 server specific : renergy noderange [-V] { all | { [savingstatus] [dsavingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue] } } @@ -478,15 +478,15 @@ my %usage = ( For a blade server nodes: renergy noderange [-V] { all | [averageDC] [capability] [cappingvalue] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus] } renergy noderange [-V] { savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} } - + Flex specific : For Flex Management Modules: renergy noderange [-V] { all | [powerstatus] [powerpolicy] [powermodule] [avaiablepower] [reservedpower] [remainpower] [inusedpower] [availableDC] [averageAC] [thermaloutput] [ambienttemp] [mmtemp] } - + For Flex node (power and x86): renergy noderange [-V] { all | [averageDC] [capability] [cappingvalue] [cappingmaxmin] [cappingmax] [cappingmin] [cappingGmin] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus] } renergy noderange [-V] { cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage | savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} } - + iDataPlex specific : renergy noderange [-V] [ { cappingmaxmin | cappingmax | cappingmin } ] [cappingstatus] [cappingvalue] [relhistogram] renergy noderange [-V] { cappingstatus={on | enable | off | disable} | {cappingwatt|cappingvalue}=watt } @@ -501,7 +501,7 @@ my %usage = ( updatenode [-V|--verbose] [-k|--security] [-s|--sn] [-t ] or updatenode [-V|--verbose] [-F|--sync | -f|--snsync] [-r|--node-rcp ] [-l|--user[username]] [--fanout=[fanout value]] [-S|--sw] [-t ] - [-P|--scripts [script1,script2,...]] [-s|--sn] + [-P|--scripts [script1,script2,...]] [-s|--sn] [-A|--updateallsw] [-c|--cmdlineonly] [-d alt_source_dir] [attr=val [attr=val...]] or @@ -510,19 +510,19 @@ my %usage = ( Options: A list of nodes or groups. - [-k|--security] Update the security keys and certificates for the + [-k|--security] Update the security keys and certificates for the target nodes. [-F|--sync] Perform File Syncing. - [--fanout] Allows you to assign the fanout value for the command. + [--fanout] Allows you to assign the fanout value for the command. See xdsh/xdcp fanout parameter in the man page. - [-f|--snsync] Performs File Syncing to the service nodes that service + [-f|--snsync] Performs File Syncing to the service nodes that service the nodes in the noderange. - + [-r|--node-rcp] Specifies the full path of the remote copy command used for sync files to node targets, such as /usr/bin/rsync and /usr/bin/scp - + [-g|--genmypost] Will generate a new mypostscript file for the the nodes in the noderange, if site precreatemypostscripts is 1 or YES. @@ -531,10 +531,10 @@ Options: [-S|--sw] Perform Software Maintenance. - [-P|--scripts] Execute postscripts listed in the postscripts table or + [-P|--scripts] Execute postscripts listed in the postscripts table or parameters. - [-c|--cmdlineonly] Only use AIX software maintenance information + [-c|--cmdlineonly] Only use AIX software maintenance information provided on the command line. (AIX only) [-s|--sn] Set the server information stored on the nodes. @@ -542,17 +542,17 @@ Options: [-t|--timeout] Time out in seconds to allow the command to run. Default is no timeout, except for updatenode -k which has a 10 second default timeout. - [-A|--updateallsw] Install or update all software contained in the source + [-A|--updateallsw] Install or update all software contained in the source directory. (AIX only) [-d ] Used to indicate a source directory other than - the standard lpp_source directory specified in the xCAT osimage + the standard lpp_source directory specified in the xCAT osimage definition. (AIX only) - [script1,script2,...] A comma separated list of postscript names. + [script1,script2,...] A comma separated list of postscript names. If omitted, all the post scripts defined for the nodes will be run. - [attr=val [attr=val...]] Specifies one or more 'attribute equals value' + [attr=val [attr=val...]] Specifies one or more 'attribute equals value' pairs, separated by spaces. (AIX only)", "lsflexnode" => "Usage: @@ -606,7 +606,7 @@ Options: ); # Rebuild full command usage from its components -$usage{"rspconfig"} = $usage{"rspconfig.common"} . +$usage{"rspconfig"} = $usage{"rspconfig.common"} . $usage{"rspconfig.begin"} . $usage{"rspconfig.openbmc"} . " " . @@ -615,7 +615,7 @@ $usage{"rspconfig"} = $usage{"rspconfig.common"} . $usage{"rspconfig.openbmc"} = $usage{"rspconfig.common"} . $usage{"rspconfig.openbmc"}; -$usage{"rinv"} = $usage{"rinv.common"} . +$usage{"rinv"} = $usage{"rinv.common"} . $usage{"rinv.begin"} . $usage{"rinv.openbmc"} . $usage{"rinv.end"}; @@ -630,7 +630,7 @@ $usage{"rbeacon"} = $usage{"rbeacon.common"} . $usage{"rbeacon.openbmc"} = $usage{"rbeacon.common"} . $usage{"rbeacon.openbmc"}; -$usage{"rvitals"} = $usage{"rvitals.common"} . +$usage{"rvitals"} = $usage{"rvitals.common"} . $usage{"rvitals.begin"} . $usage{"rvitals.openbmc"} . $usage{"rvitals.end"}; @@ -638,7 +638,7 @@ $usage{"rvitals"} = $usage{"rvitals.common"} . $usage{"rvitals.openbmc"} = $usage{"rvitals.common"} . $usage{"rvitals.openbmc"}; -$usage{"rflash"} = $usage{"rflash.common"} . +$usage{"rflash"} = $usage{"rflash.common"} . $usage{"rflash.begin"} . $usage{"rflash.openbmc"} . " " . @@ -647,7 +647,7 @@ $usage{"rflash"} = $usage{"rflash.common"} . $usage{"rflash.openbmc"} = $usage{"rflash.common"} . $usage{"rflash.openbmc"}; -$usage{"rpower"} = $usage{"rpower.common"} . +$usage{"rpower"} = $usage{"rpower.common"} . $usage{"rpower.begin"} . $usage{"rpower.openbmc"} . $usage{"rpower.end"}; @@ -728,7 +728,7 @@ sub getVersion { =head3 parseCommand This function parses the given command to see if the usage or version string - need to be returned. + need to be returned. Arguments: command arguments @@ -781,14 +781,14 @@ sub parseCommand { #------------------------------------------------------------------------------- sub validateArgs { - my $command=shift; + my $command=shift; if ($command =~ /xCAT::Usage/) { $command = shift; } - - my $count=0; + + my $count=0; my @extrargs=@_; if($command =~ m/^(nodeset|rinstall|winstall)$/ ){ - #suppose that argument like "-p foo" have been processed and - #filtered by GetOpt subroutine + #suppose that argument like "-p foo" have been processed and + #filtered by GetOpt subroutine #fortunately the commands in this branch does not have such options foreach(@extrargs){ if($_ and $_ !~ m/^-[-]?\S+/){ @@ -800,5 +800,5 @@ sub validateArgs { } } - return [0]; + return [0]; } From b03809cea45433c1a14179250b08509221a36186 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0644/1681] Remove trailing spaces in file perl-xCAT/xCAT/Utils.pm --- perl-xCAT/xCAT/Utils.pm | 160 ++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm index 7b76bcb9c..8f9ad89a7 100644 --- a/perl-xCAT/xCAT/Utils.pm +++ b/perl-xCAT/xCAT/Utils.pm @@ -161,7 +161,7 @@ sub clroptionvars Arguments: mac: If requesting a UUIDv1, the mac to use to base it upon Returns: - string representation of a UUDv4, + string representation of a UUDv4, for example: f16196d1-7534-41c1-a0ae-a9633b030583 for example: f16196d1-7534-41c1-a0ae-a9633b030583 @@ -556,11 +556,11 @@ sub isLinux #------------------------------------------------------------------------------- -=head3 Version +=head3 Version Arguments: Optional 'short' string to request only the version; Returns: - xcat Version number + xcat Version number Globals: none Error: @@ -575,7 +575,7 @@ sub isLinux sub Version { my $version = shift; - + #force reload the xCAT::Version in case the perl-xcat is upgraded but xcatd is not restarted if($INC{'xCAT/Version.pm'}){ delete $INC{'xCAT/Version.pm'}; @@ -792,13 +792,13 @@ sub list_nodes_in_nodegroups #----------------------------------------------------------------------- =head3 - isMemberofGroup + isMemberofGroup Arguments: node,group Returns: 1 = is a member - 0 = not a member + 0 = not a member Globals: none @@ -1012,7 +1012,7 @@ sub runcmd3 { #a proper runcmd that indpendently returns stdout, stderr, pid and is joined into a single string with the newlines separating the lines. Arguments: - command, exitcode, reference to output, streaming mode + command, exitcode, reference to output, streaming mode Returns: see below Globals: @@ -1191,7 +1191,7 @@ sub runcmd refoutput - type of output to build Not set - array 1 - reference to an array - 2 - returns the response hash as received from the plugin. + 2 - returns the response hash as received from the plugin. Returns: @@ -1215,16 +1215,16 @@ sub runcmd Example: return output as reference to an array my $outref = xCAT::Utils->runxcmd($cmd,$sub_req, -2, 1); - + return response hash from plugin . Will not display error msg for any - exit_code setting. + exit_code setting. my $outref = xCAT::Utils->runxcmd($cmd,$sub_req, -1, 2); Comments: If refoutput is 1, then the output will be returned as a reference to an array for efficiency. - If refoutput is 2, then the response hash will be returned + If refoutput is 2, then the response hash will be returned as output. runxcmd will not parse the request structure, nor will it display the error message despite the exit_code setting. The caller will need to display the error. @@ -1235,9 +1235,9 @@ sub runcmd in the arg array. The caller to the runxcmd is responsible for filename expansion, that - would have been done if the command was run on the command line. - For example, the xdcp node1 /tmp/testfile* /tmp command needs to - have the /tmp/testfile* argument expanded before call xdcp with + would have been done if the command was run on the command line. + For example, the xdcp node1 /tmp/testfile* /tmp command needs to + have the /tmp/testfile* argument expanded before call xdcp with runxcmd. The easy way to do this is to use the perl glob function. @files=glob "/tmp/testfile*"; @@ -1505,7 +1505,7 @@ sub runxcmd_output =head3 runxcmd_output2 Internal subroutine for runxcmd to capture the output - from the xCAT daemon subrequest call. Returns the response hash + from the xCAT daemon subrequest call. Returns the response hash =cut #------------------------------------------------------------------------------- @@ -1650,8 +1650,8 @@ sub isServiceNode Arguments: none Returns: - 1 - localHost is Management Node - 0 - localHost is not a Management Node + 1 - localHost is Management Node + 0 - localHost is not a Management Node Globals: none Error: @@ -1744,15 +1744,15 @@ sub update_xCATSN #----------------------------------------------------------------------------- -=head3 isSN - +=head3 isSN + Determines if the input node name is a service node - Reads the servicenode table. nodename must be service node name as + Reads the servicenode table. nodename must be service node name as known by the Management node. - returns 1 if input host is a service node + returns 1 if input host is a service node Arguments: - hostname + hostname Returns: 1 - is Service Node 0 - is not a Service Node @@ -1798,19 +1798,19 @@ sub isSN #------------------------------------------------------------------------------- =head3 isMounted - Checks if the input directory is already mounted + Checks if the input directory is already mounted Arguments: - directory + directory Returns: - 1 - directory is mounted - 0 - directory is not mounted + 1 - directory is mounted + 0 - directory is not mounted Globals: none Error: -1 error Example: if (xCAT::Utils->isMounted($directory)) { blah; } - Comments: + Comments: none =cut @@ -1852,17 +1852,17 @@ sub isMounted #------------------------------------------------------------------------------- -=head3 runxcatd - Stops or starts xcatd +=head3 runxcatd + Stops or starts xcatd Arguments: xcatstart - start the daemon, restart if already running xcatstop - stop the daemon Returns: - 0 = not error, 1 = error + 0 = not error, 1 = error Globals: none Error: - + Example: my $rc = xCAT::runxcatd("xcatstart") ; ( starts xcatd) my $rc = xCAT::runxcatd("xcatstop") ; ( stops xcatd) @@ -1930,11 +1930,11 @@ sub runxcatd =head3 get_image_name get a name for the install image on AIX and Linux, to be used - by xdsh and sinv for the nodename + by xdsh and sinv for the nodename Arguments: path to image. Returns: - imagename + imagename =cut @@ -1965,8 +1965,8 @@ sub get_image_name #------------------------------------------------------------------------------- =head3 StartService - Supports AIX only, use startservice for Linux - Used by the service node plugin (AAsn.pm) to start requested services. + Supports AIX only, use startservice for Linux + Used by the service node plugin (AAsn.pm) to start requested services. Checks to see if the input service is already started. If it is started it stops and starts the service. Otherwise it just starts the service. @@ -2215,7 +2215,7 @@ sub CheckVersion #------------------------------------------------------------------------------- =head3 osver - Returns the os and version of the System you are running on + Returns the os and version of the System you are running on Arguments: $type: which type of os infor you want. Supported values are: all,os,version,release @@ -2542,7 +2542,7 @@ sub is_locked #---------------------------------------------------------------------------- =head3 parse_selection_string - Parse the selection string and + Parse the selection string and write the parsed result into %wherehash Arguments: @@ -2610,7 +2610,7 @@ sub parse_selection_string() #---------------------------------------------------------------------------- =head3 selection_string_match - Check whether a node matches the selection string + Check whether a node matches the selection string defined in hash %wherehash Arguments: @@ -2676,17 +2676,17 @@ sub selection_string_match() #------------------------------------------------------------------------------- -=head3 check_deployment_monitoring_settings +=head3 check_deployment_monitoring_settings Check the deployment retry monitoring settings. Arguments: $request: request hash - $mstring: The monitoring setting string - specified with the -m flag for rpower or rnetboot + $mstring: The monitoring setting string + specified with the -m flag for rpower or rnetboot Returns: 0 - ok 1 - failed Globals: - none + none Example: my $rc=xCAT::Utils->check_deployment_monitoring_settings($opt(m)) Comments: @@ -2979,7 +2979,7 @@ sub monitor_installation() #------------------------------------------------------------------------------- -=head3 get_unique_members +=head3 get_unique_members Description: Return an array which have unique members @@ -3080,12 +3080,12 @@ sub updateEtcHosts #------------------------------------------------------------------------------- -=head3 getDBName +=head3 getDBName Description: - Returns the current database (SQLITE,DB2,MYSQL,PG) + Returns the current database (SQLITE,DB2,MYSQL,PG) Arguments: - None + None Returns: Return string. Globals: @@ -3165,12 +3165,12 @@ sub full_path #------------------------------------------------------------------------------- =head3 isStateful - returns 1 if localHost is a Stateful install + returns 1 if localHost is a Stateful install Arguments: none Returns: - 1 - localHost is Stateful - 0 - localHost is not Stateful + 1 - localHost is Stateful + 0 - localHost is not Stateful Globals: none Error: @@ -3212,19 +3212,19 @@ sub isStateful #----------------------------------------------------------------------------- -=head3 setupAIXconserver +=head3 setupAIXconserver - Set AIX conserver + Set AIX conserver =cut #------------------------------------------------------------------------------- -=head3 setupAIXconserver +=head3 setupAIXconserver Description: Set AIX conserver Arguments: - $verbose: + $verbose: Returns: Return result of the operation Globals: @@ -3336,8 +3336,8 @@ sub setupAIXconserver =head3 isSELINUX Returns: - returns 0 if SELINUX is enabled - returns 1 if SELINUX is not enabled + returns 0 if SELINUX is enabled + returns 1 if SELINUX is not enabled Globals: none Error: @@ -3345,7 +3345,7 @@ sub setupAIXconserver Example: if (xCAT::Utils->isSELINUX()) { blah; } Comments: - This is tested on Redhat, may need more for SLES + This is tested on Redhat, may need more for SLES =cut #------------------------------------------------------------------------------- @@ -3368,10 +3368,10 @@ sub isSELINUX #------------------------------------------------------------------------------- -=head3 noderangecontainsMN +=head3 noderangecontainsMN Returns: - returns nothing, if ManagementNode is not the input noderange - returns name of MN, if Management Node is in the input noderange + returns nothing, if ManagementNode is not the input noderange + returns name of MN, if Management Node is in the input noderange Globals: none Error: @@ -3394,7 +3394,7 @@ sub noderangecontainsMn # name my @mnames; # management node names in the database, members of __mgmtnode my $tab = xCAT::Table->new('nodelist'); - + my @nodelist = $tab->getAllAttribsWhere("node in ("."\'".join("\',\'", @noderange)."\'".") and groups like '%__mgmtnode%'",'node'); return map {$_->{node}} @nodelist; # if no MN in the noderange, return nothing } @@ -3463,7 +3463,7 @@ my %MTM_P6P7 = ( #----------------------------------------------------------------------------- -=head3 isP6P7 +=head3 isP6P7 Check whether a MTM is a P6 or P7 machine Parameter: MTM of Power machine @@ -3684,8 +3684,8 @@ sub filter_nodes { #------------------------------------------------------------------------------- -=head3 filter_nostatusupdate() - +=head3 filter_nostatusupdate() + filter out the nodes which support provision status feedback from the status-nodes hash Returns: returns the filtered status-nodes hash @@ -3930,16 +3930,16 @@ sub time2string } #-------------------------------------------------------------------------------- -=head3 specialservicemgr +=head3 specialservicemgr some special services cannot be processed in sysVinit, upstart and systemd framework, should be process here... Arguments: - service name: + service name: action: start/stop/restart/status/enable/disable - outputoption: + outputoption: 1: return a hashref with the keys:"retcode","retmsg" otherwise: return retcode only Returns: - + a hashref if $outputoption is 1,the hash structure is: {"retcode"=>(status code, 0 for running/active,1 for stopped/inactive,2 for failed) "retmsg" =>(status string, running/active/stopped/inactive/failed) @@ -3948,7 +3948,7 @@ sub time2string retcode: 127 if the service specified is not processed the exit code of the service operation if the service specified is processed - + Globals: none Error: @@ -4023,21 +4023,21 @@ sub specialservicemgr { #-------------------------------------------------------------------------------- -=head3 servicemap - returns the name of service unit(for systemd) or service daemon(for SYSVinit). +=head3 servicemap + returns the name of service unit(for systemd) or service daemon(for SYSVinit). Arguments: $svcname: the name of the service $svcmgrtype: the service manager type: 0: SYSVinit 1: systemd - 2: upstart + 2: upstart Returns: the name of service unit or service daemon undef on fail Globals: none Error: - None + None Example: my $svc = xCAT::Utils->servicemap($svcname,1); Comments: @@ -4142,7 +4142,7 @@ sub servicemap { #-------------------------------------------------------------------------------- -=head3 startservice +=head3 startservice start a service Arguments: service name @@ -4217,7 +4217,7 @@ sub startservice { #-------------------------------------------------------------------------------- -=head3 stopservice +=head3 stopservice stop a service Arguments: service name @@ -4289,7 +4289,7 @@ sub stopservice { #-------------------------------------------------------------------------------- -=head3 restartservice +=head3 restartservice restart a service Arguments: service name @@ -4357,8 +4357,8 @@ sub restartservice { #-------------------------------------------------------------------------------- -=head3 checkservicestatus - returns theservice status. +=head3 checkservicestatus + returns theservice status. Arguments: $svcname: the name of the service $outputoption[optional]: @@ -4376,7 +4376,7 @@ sub restartservice { Globals: none Error: - None + None Example: my $ret = xCAT::Utils-checkservicestatus($svcname,1); my $retcode = xCAT::Utils-checkservicestatus($svcname); @@ -4475,7 +4475,7 @@ sub checkservicestatus { #-------------------------------------------------------------------------------- -=head3 enableservice +=head3 enableservice enable a service to start it on the system bootup Arguments: service name @@ -4551,7 +4551,7 @@ sub enableservice { #-------------------------------------------------------------------------------- -=head3 disableservice +=head3 disableservice disable a service to prevent it from starting on system bootup Arguments: service name From 8f24d2bae1ccdca590590d3ad6c62c9f62c12fce Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0645/1681] Remove trailing spaces in file perl-xCAT/xCAT/Version.pm --- perl-xCAT/xCAT/Version.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/xCAT/Version.pm b/perl-xCAT/xCAT/Version.pm index 95cfcb865..086799bde 100644 --- a/perl-xCAT/xCAT/Version.pm +++ b/perl-xCAT/xCAT/Version.pm @@ -21,11 +21,11 @@ use strict; #------------------------------------------------------------------------------- -=head3 Version +=head3 Version Arguments: Optional 'short' string to request only the version; Returns: - xcat Version number + xcat Version number Globals: none Error: From c8cf28755cf9a34e4b1a7c884d27afec44516cab Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0646/1681] Remove trailing spaces in file perl-xCAT/xCAT/Yum.pm --- perl-xCAT/xCAT/Yum.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/Yum.pm b/perl-xCAT/xCAT/Yum.pm index 368992a78..61da4db59 100644 --- a/perl-xCAT/xCAT/Yum.pm +++ b/perl-xCAT/xCAT/Yum.pm @@ -16,7 +16,7 @@ sub localize_yumrepo { my $pkgdir = shift; $distname=shift; $arch=shift; - + mkpath("$distrepopfx/$pkgdir"); open($yumrepofile, ">", "$distrepopfx/$pkgdir/local-repository.tmpl"); my %options = ( From 8a928c30035f31708feb10450d934dc5c6d7bb18 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0647/1681] Remove trailing spaces in file perl-xCAT/xCAT/Zone.pm --- perl-xCAT/xCAT/Zone.pm | 64 +++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/perl-xCAT/xCAT/Zone.pm b/perl-xCAT/xCAT/Zone.pm index 5f525d58d..babb42281 100644 --- a/perl-xCAT/xCAT/Zone.pm +++ b/perl-xCAT/xCAT/Zone.pm @@ -37,16 +37,16 @@ This program module file, is a set of Zone utilities used by xCAT *zone commands #-------------------------------------------------------------------------------- -=head3 genSSHRootKeys +=head3 genSSHRootKeys Arguments: - callback for error messages - directory in which to put the ssh RSA keys - zonename + callback for error messages + directory in which to put the ssh RSA keys + zonename rsa private key to use for generation ( optional) Returns: Error: 1 - key generation failure. Example: - $rc =xCAT::Zone->genSSHRootKeys($callback,$keydir,$rsakey); + $rc =xCAT::Zone->genSSHRootKeys($callback,$keydir,$rsakey); =cut #-------------------------------------------------------------------------------- @@ -144,13 +144,13 @@ sub genSSHRootKeys #-------------------------------------------------------------------------------- -=head3 getdefaultzone +=head3 getdefaultzone Arguments: - None + None Returns: Name of the current default zone from the zone table Example: - my $defaultzone =xCAT::Zone->getdefaultzone($callback); + my $defaultzone =xCAT::Zone->getdefaultzone($callback); =cut #-------------------------------------------------------------------------------- @@ -185,13 +185,13 @@ sub getdefaultzone #-------------------------------------------------------------------------------- -=head3 iszonedefined +=head3 iszonedefined Arguments: - zonename + zonename Returns: 1 if the zone is already in the zone table. Example: - xCAT::Zone->iszonedefined($zonename); + xCAT::Zone->iszonedefined($zonename); =cut #-------------------------------------------------------------------------------- @@ -212,14 +212,14 @@ sub iszonedefined #-------------------------------------------------------------------------------- -=head3 getzonekeydir +=head3 getzonekeydir Arguments: - zonename + zonename Returns: - path to the root ssh keys for the zone /etc/xcat/sshkeys//.ssh - 1 - zone not defined + path to the root ssh keys for the zone /etc/xcat/sshkeys//.ssh + 1 - zone not defined Example: - xCAT::Zone->getzonekeydir($zonename); + xCAT::Zone->getzonekeydir($zonename); =cut #-------------------------------------------------------------------------------- @@ -239,13 +239,13 @@ sub getzonekeydir #-------------------------------------------------------------------------------- -=head3 getmyzonename +=head3 getmyzonename Arguments: - $node -one nodename + $node -one nodename Returns: - $zonename + $zonename Example: - my $zonename=xCAT::Zone->getmyzonename($node); + my $zonename=xCAT::Zone->getmyzonename($node); =cut #-------------------------------------------------------------------------------- @@ -268,14 +268,14 @@ sub getmyzonename #-------------------------------------------------------------------------------- -=head3 enableSSHbetweennodes +=head3 enableSSHbetweennodes Arguments: - zonename + zonename Returns: 1 if the sshbetweennodes attribute is yes/1 or undefined - 0 if the sshbetweennodes attribute is no/0 + 0 if the sshbetweennodes attribute is no/0 Example: - xCAT::Zone->enableSSHbetweennodes($zonename); + xCAT::Zone->enableSSHbetweennodes($zonename); =cut #-------------------------------------------------------------------------------- @@ -316,14 +316,14 @@ sub enableSSHbetweennodes #-------------------------------------------------------------------------------- -=head3 usingzones +=head3 usingzones Arguments: - none + none Returns: 1 if the zone table is not empty 0 if empty Example: - xCAT::Zone->usingzones; + xCAT::Zone->usingzones; =cut #-------------------------------------------------------------------------------- @@ -352,9 +352,9 @@ sub usingzones Hash array by zonename point to the nodes in that zonename and sshkeydir -> {nodelist} -> array of nodes in the zone -> {sshkeydir} -> directory containing ssh RSA keys - -> {defaultzone} -> is it the default zone + -> {defaultzone} -> is it the default zone Example: - my %zonehash =xCAT::Zone->getzoneinfo($callback,@nodearray); + my %zonehash =xCAT::Zone->getzoneinfo($callback,@nodearray); Rules: If the nodes nodelist.zonename attribute is a zonename, it is assigned to that zone If the nodes nodelist.zonename attribute is undefined: @@ -449,11 +449,11 @@ sub getzoneinfo =head3 getnodesinzone Arguments: callback - zonename + zonename Returns: - Array of nodes + Array of nodes Example: - my @nodes =xCAT::Zone->getnodesinzone($callback,$zonename); + my @nodes =xCAT::Zone->getnodesinzone($callback,$zonename); =cut #-------------------------------------------------------------------------------- From 08357faa334731f21eb865175d364efe943b48e5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0648/1681] Remove trailing spaces in file perl-xCAT/xCAT/data/switchinfo.pm --- perl-xCAT/xCAT/data/switchinfo.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/data/switchinfo.pm b/perl-xCAT/xCAT/data/switchinfo.pm index b5793f01c..6fab0f150 100644 --- a/perl-xCAT/xCAT/data/switchinfo.pm +++ b/perl-xCAT/xCAT/data/switchinfo.pm @@ -1,6 +1,6 @@ # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html -#This module includes some glocal table to look up the switch type via mac and vendor +#This module includes some glocal table to look up the switch type via mac and vendor package xCAT::data::switchinfo; From fd6b22d55dfa29f446b45344e00ce2158aa5b854 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0649/1681] Remove trailing spaces in file perl-xCAT/xCAT/zvmCPUtils.pm --- perl-xCAT/xCAT/zvmCPUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/zvmCPUtils.pm b/perl-xCAT/xCAT/zvmCPUtils.pm index 22f5e67b7..66dffe22e 100644 --- a/perl-xCAT/xCAT/zvmCPUtils.pm +++ b/perl-xCAT/xCAT/zvmCPUtils.pm @@ -921,7 +921,7 @@ sub smapiFlashCopy { "" means that the current class is to be used anything else is the class to set on the punched file Returns : Operation results ("Done" or "Failed" with additional info) - Example : my $response = xCAT::zvmCPUtils->punch2Reader( $user, $hcp, $userId, $srcFile, + Example : my $response = xCAT::zvmCPUtils->punch2Reader( $user, $hcp, $userId, $srcFile, $tgtFile, $options, $spoolClass ); =cut From 10a39df027da382377b1f68fec29e33fd28e8903 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0650/1681] Remove trailing spaces in file perl-xCAT/xCAT/zvmMsgs.pm --- perl-xCAT/xCAT/zvmMsgs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/zvmMsgs.pm b/perl-xCAT/xCAT/zvmMsgs.pm index 6544f941a..e29e0f5e4 100644 --- a/perl-xCAT/xCAT/zvmMsgs.pm +++ b/perl-xCAT/xCAT/zvmMsgs.pm @@ -1407,4 +1407,4 @@ sub buildMsg { } return ( $recAction, $sev, $retMsg, $retExtra ); -} \ No newline at end of file +} From f678b4483972b9dfa54471f365b7eec15edb8463 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0651/1681] Remove trailing spaces in file perl-xCAT/xCAT/zvmUtils.pm --- perl-xCAT/xCAT/zvmUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/zvmUtils.pm b/perl-xCAT/xCAT/zvmUtils.pm index 893278fd5..3b3c698b0 100644 --- a/perl-xCAT/xCAT/zvmUtils.pm +++ b/perl-xCAT/xCAT/zvmUtils.pm @@ -4657,7 +4657,7 @@ sub injectMNKey { print $fh encode_json($md_json); close $fh; - # Replace the meta_data.json file in original config drive with the modified one + # Replace the meta_data.json file in original config drive with the modified one system( "find $cfgpath/openstack -name meta_data.json -print | xargs -i cp $cfgpath/meta_data.json {}"); `rm -f $cfgpath/meta_data.json`; From f7892875947ad644d23ed8136654edbe6da1e11d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0652/1681] Remove trailing spaces in file src/proxydhcp.c --- src/proxydhcp.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/proxydhcp.c b/src/proxydhcp.c index 745707619..efd092f78 100644 --- a/src/proxydhcp.c +++ b/src/proxydhcp.c @@ -9,7 +9,7 @@ #include #include -// the chunk size for each alloc +// the chunk size for each alloc int chunknum = 200; int doreload = 0; int verbose = 0; @@ -28,7 +28,7 @@ int nodenum = 0; void reload(int sig) { doreload = 1; } -// the subroutine which is used to load configuration from +// the subroutine which is used to load configuration from // /var/lib/xcat/proxydhcp.cfg to *data void loadcfg () { nodenum = 0; @@ -75,7 +75,7 @@ char *getwinpepath(char *node) { return NULL; } - + int main(int argc, char *argv[]) { int i; for(i = 0; i < argc; i++) @@ -151,11 +151,11 @@ int main(int argc, char *argv[]) { // use select to wait for the 4011 request packages coming fd_set fds; FD_ZERO(&fds); - FD_SET(serverfd, &fds); + FD_SET(serverfd, &fds); struct timeval timeout; timeout.tv_sec = 30; timeout.tv_usec = 0; - + int rc; if ((rc = select(serverfd+1,&fds,0,0, &timeout)) <= 0) { if (doreload) { @@ -165,12 +165,12 @@ int main(int argc, char *argv[]) { if (verbose) {syslog(LOG_DEBUG, "reload /var/lib/xcat/proxydhcp.cfg\n");} continue; } - + if (doreload) { loadcfg(); if (verbose) {syslog(LOG_DEBUG, "reload /var/lib/xcat/proxydhcp.cfg\n");} } - + pktsize = recvmsg(serverfd,&msg,0); if (pktsize < 320) { continue; @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) { myip = ((struct in_pktinfo*)(CMSG_DATA(cmsgptr)))->ipi_addr.s_addr; } } - + // get the ip of dhcp client clientip = 0; int i; @@ -201,20 +201,20 @@ int main(int argc, char *argv[]) { if (place) { *place = '\0'; } - + winpepath = getwinpepath(host->h_name); if (winpepath == NULL) { winpepath = defaultwinpe; } if (verbose) { sprintf(logmsg, "Received proxydhcp request from %s\n", host->h_name); - syslog(LOG_DEBUG, logmsg); + syslog(LOG_DEBUG, logmsg); } } } else { winpepath = defaultwinpe; } - + // get the Vendor class identifier char *arch = NULL; unsigned char *p = clientpacket + 0xf0; @@ -226,7 +226,7 @@ int main(int argc, char *argv[]) { p += *(p+1) + 2; } } - + char winboot[50]; // the bootload of winpe memset(winboot, 0, 50); if (0 == memcmp(arch, "00000", 5)) { // bios boot mode @@ -247,7 +247,7 @@ int main(int argc, char *argv[]) { strncpy(txtptr, winboot ,128); // keeping 128 in there just in case someone changes the string //strncpy(txtptr,"winboot/new/Boot/bootmgfw.efi",128); // keeping 128 in there just in case someone changes the string //strncpy(txtptr,"Boot/pxeboot.0",128); // keeping 128 in there just in case someone changes the string - clientpacket[0xf0]=0x35; //DHCP MSG type + clientpacket[0xf0]=0x35; //DHCP MSG type clientpacket[0xf1]=0x1; // LEN of 1 clientpacket[0xf2]=0x5; //DHCP ACK clientpacket[0xf3]=0x36; //DHCP server identifier @@ -256,7 +256,7 @@ int main(int argc, char *argv[]) { clientpacket[0xf6] = (myip>>16)&0xff; clientpacket[0xf7] = (myip>>8)&0xff; clientpacket[0xf8] = (myip)&0xff; - + char winBCD[50]; strcpy(winBCD, winpepath); strcat(winBCD, "Boot/BCD"); From b83f933355e09e993a4768195b3502af5ac3087e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0653/1681] Remove trailing spaces in file src/xcatflowrequest.c --- src/xcatflowrequest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xcatflowrequest.c b/src/xcatflowrequest.c index 7bf604370..d96692bd0 100644 --- a/src/xcatflowrequest.c +++ b/src/xcatflowrequest.c @@ -10,7 +10,7 @@ #include #include #include -int main(int argc, char* argv[]) { +int main(int argc, char* argv[]) { int server; struct addrinfo hints; struct addrinfo *results,*cur; From 50f2d2aca03bdfcd8328accd72aabe35d594ddbc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0654/1681] Remove trailing spaces in file travis.pl --- travis.pl | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/travis.pl b/travis.pl index 23e990e09..71f6ad95f 100644 --- a/travis.pl +++ b/travis.pl @@ -72,7 +72,7 @@ sub get_files_recursive print "[get_files_recursive]: failed to open $dir :$!\n"; return 1; } - + for (; ;) { my $direntry = readdir($fd); @@ -126,7 +126,7 @@ sub check_pr_format{ #print Dumper $pr_content; print "[check_pr_format] pr title = $pr_title\n"; print "[check_pr_format] pr body = $pr_body \n"; - + my $checkrst=""; if(! $pr_title){ $checkrst.="Missing title."; @@ -134,7 +134,7 @@ sub check_pr_format{ if(! $pr_body){ $checkrst.="Missing description."; } - + if(! $pr_milestone){ $checkrst.="Missing milestone."; } @@ -148,14 +148,14 @@ sub check_pr_format{ if(length($checkrst) == 0){ $check_result_str .= "> **PR FORMAT CORRECT**"; - send_back_comment("$check_result_str"); + send_back_comment("$check_result_str"); }else{ if($checkrst =~ /milestone/ || $checkrst =~ /labels/){ $check_result_str .= "> **PR FORMAT WARNING** : $checkrst"; send_back_comment("$check_result_str"); }else{ $check_result_str .= "> **PR FORMAT ERROR** : $checkrst"; - send_back_comment("$check_result_str"); + send_back_comment("$check_result_str"); return 1; } } @@ -167,8 +167,8 @@ sub check_pr_format{ # Fuction name: check_commit_owner # Description: Verify commits are not done by specified user # Attributes: user login to reject -# Return: -# Error string -User rejected, +# Return: +# Error string -User rejected, # Empty string -User not rejected #-------------------------------------------------------- sub check_commit_owner{ @@ -258,7 +258,7 @@ sub send_back_comment{ } } } - + print "[send_back_comment] method = $post_method to $post_url\n"; `curl -u "$ENV{'xcatbotuser'}:$ENV{'xcatbotpw'}" -X $post_method -d '{"body":"$message"}' $post_url`; } @@ -303,7 +303,7 @@ sub build_xcat_core{ } # my $buildpath ="/home/travis/build/xcat-core/"; -# my @buildfils = (); +# my @buildfils = (); # get_files_recursive("$buildpath", \@buildfils); # print "\n-----------Dumper build files-----------\n"; # print Dumper \@buildfils; @@ -318,7 +318,7 @@ sub build_xcat_core{ # Return code: #-------------------------------------------------------- sub install_xcat{ - + my @cmds = ("cd ./../../xcat-core && sudo ./mklocalrepo.sh", "sudo chmod 777 /etc/apt/sources.list", "sudo echo \"deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/devel/xcat-dep trusty main\" >> /etc/apt/sources.list", @@ -350,11 +350,11 @@ sub install_xcat{ print ">>>>>Dumper the output of '$cmd'\n"; print Dumper \@output; $check_result_str .= "> **INSTALL XCAT ERROR** : Please click ``Details`` label in ``Merge pull request`` box for detailed information"; - send_back_comment("$check_result_str"); + send_back_comment("$check_result_str"); return 1; }else{ print "[install_xcat] $cmd ....[Pass]\n"; - + print "\n------Config xcat and verify xcat is working correctly-----\n"; @cmds = ("sudo -s /opt/xcat/share/xcat/scripts/setup-local-client.sh -f travis", "sudo -s /opt/xcat/sbin/chtab priority=1.1 policy.name=travis policy.rule=allow", @@ -408,7 +408,7 @@ sub check_syntax{ foreach my $file (@files) { next if($file =~ /\/opt\/xcat\/share\/xcat\/netboot\/genesis\//); next if($file =~ /\/opt\/xcat\/probe\//); - + @output = runcmd("file $file"); if($output[0] =~ /perl /i){ @output = runcmd("sudo bash -c '. /etc/profile.d/xcat.sh && perl -I /opt/xcat/lib/perl -I /opt/xcat/lib -I /usr/lib/perl5 -I /usr/share/perl -c $file'"); @@ -468,9 +468,9 @@ sub run_fast_regression_test{ return 1; }else{ print "[run_fast_regression_test] $cmd .....:\n"; - print Dumper \@output; + print Dumper \@output; } - + my $hostname = `hostname`; chomp($hostname); print "hostname = $hostname\n"; @@ -481,11 +481,11 @@ sub run_fast_regression_test{ print RED "[run_fast_regression_test] $cmd ....[Failed]"; print "[run_fast_regression_test] error dumper:\n"; print Dumper \@output; - return 1; + return 1; } - + print "Dumper regression conf file:\n"; - @output = runcmd("cat $conf_file"); + @output = runcmd("cat $conf_file"); print Dumper \@output; @@ -498,7 +498,7 @@ sub run_fast_regression_test{ return 1; }else{ print "[run_fast_regression_test] $cmd .....:\n"; - print Dumper \@caseslist; + print Dumper \@caseslist; } #This is a black list for CI test @@ -508,7 +508,7 @@ sub run_fast_regression_test{ # sub array_filter { # my $src_array_ref = shift; # my $filter_array_ref = shift; -# +# # my @left_array; # foreach my $item (@{$src_array_ref}) { # my $hit = 0; @@ -553,7 +553,7 @@ sub run_fast_regression_test{ $check_result_str .= "> **FAST REGRESSION TEST Failed**: Totalcase $casenum Passed $passnum Failed $failnum FailedCases: $log_str. Please click ``Details`` label in ``Merge pull request`` box for detailed information"; send_back_comment("$check_result_str"); return 1; - }else{ + }else{ $check_result_str .= "> **FAST REGRESSION TEST Successful**: Totalcase $casenum Passed $passnum Failed $failnum"; send_back_comment("$check_result_str"); } From 76a872558be9d3a44a4e7693135966b8bdab3763 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0655/1681] Remove trailing spaces in file xCAT-IBMhpc/debian/copyright --- xCAT-IBMhpc/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/debian/copyright b/xCAT-IBMhpc/debian/copyright index f61d34dfe..87e60f492 100644 --- a/xCAT-IBMhpc/debian/copyright +++ b/xCAT-IBMhpc/debian/copyright @@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - + From 744cdf4bece267fd8c76cd917d03602afffddad6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0656/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post --- xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post index 802c92bd4..3431a1b51 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post @@ -5,12 +5,12 @@ # # Linux: for stateful (full-disk install) and stateless/statelite nodes # For stateful nodes: run as part of IBMhpc.postbootscript. -# For stateless/statelite nodes: run as postscript, you will need to +# For stateless/statelite nodes: run as postscript, you will need to # copy this script to /install/postscripts and specify it to nodes' # postscripts attribute. # -# BSR configuration on Power 775 cluster. More BSR configuration should +# BSR configuration on Power 775 cluster. More BSR configuration should # be done by PE postinstall in genimage or postbootscript in stateful install #chown root:bsr /dev/bsr* From f56fda8cc77f86475a4de780f78db811fb3c41a9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0657/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript --- xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript index f6692e9f2..d3de66513 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript @@ -22,7 +22,7 @@ $ps_dir/compilers_license # Run script to install PE and accept license $ps_dir/pe_install-1200 -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config $ps_dir/loadl_install-5103 From d96a05495618d79d7d0641f472abd87b97d4847a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0658/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall --- xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall index a88ebf8fb..82f63fbc5 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall @@ -3,12 +3,12 @@ #-- IBMhpc.postinstall #-- Run this script from your .postinstall to perform the following #-- general setup in your diskless image for your HPC cluster: -#-- - create entries in /etc/fstab for basic filesystems +#-- - create entries in /etc/fstab for basic filesystems #-- - enables the "cons" entry in /etc/inittab #-- - create initial copies of /etc/passwd and other files in the image #-- - turn on the "at" service #-- - turn on xinetd -#-- - +#-- - #-- #-- it gets these arguments: #-- @@ -45,7 +45,7 @@ echo "co:2345:respawn:/sbin/agetty -L 38400 console" >> $installroot/etc/inittab # Create initial copies of /etc/passwd and others in case they are needed # by other postscripts # If you would like xCAT to keep these up to date, -# use the xCAT syncfiles function which runs during +# use the xCAT syncfiles function which runs during # packimage/liteimg and at other times cp -p /etc/passwd $installroot/etc/passwd cp -p /etc/group $installroot/etc/group From 55adf47b7e7148c932e2f213da68f3a3379730ce Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0659/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall --- xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall index 1c93749e4..e29d9a7d9 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall @@ -3,12 +3,12 @@ #-- IBMhpc.postinstall #-- Run this script from your .postinstall to perform the following #-- general setup in your diskless image for your HPC cluster: -#-- - create entries in /etc/fstab for basic filesystems +#-- - create entries in /etc/fstab for basic filesystems #-- - enables the "cons" entry in /etc/inittab #-- - create initial copies of /etc/passwd and other files in the image #-- - turn on the "at" service #-- - turn on xinetd -#-- - +#-- - #-- #-- it gets these arguments: #-- @@ -44,7 +44,7 @@ echo "$TMP_inittab" > $installroot/etc/inittab # Create initial copies of /etc/passwd and others in case they are needed # by other postscripts # If you would like xCAT to keep these up to date, -# use the xCAT syncfiles function which runs during +# use the xCAT syncfiles function which runs during # packimage/liteimg and at other times cp -p /etc/passwd $installroot/etc/passwd cp -p /etc/group $installroot/etc/group @@ -60,8 +60,8 @@ chroot $installroot chkconfig xinetd on # Automatically mount /dev/cpuset at node boot if ! grep 'cpuset' $installroot/etc/init.d/boot.local ; then cat <>$installroot/etc/init.d/boot.local -if test -e /dev/cpuset || mkdir -p /dev/cpuset ; then - mount -t cpuset none /dev/cpuset +if test -e /dev/cpuset || mkdir -p /dev/cpuset ; then + mount -t cpuset none /dev/cpuset fi END fi From b1531809071c43df953e52c33f004c3c5d6187c7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0660/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter --- xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter b/xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter index c21de83b9..55952e29f 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter @@ -12,7 +12,7 @@ rmitab shdaemon > /dev/null 2>&1 #to disable topasrec, which runs as a cron job, need remove the following entry from /etc/inittab: #xmdaily:2:once:/usr/bin/topasrec -L -s 300 -R 1 -r 6 -o /etc/perf/daily/ -ypersistent=1 2>&1 >/dev/null #Start local binary recording -rmitab xmdaily > /dev/null 2>&1 +rmitab xmdaily > /dev/null 2>&1 #to disable PM data collection, which is really topasout, run: #55 23 * * * /var/perf/pm/bin/pmcfg >/dev/null 2>&1 #Enable PM Data Collection @@ -46,7 +46,7 @@ rmitab gsa_updmn > /dev/null 2>&1 #artex:2:wait:/usr/sbin/artexset -c -R /etc/security/artex/config/master_profile.xml > /dev/console 2>&1 rmitab artex > /dev/null 2>&1 -#this is HACMP function . . . +#this is HACMP function . . . #clcomd:23456789:once:/usr/bin/startsrc -s clcomd rmitab clcomd > /dev/null 2>&1 @@ -67,11 +67,11 @@ rmitab pconsole > /dev/null 2>&1 #rcnetwlm:23456789:wait:/etc/rc.netwlm start> /dev/console 2>&1 # Start netwlm rmitab rcnetwlm > /dev/null 2>&1 -#to disable cimservices, need to comment cimservices and platform agent: +#to disable cimservices, need to comment cimservices and platform agent: #cimservices:2:once:/usr/bin/startsrc -s cimsys >/dev/null 2>&1 #platform_agent:2:once:/usr/bin/startsrc -s platform_agent >/dev/null 2>&1 -rmitab cimservices > /dev/null 2>&1 -rmitab platform_agent > /dev/null 2>&1 +rmitab cimservices > /dev/null 2>&1 +rmitab platform_agent > /dev/null 2>&1 #we WILL want to add in RMC (RSCT) monitoring at some point #ctrmc:2:once:/usr/bin/startsrc -s ctrmc > /dev/console 2>&1 @@ -97,7 +97,7 @@ then grep -q "^start /usr/lib/sendmail" /etc/rc.tcpip if [[ $? -eq 0 ]] then cat /etc/rc.tcpip | sed 's/^start \/usr\/lib\/sendmail/#start \/usr\/lib\/sendmail/' > /tmp/rc.tcpip.tmpfile.$$ - cp -p /etc/rc.tcpip /etc/rc.tcpip.prev + cp -p /etc/rc.tcpip /etc/rc.tcpip.prev mv /tmp/rc.tcpip.tmpfile.$$ /etc/rc.tcpip fi stopsrc -s sendmail > /dev/null 2>&1 @@ -141,7 +141,7 @@ if [[ ! -f /var/spool/cron/crontabs/root.before.clean_jitter ]] then egrep -v "bin\/pmcfg|bin\/stcron|bin\/dumpctr|ras\/dumpcheck|bin\/errclear" /var/spool/cron/crontabs/root > /var/spool/cron/crontabs/root.after.clean_jitter - cp /var/spool/cron/crontabs/root.after.clean_jitter /var/spool/cron/crontabs/root + cp /var/spool/cron/crontabs/root.after.clean_jitter /var/spool/cron/crontabs/root fi #for i in $(ps -efk | egrep "\/usr\/sbin\/cron|topasrec" | grep -v grep | awk ' { print $2} ') ; do @@ -178,7 +178,7 @@ sleep 1 grep -q cosched3 /etc/poe.priority 2> /dev/null if [[ $? -ne 0 ]] then echo '* cosched1 18 100 97 10' >> /etc/poe.priority - echo '* cosched2 13 100 99.5 10' >> /etc/poe.priority + echo '* cosched2 13 100 99.5 10' >> /etc/poe.priority echo '* cosched3 13 100 99 3' >> /etc/poe.priority echo '* cosched4 18 100 97 1' >> /etc/poe.priority chmod 644 /etc/poe.priority From 48f44488bcc991151dff6857089d7e032971d79a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0661/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license --- xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license index 57a296402..49d0bb070 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license @@ -1,6 +1,6 @@ #!/bin/sh -# +# # Sample script to accept licenses for the IBM vacpp and xlf compilers # For AIX: # do nothing, license accepted with installp -Y flag @@ -57,6 +57,6 @@ if [ $OS != "AIX" ]; then echo 1 | chroot $installroot /$xlf_script fi fi -fi +fi From aafc8cab1a872ebcb791bf87284dd9cb28c13b00 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0662/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license --- xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license index 9f282e845..21e13d391 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license @@ -1,6 +1,6 @@ #!/bin/sh -# +# # Sample script to accept licenses for the IBM upc compilers # For AIX: # do nothing, license accepted with installp -Y flag @@ -27,6 +27,6 @@ if [ $OS != "AIX" ]; then echo 1 | chroot $installroot /$upc_script fi fi -fi +fi From dd360f6871fa8904c1d14500eacfff2cace89322 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0663/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall --- xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall index d342eab5c..d5935cae3 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall @@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/essl/essl_install -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install-5103 From b87f19cd6c28dfb32c9f2e530d09306ce1e6a8bd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0664/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist --- .../share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist index c4ebb4cdc..a7d5a77ea 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist @@ -1,3 +1,3 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist# From 688917ab7eb139341aaa01203b737e9c06be0b61 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0665/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist --- xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist index 6cbc33e63..22f43ace8 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist @@ -1,2 +1,2 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhels6.x86_64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist# From ab0eb41178ecb55118b9a496c0cb82e69656a6d7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0666/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall --- xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall index 1147a189c..7d42a24b8 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall @@ -57,7 +57,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/essl/essl_install -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install-5103 From 8b3326fed0824c928f19146c34755a6e4682fff5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0667/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist --- .../share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist index 60208da41..164c2b793 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -# Sample otherpkgs pkglist for installing all IBM HPC products in a +# Sample otherpkgs pkglist for installing all IBM HPC products in a # SLES11 PPC64 diskless image #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.otherpkgs.pkglist# From e418d29a2242e431028fd360aec07a23c7cda08d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0668/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall --- xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall index ca3eebaa1..4361e586c 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall @@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ # installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/essl/essl_install -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install-5103 From e8eba31fa6d0cffe2d2e33abea7a9a624c1c66d3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0669/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist --- .../share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist index 77159fbd5..2ee70d02c 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist @@ -1,3 +1,3 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist# From 59370589061010b49217aeb053fc534294f4d0a9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0670/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist --- xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist index 1f7c1b602..aa8076169 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist @@ -1,2 +1,2 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist# From 3f9e4d81f15f36a74ff50e7d4389cbf55a5ef913 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0671/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall --- xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall index 3748172fc..7b49819f4 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall @@ -57,7 +57,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/essl/essl_install -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install-5103 From 77c80b1419f5a6e0b4d497df186971865a754f6a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0672/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall --- .../share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall index ddda8dd35..77b819184 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall @@ -52,7 +52,7 @@ installroot=$installroot NODESETSTATE=genimage $hpc/compilers/compilers_licens # Run script to install PE and accept license installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_install-1200 -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install-5103 From b69c37278b133633c62d5fb8f9feb0aad6352ac8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0673/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist --- .../xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist index c4ebb4cdc..a7d5a77ea 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist @@ -1,3 +1,3 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist# From 4be629554b3dcc7e5d68dbeb8c9e9615e1f474b2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0674/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist --- xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist index 8bad0a3a3..a0cc1a84d 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist @@ -1,4 +1,4 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhels6.x86_64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.rhels6.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.pkglist# From f8f3a8b6ecad4a366c580e7d388c35ae403deaa9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0675/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall --- .../share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall index 4e391983d..d63667d61 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall @@ -52,7 +52,7 @@ installroot=$installroot $hpc/gpfs/gpfs_mmsdrfs # Run script to install PE and accept license installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_install-1200 -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install-5103 From 7518985c574bf4e563491f04a39fed8ea67a88e6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0676/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist --- .../xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist index 60208da41..164c2b793 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -# Sample otherpkgs pkglist for installing all IBM HPC products in a +# Sample otherpkgs pkglist for installing all IBM HPC products in a # SLES11 PPC64 diskless image #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.otherpkgs.pkglist# From a90fff066071c071c19abc510af7b41184d355bc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0677/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall --- .../share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall index 25f8ec2af..86eeffda8 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall @@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/essl/essl_install -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install-5103 From b4ed3abcf4be36a4dd93ec9e0a4653dc36972164 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0678/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist --- .../xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist index 77159fbd5..2ee70d02c 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist @@ -1,3 +1,3 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist# From 9b6fcd5f5df6528afae3844ed6a128b781ace3d4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0679/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist --- xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist index 1f7c1b602..aa8076169 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist @@ -1,2 +1,2 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist# From f419759e6bd4d18c397e6ec9154721bb6aa5a43f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0680/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall --- .../share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall index 3748172fc..7b49819f4 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall @@ -57,7 +57,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/essl/essl_install -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install-5103 From a6dcdf2b8fbcbb5acaaed4463f50ba89a383fc2c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0681/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install --- xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install index 3d9ec7e5a..e7703fb93 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/sh -# +# # Sample script to accept licenses and install ESSL and PESSL packages # For AIX: # TBD @@ -22,7 +22,7 @@ fi if [ $OS != "AIX" ]; then if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then # Being run from a stateful install postscript - # Copy rpms directly from the xCAT management node and install + # Copy rpms directly from the xCAT management node and install mkdir -p /tmp/essl rm -f -R /tmp/essl/* cd /tmp/essl @@ -62,6 +62,6 @@ if [ $OS != "AIX" ]; then fi rm -rf $installroot/$tmpdir fi -fi +fi From 8cc8b1c070f9b377483301603563685bcf3a5097 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0682/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100 --- xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100 b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100 index fd4ad6efd..bef218b96 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100 +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100 @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/sh -# +# # Sample script to accept licenses and install ESSL and PESSL packages # For AIX: # TBD @@ -22,7 +22,7 @@ #if [ $OS != "AIX" ]; then # if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then # # Being run from a stateful install postscript -# # Copy rpms directly from the xCAT management node and install +# # Copy rpms directly from the xCAT management node and install # mkdir -p /tmp/essl # rm -f -R /tmp/essl/* # cd /tmp/essl @@ -64,6 +64,6 @@ # #fi # rm -rf $installroot/$tmpdir # fi -#fi +#fi # # From 5c6a39615fb95cfe50cad6f5f3e419b2d0f8f31f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0683/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist --- xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist index 7a3d8dab6..11f5fa178 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist @@ -3,7 +3,7 @@ bc #the following are needed by the license accptance, and removed afterward xorg-x11-libX11-32bit -xorg-x11-libXau-32bit -xorg-x11-libXext-32bit +xorg-x11-libXau-32bit +xorg-x11-libXext-32bit xorg-x11-libXp-32bit xorg-x11-libxcb-32bit From 6b97991fd424efea820484750048995a590babab Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0684/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start --- xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start index f643442c0..7933fe55a 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start @@ -1,7 +1,7 @@ #!/bin/sh # # Run this script as a postscript on any node to start the GPFS daemon -# +# # If you have any special network dependencies, you may want to add code # to check them first From 333fa1869dbd74c4e90bc0ef24aef56ecced26f2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0685/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates --- .../share/xcat/IBMhpc/gpfs/gpfs_updates | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates index 5d8c9fd34..f03eee8a2 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates @@ -1,19 +1,19 @@ #!/bin/sh -# -# Sample script to install and configure GPFS +# +# Sample script to install and configure GPFS # For AIX: -# Assumes the GPFS filesets and updates were installed using +# Assumes the GPFS filesets and updates were installed using # xCAT bundle files or some other mechanism. This script does not # install additional software. # It will do the following: -# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - create /var/mmfs/etc/nsddevices that simply returns 0 # - add GPFS paths to profile # For Linux: # Assumes the base GPFS rpms were installed with the xCAT 'otherpkgs' # postscript (stateful install) or with the otherpkgs processing of # genimage (stateless/statelite install). This script will install any -# gpfs update rpms that exist on the xCAT management node in the +# gpfs update rpms that exist on the xCAT management node in the # /install/post/otherpkgs/gpfs_updates directory. # This is necessary because the GPFS updates can ONLY be installed # after the base rpms have been installed, and the update rpms cannot @@ -37,7 +37,7 @@ UPDATES_DIR='post/otherpkgs/gpfs_updates' if [ $OS != "AIX" ]; then if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then # Being run from a stateful install postscript - # Copy rpms directly from the xCAT management node and install + # Copy rpms directly from the xCAT management node and install mkdir -p /tmp/gpfs_updates rm -f -R /tmp/gpfs_updates/* cd /tmp/gpfs_updates @@ -66,9 +66,9 @@ if [ $OS != "AIX" ]; then fi fi fi -fi +fi -## Create an empty nsddevices script for GPFS +## Create an empty nsddevices script for GPFS ## This assumes that the node is NOT an NSD server #if [ $OS == "AIX" ]; then # # Create the script on the node @@ -95,7 +95,7 @@ if [ $OS == "AIX" ]; then # add to /etc/profile if ! grep 'mmfs' $installroot/etc/profile > /dev/null 2>&1; then echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' >> $installroot/etc/profile - fi + fi else # assume Linux gpfsprofile=/etc/profile.d/gpfs if [ $NODESETSTATE == "genimage" ]; then From 6e5eb9372e38e98ee86beda157e4b16275a9fc0d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0686/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv --- xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv index 682b09e52..440df675d 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv @@ -1,4 +1,4 @@ #image,file,options,comments,disable "ALL","/home/",,"for user management, PE,LL use non-root user", "ALL","/var/loadl/","persistent","used by LL log, spool and exec", -"ALL","/etc/LoadL.cfg","tmpfs","used by LL llcompute.sh", \ No newline at end of file +"ALL","/etc/LoadL.cfg","tmpfs","used by LL llcompute.sh", From 21c0f96d7389db4b68b37e4b96770b7bf1dca87e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0687/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install --- .../share/xcat/IBMhpc/loadl/loadl_install | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install index 8ed952837..18a891f0f 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # # Sample script to accept license and install LoadLeveler resmgr package @@ -13,19 +13,19 @@ # Change the owner of these directories (modify "loadl_admin" and # "loadl_group" if not using loadl:loadl) # If run from genimage, copy in /etc/LoadL.cfg from MN into image -# +# OS=`uname` INSTALL_DIR='/install' LOADL_DIR=$loadldir -#### +#### # Linux Note: This script only installs the LoadL_resmgr_full rpm # To also install the LoadL_scheduler rpm, remove the "-c resmgr" # option from the line below # Also, change the bin path below to the correct directory -#### +#### linux_loadl_license_script="/opt/ibmll/LoadL/sbin/install_ll -c resmgr" #linux_loadl_license_script="/opt/ibmll/LoadL/sbin/install_ll" linux_loadl_bin=/opt/ibmll/LoadL/resmgr/full/bin @@ -116,16 +116,16 @@ fi # Create LoadLeveler Directories: # For stateless nodes, these directories need to be created in the image -# since they will be in memory only, and will be lost on node reboot. -# You may choose to modify this approach and use a more -# persistent location. -# For statelite, make sure the directory is writable; -# this will also be a memory-only copy of the files unless you set -# the directory "persistent" in the statelite table. +# since they will be in memory only, and will be lost on node reboot. +# You may choose to modify this approach and use a more +# persistent location. +# For statelite, make sure the directory is writable; +# this will also be a memory-only copy of the files unless you set +# the directory "persistent" in the statelite table. if [ $NODESETSTATE != "genimage" ]; then # running as a postscript in a full-disk install or AIX diskless install installroot="" -fi +fi mkdir -p $installroot$logdir/execute mkdir -p $installroot$logdir/spool mkdir -p $installroot$logdir/log @@ -146,7 +146,7 @@ chown -R $loadl_admin:$loadl_group $installroot$logdir/ #fi -# UNCOMMENT to Start loadleveler during postscripts +# UNCOMMENT to Start loadleveler during postscripts #if [ $NODESETSTATE != "genimage" ]; then # /usr/lpp/LoadL/resmgr/full/bin/llrctl start #fi From 2ed8da4ebb2b0d30608c5f7fda1204e68d5e5851 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0688/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103 --- .../xcat/IBMhpc/loadl/loadl_install-5103 | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103 b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103 index 187dd87cf..4d089404b 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103 +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # # Sample script to accept license and install LoadLeveler resmgr package @@ -13,7 +13,7 @@ # Change the owner of these directories (modify "loadl_admin" and # "loadl_group" if not using loadl:loadl) # If run from genimage, copy in /etc/LoadL.cfg from MN into image -# +# OS=`uname` @@ -81,16 +81,16 @@ fi # Create LoadLeveler Directories: # For stateless nodes, these directories need to be created in the image -# since they will be in memory only, and will be lost on node reboot. -# You may choose to modify this approach and use a more -# persistent location. -# For statelite, make sure the directory is writable; -# this will also be a memory-only copy of the files unless you set -# the directory "persistent" in the statelite table. +# since they will be in memory only, and will be lost on node reboot. +# You may choose to modify this approach and use a more +# persistent location. +# For statelite, make sure the directory is writable; +# this will also be a memory-only copy of the files unless you set +# the directory "persistent" in the statelite table. if [ $NODESETSTATE != "genimage" ]; then # running as a postscript in a full-disk install or AIX diskless install installroot="" -fi +fi mkdir -p $installroot$logdir/execute mkdir -p $installroot$logdir/spool mkdir -p $installroot$logdir/log @@ -111,7 +111,7 @@ chown -R $loadl_admin:$loadl_group $installroot$logdir/ #fi -# UNCOMMENT to Start loadleveler during postscripts +# UNCOMMENT to Start loadleveler during postscripts #if [ $NODESETSTATE != "genimage" ]; then # /usr/lpp/LoadL/resmgr/full/bin/llrctl start #fi From 2bc5d3ba824e62b7cbdc3cbd53b6a12c10071526 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0689/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist --- .../share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist index 7660fe1ed..fb2c9edc2 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist @@ -5,4 +5,4 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/login-loadl.otherpkgs.pkglist# xcat/xcat-core/perl-xCAT -xcat/xcat-core/xCAT-client \ No newline at end of file +xcat/xcat-core/xCAT-client From 2f51ed282c870d033a2ddae283a0442a185bf317 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0690/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist --- .../share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist index 77bacf166..3f3bfbce7 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist @@ -1,5 +1,5 @@ -# Sample otherpkgs pkglist for installing all IBM HPC products in a -# SLES11 PPC64 login node +# Sample otherpkgs pkglist for installing all IBM HPC products in a +# SLES11 PPC64 login node #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.otherpkgs.pkglist# #NEW_INSTALL_LIST# @@ -9,4 +9,4 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/login-loadl.otherpkgs.pkglist# xcat/xcat-core/perl-xCAT -xcat/xcat-core/xCAT-client \ No newline at end of file +xcat/xcat-core/xCAT-client From 8e17074542848c1c37128c2e3b5d7d0351673626 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0691/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup --- xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup index 951306755..aa369f6b3 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup @@ -20,13 +20,13 @@ profile=$4 workdir=$5 #uninstall the ibm-java2 and rpms pulled in by it -rpm -e --root $installroot ibm-java2-ppc64-jre.ppc64 libXp.ppc libXp.ppc64 +rpm -e --root $installroot ibm-java2-ppc64-jre.ppc64 libXp.ppc libXp.ppc64 #uninstall the rpms pulled in by LoadL_resmgr -rpm -e --nodeps --root $installroot libX11.ppc libX11.ppc64 libX11-common libXext.ppc libXext.ppc64 libXScrnSaver.ppc64 libXau.ppc libXau.ppc64 libICE.ppc64 libSM.ppc64 libXmu.ppc64 libXt.ppc64 libXtst.ppc64 libXi.ppc64 libxcb.ppc libxcb.ppc64 libstdc++.ppc libstdc++.ppc64 +rpm -e --nodeps --root $installroot libX11.ppc libX11.ppc64 libX11-common libXext.ppc libXext.ppc64 libXScrnSaver.ppc64 libXau.ppc libXau.ppc64 libICE.ppc64 libSM.ppc64 libXmu.ppc64 libXt.ppc64 libXtst.ppc64 libXi.ppc64 libxcb.ppc libxcb.ppc64 libstdc++.ppc libstdc++.ppc64 #uninstall the rpms pulled in by vacpp.rte -rpm -e --nodeps --root $installroot gcc.ppc64 gcc-c++.ppc64 cpp.ppc64 glibc-devel.ppc glibc-devel.ppc64 glibc-headers.ppc64 libstdc++-devel.ppc libstdc++-devel.ppc64 +rpm -e --nodeps --root $installroot gcc.ppc64 gcc-c++.ppc64 cpp.ppc64 glibc-devel.ppc glibc-devel.ppc64 glibc-headers.ppc64 libstdc++-devel.ppc libstdc++-devel.ppc64 #uninstall rpms that should not be on a compute node #rpm -e --root $installroot libjpeg libtiff fontconfig freetype From 90507a74e5fe544f217beb1f9e81e848d4ece2f9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0692/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup --- xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup index 90202746a..5fde1123a 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup @@ -20,7 +20,7 @@ profile=$4 workdir=$5 #uninstall the ibm-java2 and rpms pulled in by it -rpm -e --root $installroot ibm-java2-ppc64-jre xorg-x11-libX11-32bit xorg-x11-libXau-32bit xorg-x11-libXext-32bit xorg-x11-libXp-32bit xorg-x11-libxcb-32bit +rpm -e --root $installroot ibm-java2-ppc64-jre xorg-x11-libX11-32bit xorg-x11-libXau-32bit xorg-x11-libXext-32bit xorg-x11-libXp-32bit xorg-x11-libxcb-32bit #uninstall the rpms pulled in by LoadL_resmgr rpm -e --nodeps --root $installroot xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxcb xorg-x11-libxkbfile From d0fe78a03ef67bca773f9435fdd8917b15431b7f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0693/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist --- .../IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist index 1228dfda8..c1eb042d9 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist @@ -1,17 +1,17 @@ -# Sample otherpkgs pkglist for installing all IBM HPC products in a -# RHEL6 PPC64 minimal diskless image +# Sample otherpkgs pkglist for installing all IBM HPC products in a +# RHEL6 PPC64 minimal diskless image #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/min-compilers.otherpkgs.pkglist# -# NEW_INSTALL_LIST +# NEW_INSTALL_LIST #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/min-gpfs.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist# -# For full-disk (stateful) images EDIT below to use rsct.otherpkgs +# For full-disk (stateful) images EDIT below to use rsct.otherpkgs # For diskless -# rpms are installed with postinstall script +# rpms are installed with postinstall script #do not INCLUDE:/opt/xcat/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist# From 29ec4cc9e100fb1a6222853dc102ae587d1aa67c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0694/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall --- .../share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall index 52e163271..9cb204a3c 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall @@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/essl/essl_install -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install From 72b3c233b8b97fe4c129c5d6b3a2e07ced082fae Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0695/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist --- .../xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist index 65e0973fc..59c738ba1 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist @@ -1,4 +1,4 @@ -# Sample otherpkgs pkglist for installing all IBM HPC products in a +# Sample otherpkgs pkglist for installing all IBM HPC products in a # SLES11 PPC64 minimal diskless image #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/min-compilers.otherpkgs.pkglist# From b216ecdf38a8c02f5cb9708cace8a5b722ae8e4f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0696/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall --- .../share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall index 2849f9c25..4163714a4 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall @@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/essl/essl_install -# Run script to accept LoadLeveler license, install product rpms, +# Run script to accept LoadLeveler license, install product rpms, # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install From db01cab84838f7849614d7257910d35fdeed0272 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0697/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning --- xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning b/xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning index 18972b539..72ae47c1f 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning @@ -6,12 +6,12 @@ chdev -l mlt0 -a agg_killtime=-1 2>/dev/null # allow "agg_interval" and "agg_threshold" to default -# The effect of the above is that complete ml route entries last forever, incomplete entries time out +# The effect of the above is that complete ml route entries last forever, incomplete entries time out # in 40 seconds, and there are no keepalive probes for complete entries (to reduce OS jitter). -# The following is also recommended to improve balance across hf interfaces (assuming sequential ml -# addressing, at least within each drawer). Note that "agg_hash" must be set PRIOR to the ml interface -# being configured. +# The following is also recommended to improve balance across hf interfaces (assuming sequential ml +# addressing, at least within each drawer). Note that "agg_hash" must be set PRIOR to the ml interface +# being configured. chdev -l mlt0 -a agg_hash=2 2>/dev/null From 4a1360705a6d8d4f8e499c6ea34a3d73fa495a2a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0698/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh --- xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh index 486aa1c3c..f3024fc39 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh @@ -31,5 +31,5 @@ done if [ -f /root/.ckpt.key ]; then cat /root/.ckpt.key > /sys/kernel/checkpoint/checksum_key else - echo 'ERROR: no checkpoint key found' + echo 'ERROR: no checkpoint key found' fi From a9105162d8db7f97ddc900082724a9a7bfeef658 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0699/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist --- xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist index 552404465..adc7a8a01 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist @@ -3,7 +3,7 @@ # Temporary for xCAT 2.6: # You should comment out these packages when running with HFI, # but you will also then need to use the xCAT 2.6 pe_install script -# that does a force install of pe. The current pe packages prereq +# that does a force install of pe. The current pe packages prereq # these libibverbs packages. libibverbs.i686 libibverbs.x86_64 From 2b4f16522f664ac9715ca8448682e751b5c174ba Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0700/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist --- xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist index c0de25076..a9e2256a8 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist @@ -3,7 +3,7 @@ # Temporary for xCAT 2.6: # You should comment out these packages when running with HFI, # but you will also then need to use the xCAT 2.6 pe_install script -# that does a force install of pe. The current pe packages prereq +# that does a force install of pe. The current pe packages prereq # these libibverbs packages. libibverbs libibverbs-32bit From b6fd7c82c41db9831f1794a77f9e9fae363806ce Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0701/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist --- xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist index 552404465..adc7a8a01 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist @@ -3,7 +3,7 @@ # Temporary for xCAT 2.6: # You should comment out these packages when running with HFI, # but you will also then need to use the xCAT 2.6 pe_install script -# that does a force install of pe. The current pe packages prereq +# that does a force install of pe. The current pe packages prereq # these libibverbs packages. libibverbs.i686 libibverbs.x86_64 From 0798209decb587a1a9aa7bfa152e18846701b3cd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0702/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install --- xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install index 77dd71dc8..f35460876 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # # # Sample script to customize options for PE @@ -15,7 +15,7 @@ # (java accept program will hang) # - Copy PE license files from MN into image # - Install PE rpms -# - Create a smaller PNSD log file in /tmp +# - Create a smaller PNSD log file in /tmp # - Configure poe.limits file OS=`uname` @@ -48,7 +48,7 @@ if [ $OS != "AIX" ]; then rpm -Uvh IBM_pe_license*.rpm fi IBM_PE_LICENSE_PROMPT=N /opt/ibmhpc/install/sbin/accept_ppe_license.sh - rpm -Uvh --force ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm + rpm -Uvh --force ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm cd / rm -Rf /tmp/pe fi @@ -69,7 +69,7 @@ if [ $OS != "AIX" ]; then mkdir -p $installroot/etc/opt/ibmhpc/license cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license # Install PE product rpms - INUCLIENTS=1 INUBOSTYPE=1 zypper -R $installroot install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm + INUCLIENTS=1 INUBOSTYPE=1 zypper -R $installroot install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm else # For Redhat, etc., assume yum is available on the system running genimage if [ ! -d /etc/opt/ibmhpc/license ] ; then @@ -85,7 +85,7 @@ if [ $OS != "AIX" ]; then cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license #chroot $installroot /opt/ibmhpc/install/sbin/accept_ppe_license.sh # Install PE product rpms - INUCLIENTS=1 INUBOSTYPE=1 yum --installroot $installroot --nogpgcheck install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm + INUCLIENTS=1 INUBOSTYPE=1 yum --installroot $installroot --nogpgcheck install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm fi fi fi @@ -93,7 +93,7 @@ fi # Configure the PNSD.cfg to use a smaller log so it doesn't use so much memory -# for a stateless image. Normally, pnsd creates this file if it does not +# for a stateless image. Normally, pnsd creates this file if it does not # exist, but it will not fill it in if it does exist. if [ ! -f $installroot/etc/PNSD.cfg ]; then echo "log_file = /tmp/serverlog" > $installroot/etc/PNSD.cfg From 7ca95b622ad42badb3ef0f1b540d912f79dab360 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0703/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100 --- xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100 b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100 index dc971b285..f1d0a794e 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100 +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100 @@ -1,11 +1,11 @@ -#!/bin/sh +#!/bin/sh # # # Sample script to customize options for PE # For AIX: # TBD # For Linux: -# - Create a smaller PNSD log file in /tmp +# - Create a smaller PNSD log file in /tmp # - Configure poe.limits file OS=`uname` @@ -24,7 +24,7 @@ if [ $NODESETSTATE != "genimage" ]; then fi # Configure the PNSD.cfg to use a smaller log so it doesn't use so much memory -# for a stateless image. Normally, pnsd creates this file if it does not +# for a stateless image. Normally, pnsd creates this file if it does not # exist, but it will not fill it in if it does exist. if [ ! -f $installroot/etc/PNSD.cfg ]; then echo "log_file = /tmp/serverlog" > $installroot/etc/PNSD.cfg From 0e49311d778cfe2f3e4b3b8f1ffe3996434e966b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0704/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 --- xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 index e4b303760..6706c7bb0 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 @@ -1,38 +1,38 @@ -#!/bin/sh +#!/bin/sh # # # Sample script to customize options for PE # For AIX: # TBD # For Linux: -# - Create a smaller PNSD log file in /tmp +# - Create a smaller PNSD log file in /tmp # - Configure poe.limits file # - Generate and store checkpoint key # - BSR support configuration OS=`uname` -# On AIX, need to correctly configure LAPI kernel extensions on a +# On AIX, need to correctly configure LAPI kernel extensions on a # diskless node boot # (added for PE 1.2 and newer releases) if [ "$OS" == "AIX" ]; then if [ "$NODESETSTATE" = "netboot" -o \ "$NODESETSTATE" = "statelite" -o \ "$NODESETSTATE" = "diskless" -o \ - "$NODESETSTATE" = "dataless" ]; then + "$NODESETSTATE" = "dataless" ]; then # Unconfigure any existing LAPI kernel extension if [ -x /etc/methods/ucfgzcmem ] ; then - /etc/methods/ucfgzcmem + /etc/methods/ucfgzcmem fi # Configure the LAPI kernel extension at the latest level if [ -x /etc/methods/cfgzcmem ] ; then - /etc/methods/cfgzcmem + /etc/methods/cfgzcmem fi fi fi # Configure the PNSD.cfg to use a smaller log so it doesn't use so much memory -# for a stateless image. Normally, pnsd creates this file if it does not +# for a stateless image. Normally, pnsd creates this file if it does not # exist, but it will not fill it in if it does exist. if [ ! -f $installroot/etc/PNSD.cfg ]; then echo "log_file = /tmp/serverlog" > $installroot/etc/PNSD.cfg @@ -116,7 +116,7 @@ if [ "$OS" == "AIX" ]; then /usr/sbin/trustchk -ry ALL >/dev/null 2>&1 fi -# BSR configuration, uncomment the following lines to enable BSR configuration on Power Linux cluter. +# BSR configuration, uncomment the following lines to enable BSR configuration on Power Linux cluter. #if [ "$OS" != "AIX" ]; then # if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then # groupadd bsr From 610064a998db9b1037af524947788ba0cbf5b232 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0705/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX --- xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX index 37618d66c..5aaf5abc1 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX @@ -2,7 +2,7 @@ Run as root on the EMS. This test uses xdsh and uses "lpar" for the node group. Use a different node group if desired. -Note xdsh can leave behind processes if you do a in the middle of a command. +Note xdsh can leave behind processes if you do a in the middle of a command. To gaurd against results which are messed up by old copies of the ping test, kill any leftover ping processes. @@ -10,7 +10,7 @@ any leftover ping processes. 1) Create the ping_address_file. This is only required if changes have been made since the last run; e.g., octants deconfigured, ARP entries changed, etc. - "./create_ping_address_file [interface]" + "./create_ping_address_file [interface]" If the "interface" argument is not provided, it defaults to "ml0" as the interface to test. @@ -23,7 +23,7 @@ any leftover ping processes. 3) Copy "ping_all" to /tmp on each node: xdcp lpar -v ping_all /tmp - + 4) Remove any output files from previous runs: xdsh lpar -v "rm /tmp/ping.all.out 2>/dev/null" @@ -39,6 +39,6 @@ any leftover ping processes. xdsh lpar -v "ls -l /tmp/ping.all.out 2>/dev/null" | sort -n +5 - If a given set of "ping.all.out" files are the same length, it's likely they will have + If a given set of "ping.all.out" files are the same length, it's likely they will have duplicate ping failures. From 3a8232944feed54c9d6af8f6b861b25867dcd673 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0706/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file --- .../share/xcat/IBMhpc/ping-all/create_ping_address_file | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file index b447dce2d..535df34c0 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file @@ -1,10 +1,10 @@ #!/bin/ksh if [[ -n $1 ]] then interface=$1 -else +else interface=ml0 fi -xdsh lpar -v "/usr/sbin/ifconfig $interface | grep inet | cut -d':' -f2 | cut -d' ' -f2 | head -2 " | sort -n | tee ping_address_file +xdsh lpar -v "/usr/sbin/ifconfig $interface | grep inet | cut -d':' -f2 | cut -d' ' -f2 | head -2 " | sort -n | tee ping_address_file From e13c4ea5a18c85ab8c6a15da33bd97a6ac6f19d8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0707/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all --- xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all index c9e6992ac..ce352e4b1 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all @@ -1,7 +1,7 @@ #!/bin/ksh function do_pings { - #set -x + #set -x integer dest_array_index=0 integer total_ping_count=0 @@ -62,7 +62,7 @@ else file=$1 fi -#ifconfig -a | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 | +#ifconfig -a | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 | ip -4 -oneline addr show 2>/dev/null |grep inet | sed -ne "s/.*inet //p"|awk -F ' ' '{print $1}'|awk -F '/' '{print $1}'| while read my_address ; do ##print "checking $my_address" @@ -73,7 +73,7 @@ while read my_address ; do integer starting_line_minus_1=$starting_line-1 tail +${starting_line} $file > /tmp/current_ping_address_file head -${starting_line_minus_1} $file >> /tmp/current_ping_address_file - file=/tmp/current_ping_address_file + file=/tmp/current_ping_address_file do_pings found_flag=1 break From 15424052ce6fd3319079d56646503bafd6fe359a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0708/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist --- .../share/xcat/IBMhpc/rsct/min-rsct.exlist | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist index 93a167f0a..d04542ec7 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist @@ -10,7 +10,7 @@ ./usr/sbin/rsct/include* ./usr/sbin/rsct/man/* ./usr/sbin/rsct/bin/trap2rmcd -./usr/sbin/rsct/bin/ctadmingroup +./usr/sbin/rsct/bin/ctadmingroup ./usr/sbin/rsct/bin/mkcdef #fc funcitons @@ -32,7 +32,7 @@ ./usr/sbin/rsct/bin/fcstrip.sed ./usr/sbin/rsct/bin/fcsysparse ./usr/sbin/rsct/bin/fcteststk -./usr/sbin/rsct/bin/fcinit.sh +./usr/sbin/rsct/bin/fcinit.sh #java interface ./usr/sbin/rsct/lib/java.exp ./usr/sbin/rsct/lib/librmcjni.so @@ -43,32 +43,32 @@ #remove assuming ctbackup/ctrestore not being used ./usr/sbin/rsct/bin/ctrestore -./usr/sbin/rsct/bin/ctbrdefs -./usr/sbin/rsct/bin/ctbackup +./usr/sbin/rsct/bin/ctbrdefs +./usr/sbin/rsct/bin/ctbackup #remove assuming trace spooling is not used -./usr/sbin/rsct/bin/chkspool -./usr/sbin/rsct/bin/showtr +./usr/sbin/rsct/bin/chkspool +./usr/sbin/rsct/bin/showtr ./usr/sbin/rsct/bin/lstrsp #remove; CtSec verification utility -./usr/sbin/rsct/bin/ctsvhbar +./usr/sbin/rsct/bin/ctsvhbar ./usr/sbin/rsct/bin/ctsvhbal -./usr/sbin/rsct/bin/ctsvhbac -./usr/sbin/rsct/bin/ctaclfck -./usr/sbin/rsct/bin/ctsidmck +./usr/sbin/rsct/bin/ctsvhbac +./usr/sbin/rsct/bin/ctaclfck +./usr/sbin/rsct/bin/ctsidmck #remove; System Registry diagnostic tool -./usr/sbin/rsct/bin/sr_lstfs -./usr/sbin/rsct/bin/sr_lsfds -./usr/sbin/rsct/bin/sr_filter_trace -./usr/sbin/rsct/bin/sr_dump_table_raw -./usr/sbin/rsct/bin/sr_dump_table -./usr/sbin/rsct/bin/sr_diag -./usr/sbin/rsct/bin/ct_sr_trace_scan -./usr/sbin/rsct/bin/ct_sr_file_scan +./usr/sbin/rsct/bin/sr_lstfs +./usr/sbin/rsct/bin/sr_lsfds +./usr/sbin/rsct/bin/sr_filter_trace +./usr/sbin/rsct/bin/sr_dump_table_raw +./usr/sbin/rsct/bin/sr_dump_table +./usr/sbin/rsct/bin/sr_diag +./usr/sbin/rsct/bin/ct_sr_trace_scan +./usr/sbin/rsct/bin/ct_sr_file_scan -#System Registry -api commnd; probably not needed +#System Registry -api commnd; probably not needed ./usr/sbin/rsct/bin/rmsrtbl-api ./usr/sbin/rsct/bin/rmsrrow-api ./usr/sbin/rsct/bin/mksrtbl-api @@ -76,10 +76,10 @@ ./usr/sbin/rsct/bin/mksrcol-api ./usr/sbin/rsct/bin/lssrtbldef-api ./usr/sbin/rsct/bin/lssrtbl-api -./usr/sbin/rsct/bin/lssr-api -./usr/sbin/rsct/bin/chsrfld-api +./usr/sbin/rsct/bin/lssr-api +./usr/sbin/rsct/bin/chsrfld-api -#remove if not monitoring IBM.NetworkInterface resources +#remove if not monitoring IBM.NetworkInterface resources ./usr/sbin/rsct/bin/IBM.ConfigRMd #remove if not using LPRM @@ -104,9 +104,9 @@ #remove if not using Condition/Response ./usr/sbin/rsct/bin/IBM.ERrmd -./usr/sbin/rsct/bin/stopcondresp -./usr/sbin/rsct/bin/startcondresp -./usr/sbin/rsct/bin/rmresponse +./usr/sbin/rsct/bin/stopcondresp +./usr/sbin/rsct/bin/startcondresp +./usr/sbin/rsct/bin/rmresponse ./usr/sbin/rsct/bin/rmcondresp ./usr/sbin/rsct/bin/rmcondition ./usr/sbin/rsct/bin/mkresponse @@ -120,7 +120,7 @@ ./usr/sbin/rsct/bin/chcondition ./usr/sbin/rsct/bin/wallevent ./usr/sbin/rsct/bin/notifyevent -./usr/sbin/rsct/bin/msgevent +./usr/sbin/rsct/bin/msgevent ./usr/sbin/rsct/bin/logevent ./usr/sbin/rsct/bin/ewallevent ./usr/sbin/rsct/bin/enotifyevent From 88239dcdcacb03d574cfb0b3988a5ed0417da0e8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0709/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist --- xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist index 95476f8fb..c2febef2b 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist @@ -4,7 +4,7 @@ ./usr/sbin/rsct/include* ./usr/sbin/rsct/man/* ./usr/sbin/rsct/bin/trap2rmcd -./usr/sbin/rsct/bin/ctadmingroup +./usr/sbin/rsct/bin/ctadmingroup ./usr/sbin/rsct/bin/mkcdef #java interface From ee23c563a5427a7094389f316cd1ea33e284a846 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0710/1681] Remove trailing spaces in file xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install --- xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install index 3db9042ff..2481c8704 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/sh -# +# # Sample script to accept licenses and install RSCT packages # For AIX: # do nothing - RSCT gets installed with base AIX @@ -25,7 +25,7 @@ if [ $OS != "AIX" ]; then # Do nothing - use rsct.otherpkgs.pkglist to install the # rsct rpms #fi - + if [ $NODESETSTATE == "genimage" ]; then # Being called from .postinstall script @@ -33,20 +33,20 @@ if [ $OS != "AIX" ]; then if [[ $OS = sles* ]] || [[ $OS = suse* ]] || [[ -f /etc/SuSE-release ]]; then # For SLES, assume zypper is available on the system running genimage # rsct don't need license. So not install and accept the rsct license on the MN - + # Install RSCT product rpms - INUCLIENTS=1 INUBOSTYPE=1 zypper -n -R $installroot install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm + INUCLIENTS=1 INUBOSTYPE=1 zypper -n -R $installroot install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm else # For Redhat, etc., assume yum is available on the system running genimage # rsct don't need license. So not install and accept the rsct license on the MN # Install RSCT product rpms - INUCLIENTS=1 INUBOSTYPE=1 yum -y --installroot $installroot --nogpgcheck install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm + INUCLIENTS=1 INUBOSTYPE=1 yum -y --installroot $installroot --nogpgcheck install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm fi fi -fi +fi exit 0 From 7a38876dc576cb1f3f69d67f844469badab21704 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0711/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/debian/copyright --- xCAT-OpenStack-baremetal/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-OpenStack-baremetal/debian/copyright b/xCAT-OpenStack-baremetal/debian/copyright index f61d34dfe..87e60f492 100644 --- a/xCAT-OpenStack-baremetal/debian/copyright +++ b/xCAT-OpenStack-baremetal/debian/copyright @@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - + From 6f391c43e4d3ed18d9a7609559a9ee0785bc6fe2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0712/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm --- .../lib/perl/xCAT_plugin/openstack.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm b/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm index f232d7bb4..0127adf28 100644 --- a/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm +++ b/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm @@ -488,9 +488,9 @@ sub opsaddimage { #------------------------------------------------------------------------------- =head3 deploy_ops_bm_node - This is a internel command called by OpenStack xCAT-baremetal driver. - It prepares the node by adding the config_ops_bm_node postbootscript - to the postscript table for the node, then call nodeset and then boot + This is a internel command called by OpenStack xCAT-baremetal driver. + It prepares the node by adding the config_ops_bm_node postbootscript + to the postscript table for the node, then call nodeset and then boot the node up. =cut @@ -706,7 +706,7 @@ sub deploy_hmc_node { =head3 cleanup_ops_bm_node This is a internel command called by OpenStack xCAT-baremetal driver. It undoes all the changes made by deploy_ops_bm_node command. It removes - the config_ops_bmn_ode postbootscript from the postscript table for the + the config_ops_bmn_ode postbootscript from the postscript table for the node, removes the alias ip and then power off the node. =cut @@ -811,7 +811,7 @@ sub cleanup_ops_bm_node { =head3 add_postscript - It adds the 'config_ops_bm_node' postbootscript to the + It adds the 'config_ops_bm_node' postbootscript to the postscript table for the given node. =cut @@ -884,7 +884,7 @@ sub add_postscript { =head3 remove_postscript - It removes the 'config_ops_bm_node' postbootscript from + It removes the 'config_ops_bm_node' postbootscript from the postscript table for the given node. =cut From a79a6759c0e426228c088a5d2f052c3070d43c18 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0713/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py --- .../python/xcat/openstack/baremetal/driver.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py index e42348be2..78bd31529 100644 --- a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py +++ b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py @@ -89,7 +89,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver): nodename = self.xcat.get_xcat_node_name(macs) imagename = self._get_xCAT_image_name(image_meta) hostname = instance.get('hostname') - + #get the network information for the new node interfaces = bm_utils.map_network_interfaces(network_info, CONF.use_ipv6) if CONF.use_ipv6: @@ -108,7 +108,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver): bm_driver._update_state(context, node, instance, baremetal_states.DEPLOYING) self.xcat.deploy_node(nodename, imagename, hostname, fixed_ip, netmask, gateway) bm_driver._update_state(context, node, instance, baremetal_states.ACTIVE) - except Exception as e: + except Exception as e: with excutils.save_and_reraise_exception(): LOG.error(_("Error occured while deploying instance %(instance)s " "on baremetal node %(node)s: %(error)s") % @@ -135,13 +135,13 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver): :param bad_volumes_callback: Function to handle any bad volumes encountered """ - try: + try: node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid']) macs = self.macs_for_instance(instance) nodename = self.xcat.get_xcat_node_name(macs) self.xcat.reboot_node(nodename) bm_driver._update_state(context, node, instance, baremetal_states.RUNNING) - except xcat_exception.xCATCommandError as e: + except xcat_exception.xCATCommandError as e: with excutils.save_and_reraise_exception(): LOG.error(_("Error occured while rebooting instance %(instance)s " "on baremetal node %(node)s: %(error)s") % @@ -171,7 +171,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver): context = nova_context.get_admin_context() try: node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid']) - + except exception.InstanceNotFound: LOG.warning(_("Destroy function called on a non-existing instance %s") % instance['uuid']) @@ -182,7 +182,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver): nodename = self.xcat.get_xcat_node_name(macs) interfaces = bm_utils.map_network_interfaces(network_info, CONF.use_ipv6) fixed_ip=None - if interfaces and interfaces[0]: + if interfaces and interfaces[0]: if CONF.use_ipv6: fixed_ip = interfaces[0].get('address_v6') else: @@ -199,11 +199,11 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver): self._detach_block_devices(instance, block_device_info) self._stop_firewall(instance, network_info) self._unplug_vifs(instance, network_info) - + bm_driver._update_state(context, node, None, baremetal_states.DELETED) except Exception as e: with excutils.save_and_reraise_exception(): - LOG.error(_("Error occurred while destroying instance %s: %s") + LOG.error(_("Error occurred while destroying instance %s: %s") % (instance['uuid'], str(e))) bm_driver._update_state(context, node, instance, baremetal_states.ERROR) @@ -213,7 +213,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver): macs = self.macs_for_instance(instance) nodename = self.xcat.get_xcat_node_name(macs) self.xcat.power_off_node(nodename) - + def power_on(self, context, instance, network_info, block_device_info=None, node=None): From 73938c1930ae39d5ed5511cce29d0f806a90b0ca Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0714/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py --- .../lib/python/xcat/openstack/baremetal/exception.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py index 38ce5bf60..a8d866d6a 100644 --- a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py +++ b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py @@ -34,8 +34,8 @@ class xCATCommandError(xCATException): class xCATInvalidImageError(xCATException): errmsg = _("The image %(image)s is not an xCAT image") -class xCATDeploymentFailure(xCATException): +class xCATDeploymentFailure(xCATException): errmsg = _("xCAT node deployment failed for node %(node)s:%(error)s") -class xCATRebootFailure(xCATException): +class xCATRebootFailure(xCATException): errmsg = _("xCAT node rebooting failed for node %(node)s:%(error)s") From 350154b54e439ede7ab0515a31ffde90a2b47557 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0715/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py --- .../xcat/openstack/baremetal/xcat_driver.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py index b4068d92e..71b69f2a9 100644 --- a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py +++ b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py @@ -32,13 +32,13 @@ xcat_opts = [ default=0), cfg.IntOpt('reboot_timeout', help='Timeout for rebooting a node. Default: 0 second (unlimited)', - default=0), + default=0), cfg.IntOpt('deploy_checking_interval', help='Checking interval for node deployment. Default: 10 seconds', default=10), cfg.IntOpt('reboot_checking_interval', help='Checking interval for rebooting a node. Default: 5 seconds', - default=5), + default=5), ] xcat_group = cfg.OptGroup(name='xcat', title='xCAT Options') @@ -74,13 +74,13 @@ class xCAT(object): out, err = self._exec_xcat_command("lsdef -w mac=%s" % mac) if out: return out.split(" ")[0] - + errstr='No node found in xCAT with the following mac address: ' \ + ','.join(macs) LOG.warning(errstr) raise exception.xCATCommandError(errstr) - + def deploy_node(self, nodename, imagename, hostname, fixed_ip, netmask, gateway): """ Install the node. @@ -91,7 +91,7 @@ class xCAT(object): """ out, err = self._exec_xcat_command( "deploy_ops_bm_node %(node)s --image %(image)s" - " --host %(host)s --ip %(ip)s --mask %(mask)s" + " --host %(host)s --ip %(ip)s --mask %(mask)s" % {'node': nodename, 'image': imagename, 'host': hostname, @@ -139,7 +139,7 @@ class xCAT(object): else: self._wait_for_node_reboot(nodename) return power_states.ON - + def power_off_node(self, nodename): """Power off the node.""" state = self.get_node_power_state(nodename) @@ -163,10 +163,10 @@ class xCAT(object): " for node %s:%s") % (nodename, err) LOG.warning(errstr) raise exception.xCATCommandError(errstr) - + self._wait_for_node_reboot(nodename) return power_states.ON - + def get_node_power_state(self, nodename): out, err = self._exec_xcat_command("rpower %s stat" % nodename) @@ -183,9 +183,9 @@ class xCAT(object): return power_states.ON elif state == 'off': return power_states.OFF - + return power_states.ERROR - + def _wait_for_node_deploy(self, nodename): """Wait for xCAT node deployment to complete.""" locals = {'errstr':''} From 96ed6ef1d868205c61befd3d9897a8591d6405d4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0716/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod --- xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod b/xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod index 39cf1f424..a7462ced7 100644 --- a/xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod +++ b/xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod @@ -46,14 +46,14 @@ Please make sure the following xCAT tables are filled with correct information f =head1 Parameters -I is a comma separated node or node group names. +I is a comma separated node or node group names. =head1 OPTIONS =over 10 -=item B<-s> The node name of the OpenStack compute host that hosts the baremetal nodes. +=item B<-s> The node name of the OpenStack compute host that hosts the baremetal nodes. =item B<-h|--help> Display usage message. From 9a891c2528a9148b7e7898d34041a3014df754b6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0717/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod --- xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod b/xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod index 511d68a0a..3c449ca4f 100644 --- a/xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod +++ b/xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod @@ -4,7 +4,7 @@ B - It adds or removes nodes for the vlan. =head1 SYNOPSIS -B I B<-n> I [B<-c> I] [B<-V>|B<--verbose>] +B I B<-n> I [B<-c> I] [B<-V>|B<--verbose>] B [B<-h>|B<--help>] @@ -12,22 +12,22 @@ B [B<-v>|B<--version>] =head1 DESCRIPTION -The B command adds a list of xCAT images into the OpenStack cloud. +The B command adds a list of xCAT images into the OpenStack cloud. -Under the cover, it creates a fake image and registers the fake image into OpenStack with command B. It sets the property in the image to indicate that this is an xCAT image and also stores the original xCAT image name in the property for further reference. +Under the cover, it creates a fake image and registers the fake image into OpenStack with command B. It sets the property in the image to indicate that this is an xCAT image and also stores the original xCAT image name in the property for further reference. -The xCAT image names can be listed using B command. +The xCAT image names can be listed using B command. =head1 Parameters -I a comma separated xCAT images names. +I a comma separated xCAT images names. =head1 OPTIONS =over 10 -=item B<-n> a comma separated new image names in the OpenStack. If omitted, the default is the original xCAT image nanme. +=item B<-n> a comma separated new image names in the OpenStack. If omitted, the default is the original xCAT image nanme. =item B<-c> the node name of the OpenStack controller. This node must be an xCAT managed node. From b5f53bd9a18999fcc382e49ac70dd536728833e1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0718/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node --- .../share/xcat/openstack/postscripts/config_ops_bm_node | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node index e67f48393..229f8d135 100755 --- a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node +++ b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html # xCAT post script for configuring the openstack baremetal node. @@ -116,7 +116,7 @@ change_host_name() echo "HOSTNAME=$str_hostname" >> $conf_file fi fi - + } str_os_type=$(get_os_type) @@ -192,7 +192,7 @@ if [[ -n $2 ]]; then continue fi echo "mac=$mac" - + #find the nic that has the mac if [[ -z $nic ]]; then #go to each nic to match the mac address @@ -207,7 +207,7 @@ if [[ -n $2 ]]; then echo "nic=$nic" #now setup the ip alias - setup_ip $str_os_type $nic:0 $ops_ip $ops_mask + setup_ip $str_os_type $nic:0 $ops_ip $ops_mask fi From 6b34297e5256a33e5953b359471cb629cce636da Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0719/1681] Remove trailing spaces in file xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node --- .../share/xcat/openstack/postscripts/deconfig_ops_bm_node | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node index 81ef22564..f8b1866d4 100755 --- a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node +++ b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html # xCAT post script for deconfiguring the openstack baremetal node. @@ -37,7 +37,7 @@ change_host_name() if [ "$str_os_type" = "sles" ];then echo "Persistently changing the hostname not implemented yet." #debian ubuntu and rh7 - elif [ -f "/etc/hostname" ];then + elif [ -f "/etc/hostname" ];then conf_file="/etc/hostname" echo "$str_hostname" > $conf_file else @@ -75,7 +75,7 @@ if [[ -n $1 ]]; then echo "nic=$nic, ops_ip=$ops_ip" ifconfig $nic del $ops_ip - + #delete the configuration file if [ "$str_os_type" = "sles" ]; then str_conf_file="/etc/sysconfig/network/ifcfg-$nic" From 6d6ca4339375cc6c1ca7233c033bb7e7449a77a1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0720/1681] Remove trailing spaces in file xCAT-OpenStack-ironic/ironic_baremetal/README.rst --- xCAT-OpenStack-ironic/ironic_baremetal/README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/README.rst b/xCAT-OpenStack-ironic/ironic_baremetal/README.rst index 9fad8f287..c05b91b2a 100644 --- a/xCAT-OpenStack-ironic/ironic_baremetal/README.rst +++ b/xCAT-OpenStack-ironic/ironic_baremetal/README.rst @@ -13,12 +13,12 @@ Ironic is a project in Openstack, it will replace the nova-baremetal in juno rel without change any code in Openstack. Ironic xCAT driver takes the advantage of xcat and openstack, we can use it to deploy the baremetal machine very easily. Before using this driver, we must setup the openstack environment at least for two nodes( ironic conductor and neutron network node can't setup on the same node) -Ironic conductor and the baremetal node( waiting for deploy) must in the same vlan +Ironic conductor and the baremetal node( waiting for deploy) must in the same vlan -Add the follows in the ironic egg-info entry_points.txt file (ironic.drivers section) +Add the follows in the ironic egg-info entry_points.txt file (ironic.drivers section) pxe_xcat = ironic.drivers.xcat:XCATBaremetalDriver - + When the openstack with ironic is ready, just execute command in the ironic_xcat directory as follows: $ python setup.py install @@ -29,10 +29,10 @@ Initialize the xcat environment according to http://sourceforge.net/p/xcat/wiki Using xCAT baremetal driver need config site table and run copycds to generate image. The node definition is not requirement. Ironic use neutron as the network service. -Check the openvswitch config on the network node ,make sure brbm bridge connect to the baremetal node. +Check the openvswitch config on the network node ,make sure brbm bridge connect to the baremetal node. ================================================================================== -Some Example to use the xCAT baremetal driver. +Some Example to use the xCAT baremetal driver. $touch /tmp/rhelhpc6.5-x86_64-install-compute.qcow2;glance image-create --name rhelhpc6.5-x86_64-install-compute --public --disk-format qcow2 --container-format bare --property xcat_image_name='rhels6.4-x86_64-install-compute' < /tmp/rhelhpc6.5-x86_64-install-compute.qcow2 --name rhelhpc6.5-x86_64-install-compute is the image name in xcat. You can use lsdef -t osimage on the ironic-conductor node which xcat is installed. From 4605659211763d6aaa878a94f0e56073d0e8ffe9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0721/1681] Remove trailing spaces in file xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py --- .../ironic_baremetal/ironic/drivers/modules/xcat_exception.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py index 2e2f4a187..14dd1df34 100644 --- a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py +++ b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py @@ -22,4 +22,4 @@ class GetNetworkIdFailure(IronicException): message = _("get node network in failed for mac %(mac_address)s") class FailedToGetInfoOnPort(IronicException): - message = _("Show info on port: %(port_id)s failed.") \ No newline at end of file + message = _("Show info on port: %(port_id)s failed.") From b048bf59725f6feeafbef90ccd913d63b6e19b22 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0722/1681] Remove trailing spaces in file xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py --- .../ironic_baremetal/ironic/drivers/modules/xcat_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py index 738d6aef0..e68de8947 100644 --- a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py +++ b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py @@ -107,4 +107,4 @@ def exec_xcatcmd(driver_info, command, args): args=args) finally: LAST_CMD_TIME[driver_info['xcat_node']] = time.time() - return out, err \ No newline at end of file + return out, err From f02f4c7c8a160bcd8edbf4b1605223e259802fbd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0723/1681] Remove trailing spaces in file xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py --- xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py index 8eca8bf91..082701a1b 100644 --- a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py +++ b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py @@ -24,4 +24,4 @@ class XCATBaremetalDriver(base.BaseDriver): self.console = ipmitool.IPMIShellinaboxConsole() self.deploy = xcat_pxe.PXEDeploy() self.management = ipmitool.IPMIManagement() - self.vendor = pxe.VendorPassthru() \ No newline at end of file + self.vendor = pxe.VendorPassthru() From 0df08a351eac7f1bbef5f4dba319187cc9fc18c8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0724/1681] Remove trailing spaces in file xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg --- xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg b/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg index e972c1f67..4c3e49873 100644 --- a/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg +++ b/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg @@ -23,7 +23,7 @@ packages = ironic [entry_points] -ironic.drivers = +ironic.drivers = agent_ipmitool = ironic.drivers.agent:AgentAndIPMIToolDriver agent_pyghmi = ironic.drivers.agent:AgentAndIPMINativeDriver agent_ssh = ironic.drivers.agent:AgentAndSSHDriver From 4d70d3b3e3664326c4095343c37d2d56f0c3561f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0725/1681] Remove trailing spaces in file xCAT-OpenStack/debian/changelog --- xCAT-OpenStack/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-OpenStack/debian/changelog b/xCAT-OpenStack/debian/changelog index 0c268ac0f..64bc8f17f 100644 --- a/xCAT-OpenStack/debian/changelog +++ b/xCAT-OpenStack/debian/changelog @@ -1,5 +1,5 @@ xcat-openstack (2.9) unstable; urgency=low - * Initial release + * Initial release -- root Mon, 01 Jul 2013 15:04:41 +0800 From 50bbd99295884e9bddf6e294767989f109cbb777 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0726/1681] Remove trailing spaces in file xCAT-OpenStack/debian/copyright --- xCAT-OpenStack/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-OpenStack/debian/copyright b/xCAT-OpenStack/debian/copyright index f61d34dfe..87e60f492 100644 --- a/xCAT-OpenStack/debian/copyright +++ b/xCAT-OpenStack/debian/copyright @@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - + From c9816b4849d37eb33fc2ef640bb86fcf997503af Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0727/1681] Remove trailing spaces in file xCAT-OpenStack/lib/perl/xCAT/Cloud.pm --- xCAT-OpenStack/lib/perl/xCAT/Cloud.pm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-OpenStack/lib/perl/xCAT/Cloud.pm b/xCAT-OpenStack/lib/perl/xCAT/Cloud.pm index 5b9ba2067..e385e4332 100644 --- a/xCAT-OpenStack/lib/perl/xCAT/Cloud.pm +++ b/xCAT-OpenStack/lib/perl/xCAT/Cloud.pm @@ -22,10 +22,10 @@ use strict; #----------------------------------------------------------------------------- -=head3 getcloudinfo +=head3 getcloudinfo - This function will be invoked by Postage.pm. - get the chef cookbook repository for each cloud from the clouds table, and + This function will be invoked by Postage.pm. + get the chef cookbook repository for each cloud from the clouds table, and then get all the node --> cloud from the cloud table. The two type information will be stored in the %info @@ -34,13 +34,13 @@ use strict; Arguments: none - Returns: + Returns: \%info - + Error: none Example: - + Comments: none @@ -94,10 +94,10 @@ sub getcloudinfo #----------------------------------------------------------------------------- -=head3 getcloudres +=head3 getcloudres - This function will be invoked by Postage.pm. And it's only for one chef-server. - 1. get the chef cookbook repository for the clouds on one chef-server. + This function will be invoked by Postage.pm. And it's only for one chef-server. + 1. get the chef cookbook repository for the clouds on one chef-server. All the clouds's repositoryies on one chef-server should be the same one. 2. get the cloud list for one chef-server 3. get the cloud name for each node on the same chef-server @@ -106,13 +106,13 @@ sub getcloudinfo Arguments: $cloudinfo_hash -- This is from the getcloudinfo function. $clients -- an array which stores different cloud nodes(chef-client) - Returns: + Returns: $cloudres -- a string including cloud information - + Error: none Example: - + Comments: none From b923cd20576d69c905f20cf15e3594fcab7e84f7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0728/1681] Remove trailing spaces in file xCAT-OpenStack/postscripts/configbr-ex --- xCAT-OpenStack/postscripts/configbr-ex | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-OpenStack/postscripts/configbr-ex b/xCAT-OpenStack/postscripts/configbr-ex index 97dea5380..13418d9b6 100755 --- a/xCAT-OpenStack/postscripts/configbr-ex +++ b/xCAT-OpenStack/postscripts/configbr-ex @@ -8,8 +8,8 @@ pubinterface=$PUBINTERFACE if [ -z "pubinterface" ] then errmsg="no pubinterface setting for the $NODE's cloudname in clouds table" - logger -t xcat -p local4.err $errmsg - echo $errmsg + logger -t xcat -p local4.err $errmsg + echo $errmsg exit -1 fi ifconfig $pubinterface 0 @@ -28,8 +28,8 @@ else str_nic_type="ethernet" else errmsg="currently, it only supports eth|en, instead of $pubinterface." - logger -t xcat -p local4.err $errmsg - echo $errmsg + logger -t xcat -p local4.err $errmsg + echo $errmsg exit -1; fi fi From 49c627affc3d4a272570cae0b132114dda8f62eb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0729/1681] Remove trailing spaces in file xCAT-OpenStack/postscripts/configgw --- xCAT-OpenStack/postscripts/configgw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-OpenStack/postscripts/configgw b/xCAT-OpenStack/postscripts/configgw index e2b97be77..9ca3c2815 100755 --- a/xCAT-OpenStack/postscripts/configgw +++ b/xCAT-OpenStack/postscripts/configgw @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash str_dir_name=`dirname $0` . $str_dir_name/xcatlib.sh @@ -47,7 +47,7 @@ if [ -f "/etc/debian_version" ];then debianpreconf #delete the gateway from all configuration files sed -i "s/.*gateway.*//" /etc/network/interfaces.d/* - + str_conf_file="/etc/network/interfaces.d/$str_nic_name" echo " gateway $str_gateway --" >> $str_conf_file elif [ -f "/etc/SuSE-release" ];then From f308b0acbd38d7d4f06963d2a6cd3c35ebe54c20 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0730/1681] Remove trailing spaces in file xCAT-OpenStack/postscripts/loadclouddata --- xCAT-OpenStack/postscripts/loadclouddata | 70 ++++++++++++------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/xCAT-OpenStack/postscripts/loadclouddata b/xCAT-OpenStack/postscripts/loadclouddata index f461c646b..9bbf9065d 100755 --- a/xCAT-OpenStack/postscripts/loadclouddata +++ b/xCAT-OpenStack/postscripts/loadclouddata @@ -1,19 +1,19 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html -# This script, ("loadclouddata"), is a sample xCAT post script for -# upload the openstack-cookbooks, roles, enviornment to the -# xCAT chef-server node, and then create the chef-client +# This script, ("loadclouddata"), is a sample xCAT post script for +# upload the openstack-cookbooks, roles, enviornment to the +# xCAT chef-server node, and then create the chef-client # nodes, and then assign the role and environment name to the -# chef-client nodes +# chef-client nodes # -# Make sure your script is executable and that is is in the +# Make sure your script is executable and that is is in the # /install/postscripts directory on the xCAT management node. # -# You must add the script name to the list of scripts that +# You must add the script name to the list of scripts that # must be run at install time, or use it with updatenode. # -# To use this script you should make sure it gets run after the +# To use this script you should make sure it gets run after the # "mountinstall" script or any other scipts that may need to use # scripts in the /install directory. # @@ -68,7 +68,7 @@ else then devmode=0 run_all=1 - else + else errmsg="no argument $arg in the loadchefdata script" logger -t xcat -p local4.err "$errmsg" echo "$errmsg" @@ -77,7 +77,7 @@ else done fi -if [ $devmode -eq 0 ] +if [ $devmode -eq 0 ] then if [ $only_load_cookbook -eq 1 -o $only_load_role -eq 1 -o $only_load_clouddata -eq 1 ] then @@ -98,7 +98,7 @@ fi # enter the repository director # for example: cd /install/chef-cookbooks/grizzy-xcat/ -if [ ! -d "$REPOSITORY" ] +if [ ! -d "$REPOSITORY" ] then errmsg="Error! Not an available OpenStack Chef cookbooks repository for the cloud $CLOUDLIST.Please check the clouds table." logger -t xcat -p local4.err $errmsg @@ -113,7 +113,7 @@ then knife cookbook bulk delete '.*' -y > /dev/null 2>&1 knife cookbook upload -o cookbooks --all if [ $? != 0 ] - then + then errmsg="Failed to run knife cookbook upload -o cookbooks --all on the chefserver $NODE." logger -t xcat -p local4.err "$errmsg" echo $errmsg @@ -127,7 +127,7 @@ then knife role bulk delete '.*' -y > /dev/null 2>&1 knife role from file roles/*.rb if [ $? != 0 ] - then + then errmsg="Failed to run \'knife role from file roles/*.rb\' on the chefserver $NODE." logger -t xcat -p local4.err $errmsg echo $errmsg @@ -156,9 +156,9 @@ then echo "loading the enviornment file $cloud.rb for $cloud" # knife environment delete xcat_per-tenant_routers_with_private_networks -y # knife environment delete xcat_per-tenant_routers_with_private_networks -y - # load the environment file + # load the environment file # knife environment from file environments/xcat_per-tenant_routers_with_private_networks.rb - if [ ! -e "$REPOSITORY/environments/$cloud.rb" ] + if [ ! -e "$REPOSITORY/environments/$cloud.rb" ] then errmsg="$REPOSITORY/environments/$cloud.rb doesn't exsit. run mkclouddata at first." logger -t xcat -p local4.err $errmsg @@ -167,7 +167,7 @@ then fi knife environment from file environments/$cloud.rb if [ $? != 0 ] - then + then errmsg="Failed to run \'knife environment from file environments/$cloud.rb\' on the chef-server $NODE." logger -t xcat -p local4.err $errmsg echo $errmsg @@ -191,7 +191,7 @@ then # knife node create test3 -d knife node create $c_fullname -d if [ $? != 0 ] - then + then errmsg="Failed to run \'knife node create $client -d\' on the chef-server $NODE." logger -t xcat -p local4.err $errmsg echo $errmsg @@ -199,7 +199,7 @@ then fi roles=`hget $client roles` - if [ -z $roles ] + if [ -z $roles ] then errmsg="No value of the attribute cfgmgtroles is set for $client. Please check the cfgmgt table." logger -t xcat -p local4.err $errmsg @@ -207,26 +207,26 @@ then exit 1 fi - roles=`echo $roles | sed -e 's/ /,/g'` - r=""; + roles=`echo $roles | sed -e 's/ /,/g'` + r=""; for onerole in $roles do r+="role[$onerole]," done - + # assign the role for the chef node knife node run_list add $c_fullname "$r" if [ $? != 0 ] - then + then errmsg="Failed to run knife node run_list add $client '$r' on the chef-server $NODE." logger -t xcat -p local4.err $errmsg echo $errmsg exit 1 fi - # assign the new environment to the chef client node + # assign the new environment to the chef client node newenv=`hget $client cloud` - if [ -z $newenv ] + if [ -z $newenv ] then errmsg="No value of the attribute cloud is set for $client. Please check the cloud table." logger -t xcat -p local4.err $errmsg @@ -236,7 +236,7 @@ then origenv=`knife node show $c_fullname -E | sed -e 's/[ ]*//g'| awk -F: '{print $2}'` EDITOR="sed -e s/$origenv/$newenv/ -i" knife node edit $c_fullname if [ $? != 0 ] - then + then errmsg="Failed to run knife node edit $client on the chef-server $NODE." logger -t xcat -p local4.err $errmsg echo $errmsg @@ -245,7 +245,7 @@ then done - + IFS=$OIFS fi @@ -253,16 +253,16 @@ fi if [ $devmode -eq 0 ] then bags=(db_passwords secrets service_passwords user_passwords) - + if [ ! -e "$REPOSITORY/databags" ] then mkdir -p "$REPOSITORY/databags" - fi - + fi + databag_key="$REPOSITORY/databags/openstack_databag_key" openssl rand -base64 512 > $databag_key if [ $? != 0 ] - then + then errmsg="Failed to use openssl to generate the data bag key on $NODE. Please check whether openssl is installed." logger -t xcat -p local4.err "$errmsg" echo "$errmsg" @@ -273,18 +273,18 @@ then then mkdir -p "/etc/chef/" fi - - #for knife command + + #for knife command cp -f $databag_key "/etc/chef/encrypted_data_bag_secret" #for other chef-client nodes cp -f $databag_key "/etc/chef-server/encrypted_data_bag_secret" - + # add the path of encrypted_data_bag_secret to knife.rb file if ! grep -w -q 'encrypted_data_bag_secret' /root/.chef/knife.rb then echo "encrypted_data_bag_secret '/etc/chef/openstack_encrypted_data_bag_secret'" >> /root/.chef/knife.rb fi - + # delete the old databags knife data bag list | xargs -i knife data bag delete -y {} @@ -305,7 +305,7 @@ then do knife data bag from file $bag $REPOSITORY/databags/$bag/$item --secret-file $databag_key if [ $? != 0 ] - then + then errmsg="Failed to run knife data bag from file $bag $REPOSITORY/databags/$bag/$item --secret-file $databag_key" logger -t xcat -p local4.err "$errmsg" echo "$errmsg" From 063de4ced96faede903a41bcb0ad36d72ebfd8f1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0731/1681] Remove trailing spaces in file xCAT-OpenStack/postscripts/setup_openstack_repo --- xCAT-OpenStack/postscripts/setup_openstack_repo | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-OpenStack/postscripts/setup_openstack_repo b/xCAT-OpenStack/postscripts/setup_openstack_repo index 7e17b7dde..5468df008 100755 --- a/xCAT-OpenStack/postscripts/setup_openstack_repo +++ b/xCAT-OpenStack/postscripts/setup_openstack_repo @@ -1,13 +1,13 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html #------------------------------------------------------------------------------- #=head1 setup_openstack_repo -#=head2 This command adds the OpenStack repository to the node. It is run +#=head2 This command adds the OpenStack repository to the node. It is run # as a postscript. # Usage: # For OpenStack Grizzly: setup_openstack_repo -# For other OpenStack versions: setup_openstack_repo folsom -# +# For other OpenStack versions: setup_openstack_repo folsom +# #=cut #------------------------------------------------------------------------------- From 13b914d9ebffe8aa5aaca157335d5977d49f0374 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0732/1681] Remove trailing spaces in file xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl --- .../cloud_environment/grizzly_allinone.rb.tmpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl index ec93c9f8e..2cb882cce 100644 --- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl +++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl @@ -16,7 +16,7 @@ override_attributes( "openstack" => { "developer_mode" => true, "db"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "compute"=>{ "host"=>"#TABLE:clouds:name=$CLOUD:hostip#" }, @@ -44,7 +44,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "identity"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "db"=>{ "username"=>"keystone", "password"=> "keystone" @@ -95,7 +95,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "registry"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "image_upload" => false, "upload_images" => ["cirros"], @@ -152,10 +152,10 @@ override_attributes( "config" => { "ram_allocation_ratio" => 5.0 }, - "libvirt" => { - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", - "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" - } + "libvirt" => { + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" + } } } ) From 9b6b36603eea24b50cdfd6cf08eaa8095b18d941 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0733/1681] Remove trailing spaces in file xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl --- .../grizzly_allinone_develop_false.rb.tmpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl index e22cdb58b..0797b2719 100644 --- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl +++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl @@ -19,7 +19,7 @@ override_attributes( "key_path"=>"/etc/chef/encrypted_data_bag_secret" }, "db"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "compute"=>{ "host"=>"#TABLE:clouds:name=$CLOUD:hostip#" }, @@ -47,7 +47,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "identity"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "db"=>{ "username"=>"keystone", "password"=> "keystone" @@ -98,7 +98,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "registry"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "image_upload" => false, "upload_images" => ["cirros"], @@ -155,10 +155,10 @@ override_attributes( "config" => { "ram_allocation_ratio" => 5.0 }, - "libvirt" => { - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", - "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" - } + "libvirt" => { + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" + } } } ) From c13aa6c8a154a30a2a0e1b957fb40ed754efe85d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0734/1681] Remove trailing spaces in file xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl --- .../grizzly_keystone_swift_allinone.rb.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl index cf41f73af..38c83865a 100644 --- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl +++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl @@ -2,7 +2,7 @@ # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html # # -# When using this template, you should change the proxy-cidr and object-cidr +# When using this template, you should change the proxy-cidr and object-cidr # according to your actual network environment!!!!!!!! # @@ -33,7 +33,7 @@ override_attributes( "openstack" => { "developer_mode" => true, "db"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "compute"=>{ "host"=>"#TABLE:clouds:name=$CLOUD:hostip#" }, @@ -61,7 +61,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "identity"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "db"=>{ "username"=>"keystone", "password"=> "keystone" @@ -112,7 +112,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "registry"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "image_upload" => false, "upload_images" => ["cirros"], @@ -169,10 +169,10 @@ override_attributes( "config" => { "ram_allocation_ratio" => 5.0 }, - "libvirt" => { - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", - "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" - } + "libvirt" => { + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" + } } } ) From a0ace194c96ee614a8be017740e34abb222dd2fd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0735/1681] Remove trailing spaces in file xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl --- ...nant_routers_with_private_networks.rb.tmpl | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl index 5832657f0..2e73b1cbf 100644 --- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl +++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl @@ -1,4 +1,4 @@ -# +# # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html # http://docs.openstack.org/grizzly/openstack-network/admin/content/app_demo_routers_with_private_networks.html # @@ -18,7 +18,7 @@ override_attributes( "openstack" => { "developer_mode" => true, "db"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "compute"=>{ "host"=>"#TABLE:clouds:name=$CLOUD:hostip#" }, @@ -45,7 +45,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "identity"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "db"=>{ "username"=>"keystone", "password"=> "keystone" @@ -97,7 +97,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "registry"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "image_upload" => false, "upload_images" => ["cirros"], @@ -125,7 +125,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "l3"=>{ - "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" + "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" }, "allow_overlapping_ips" => "True", "use_namespaces" => "True", @@ -133,7 +133,7 @@ override_attributes( "tenant_network_type"=>"gre", "tunnel_id_ranges"=>"1:1000", "enable_tunneling"=>"True", - "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#" + "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#" } }, "compute" => { @@ -142,10 +142,10 @@ override_attributes( "host"=>"#TABLE:clouds:name=$CLOUD:hostip#" }, "xvpvnc_proxy"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" }, "novnc_proxy"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" }, "network" => { "service_type" => "quantum", @@ -153,10 +153,10 @@ override_attributes( "config" => { "ram_allocation_ratio" => 5.0 }, - "libvirt" => { - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", - "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" - } + "libvirt" => { + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" + } } } ) From 932f61870e4659994183fe862527bd7b6a439b40 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0736/1681] Remove trailing spaces in file xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl --- ...ith_private_networks_develop_false.rb.tmpl | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl index 9eec03a8b..fe68af260 100644 --- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl +++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl @@ -1,4 +1,4 @@ -# +# # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html # http://docs.openstack.org/grizzly/openstack-network/admin/content/app_demo_routers_with_private_networks.html # @@ -21,7 +21,7 @@ override_attributes( "key_path"=>"/etc/chef/encrypted_data_bag_secret" }, "db"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "compute"=>{ "host"=>"#TABLE:clouds:name=$CLOUD:hostip#" }, @@ -48,7 +48,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "identity"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", "db"=>{ "username"=>"keystone", "password"=> "keystone" @@ -100,7 +100,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "registry"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "image_upload" => false, "upload_images" => ["cirros"], @@ -127,7 +127,7 @@ override_attributes( "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" }, "l3"=>{ - "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" + "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" }, "allow_overlapping_ips" => "True", "use_namespaces" => "True", @@ -135,7 +135,7 @@ override_attributes( "tenant_network_type"=>"gre", "tunnel_id_ranges"=>"1:1000", "enable_tunneling"=>"True", - "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#" + "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#" } }, "compute" => { @@ -144,10 +144,10 @@ override_attributes( "host"=>"#TABLE:clouds:name=$CLOUD:hostip#" }, "xvpvnc_proxy"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" }, "novnc_proxy"=>{ - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" }, "network" => { "service_type" => "quantum", @@ -155,10 +155,10 @@ override_attributes( "config" => { "ram_allocation_ratio" => 5.0 }, - "libvirt" => { - "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", - "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" - } + "libvirt" => { + "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", + "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" + } } } ) From 35b469a5ada7ab39a7849614d251f75c420d9720 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0737/1681] Remove trailing spaces in file xCAT-SoftLayer/bin/getslnodes.py --- xCAT-SoftLayer/bin/getslnodes.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xCAT-SoftLayer/bin/getslnodes.py b/xCAT-SoftLayer/bin/getslnodes.py index 51ee03662..b8b4b5334 100755 --- a/xCAT-SoftLayer/bin/getslnodes.py +++ b/xCAT-SoftLayer/bin/getslnodes.py @@ -5,11 +5,11 @@ Usage: getslnodes.py [-h] [-v] [] Description: Query your SoftLayer account and get attributes for each bare metal server. -The attributes can be piped to 'mkdef -z' to define the nodes into the xCAT -Database so that xCAT can manage them. +The attributes can be piped to 'mkdef -z' to define the nodes into the xCAT +Database so that xCAT can manage them. getslnodes requires a the .softlayer configuration file defined which can -be set by running "sl config setup" on the command line. +be set by running "sl config setup" on the command line. positional arguments: hostname-match Select servers that include this partial hostname. @@ -29,7 +29,7 @@ except ImportError as e: print 'Error: install missing python module before running this command: ' + str(e) sys.exit(2) -def get_sl_servers(): +def get_sl_servers(): # username, api_key, endpoint_url come from the .softlayer file client = SoftLayer.Client() @@ -44,9 +44,9 @@ def get_sl_servers(): # But those 2 operations are ANDed together, so it will not work. And currently, filtering does not work on fullyQualifiedDomainName. # servers = client['Account'].getHardware(mask=mask) - return servers - -def print_xcat_node_stanza(servers, hnmatch): + return servers + +def print_xcat_node_stanza(servers, hnmatch): for server in servers: if hnmatch and server['fullyQualifiedDomainName'].find(hnmatch) == -1: @@ -92,11 +92,11 @@ def print_xcat_node_stanza(servers, hnmatch): if __name__ == '__main__': try: - arguments = (docopt.docopt(__doc__, version="1.0")) + arguments = (docopt.docopt(__doc__, version="1.0")) # print arguments servers = get_sl_servers() - if arguments['--verbose']: + if arguments['--verbose']: pprint.pprint(servers) print_xcat_node_stanza(servers, arguments['']) @@ -106,6 +106,6 @@ if __name__ == '__main__': except SoftLayer.exceptions.SoftLayerAPIError as e: print e - sys.exit(1) + sys.exit(1) From 860d37eb437b8b59e37ca851b8d0bb4b92dee61e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0738/1681] Remove trailing spaces in file xCAT-SoftLayer/bin/softlayer_storage.py --- xCAT-SoftLayer/bin/softlayer_storage.py | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/xCAT-SoftLayer/bin/softlayer_storage.py b/xCAT-SoftLayer/bin/softlayer_storage.py index d52609e5d..2ed96423a 100755 --- a/xCAT-SoftLayer/bin/softlayer_storage.py +++ b/xCAT-SoftLayer/bin/softlayer_storage.py @@ -7,14 +7,14 @@ Usage: Options: -h --help Show help screen --version Show version - --type= Type of File Storage to mount ( consistent | nas ) + --type= Type of File Storage to mount ( consistent | nas ) --hostname= SoftLayer Storage hostname - --username= SoftLayer Storage LUN username + --username= SoftLayer Storage LUN username --password= SoftLayer Storage LUN password --mountpoint= The mountpoint to use [default: /mnt/nas] Description: - For consistent performance file storate, make sure the host accessing the + For consistent performance file storate, make sure the host accessing the file storage has been authorized through the SoftLayer portal. """ import os @@ -29,7 +29,7 @@ if path.startswith('/opt'): from xcat import xcatutils -def mount_nas_storage(hostname, user, passwd, mountPoint): +def mount_nas_storage(hostname, user, passwd, mountPoint): print "Attempting to mount the NAS File Storage at %s" %(mountPoint) if xcatutils.isMounted(mountPoint): @@ -37,17 +37,17 @@ def mount_nas_storage(hostname, user, passwd, mountPoint): cmd = "mount -t cifs //%s/%s -o username=%s,password=%s,rw,nounix,iocharset=utf8,file_mode=0644,dir_mode=0755 %s" %(hostname, user, user, passwd, mountPoint) out,err = xcatutils.run_command(cmd) - if err: + if err: raise xcatutils.xCatError("Error when mounting. (%s)" %(err)) - else: + else: print "Success\n" - # To help out with automount, print this msg + # To help out with automount, print this msg print "\nNote: To configure automount on reboot, add the following into /etc/fstab:" cmd = "//%s/%s %s cifs defaults,username=%s,password=%s 0 0" %(hostname,user,mountPoint,user,passwd) print "%s\n" %(cmd) -def mount_consistent_storage(hostname, user, mountPoint): +def mount_consistent_storage(hostname, user, mountPoint): # TODO: would be good to be able to specify the nfs version as a argument print "Attempting to mount the Consistent Performance File Storage at %s" %(mountPoint) @@ -56,12 +56,12 @@ def mount_consistent_storage(hostname, user, mountPoint): cmd = "mount -t nfs4 %s:/%s %s" %(hostname, user, mountPoint) out,err = xcatutils.run_command(cmd) - if err: + if err: raise xcatutils.xCatError("Error when mounting. (%s)" %(err)) - else: + else: print "Success\n" - # To help out with automount, print this msg + # To help out with automount, print this msg print "\nNote: To configure automount on reboot, add the following into /etc/fstab:" cmd = "%s:/%s %s nfs4 defaults,hard,intr 0 0" %(hostname,user,mountPoint) print "%s\n" %(cmd) @@ -71,36 +71,36 @@ def unmount_storage(mountPoint): if not xcatutils.isMounted(mountPoint): raise xcatutils.xCatError("The mount point %s is NOT mounted." %(mountPoint)) - else: + else: cmd = "umount %s" %(mountPoint) out,err = xcatutils.run_command(cmd) - if err: + if err: print "Encountered error while unmounting..." print err -def setup_softlayer_storage(): - # - # set code defaults to consistent file storage options - # +def setup_softlayer_storage(): + # + # set code defaults to consistent file storage options + # requirePassword=False preReqPackages = ['nfs-utils','nfs-utils-lib'] # - # if NAS is selected as the type, override the code defaults + # if NAS is selected as the type, override the code defaults # if 'nas' in arguments['--type']: requirePassword=True preReqPackages = ['cifs-utils'] # - # verify information before starting + # verify information before starting # - if arguments['--hostname'] is None: + if arguments['--hostname'] is None: arguments['--hostname'] = xcatutils.getUserInput("Enter the SoftLayer storage hostname") - if arguments['--username'] is None: + if arguments['--username'] is None: arguments['--username'] = xcatutils.getUserInput("Enter the SoftLayer storage username") if arguments['--password'] is None and requirePassword: @@ -113,7 +113,7 @@ def setup_softlayer_storage(): xcatutils.installPackages(preReqPackages) # - # mount the file storage + # mount the file storage # if 'nas' in arguments['--type']: mount_nas_storage(arguments['--hostname'],arguments['--username'],arguments['--password'],arguments['--mountpoint']) @@ -124,11 +124,11 @@ def setup_softlayer_storage(): if __name__ == '__main__': try: - arguments = (docopt.docopt(__doc__, version="1.0")) + arguments = (docopt.docopt(__doc__, version="1.0")) if not arguments['--type'] in ('nas', 'consistent'): raise xcatutils.xCatError("The type=%s is not a supported file system type." %(arguments['--type'])) - + if arguments['unmount']: unmount_storage(arguments['--mountpoint']) else: @@ -137,4 +137,4 @@ if __name__ == '__main__': except docopt.DocoptExit as e: print e except xcatutils.xCatError as e: - print "xCatError: %s" %(e) + print "xCatError: %s" %(e) From 01226f046cd195f558e83ed58101ca12dade9212 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0739/1681] Remove trailing spaces in file xCAT-SoftLayer/lib/python/xcat/xcatutils.py --- xCAT-SoftLayer/lib/python/xcat/xcatutils.py | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xCAT-SoftLayer/lib/python/xcat/xcatutils.py b/xCAT-SoftLayer/lib/python/xcat/xcatutils.py index e36d638bb..4643c13a3 100644 --- a/xCAT-SoftLayer/lib/python/xcat/xcatutils.py +++ b/xCAT-SoftLayer/lib/python/xcat/xcatutils.py @@ -10,8 +10,8 @@ class xCatError(Exception): def __str__(self): return repr(self.value) -def isMounted(mountPoint): - if os.path.ismount(mountPoint): +def isMounted(mountPoint): + if os.path.ismount(mountPoint): return True else: return False @@ -33,21 +33,21 @@ def isRhel(): myDistro = platform.linux_distribution() if "Red Hat Enterprise Linux Server" or "CentOS" in myDistro: return True - else: + else: return False -def isSles(): +def isSles(): myDistro = platform.linux_distribution() if "SUSE Linux Enterprise Server" in myDistro: return True - else: + else: return False def isUbuntu(): myDistro = platform.linux_distribution() if "Ubuntu" in myDistro: return True - else: + else: return False def getUserInput(question): @@ -55,31 +55,31 @@ def getUserInput(question): return response def filterInstalledPackages(pkglist=[]): - fulllist = "" + fulllist = "" if isRhel(): # using YUM - import yum + import yum yb = yum.YumBase() for x in pkglist: if not yb.rpmdb.searchNevra(name='%s' %(x)): - fulllist += "%s " %(x) - + fulllist += "%s " %(x) + return fulllist - + def installPackages(pkglist=[]): fulllist = filterInstalledPackages(pkglist) if isRhel(): - if fulllist.strip() != "": + if fulllist.strip() != "": cmd = "yum -y install %s" %(fulllist) out,err = xcatutils.run_command(cmd) - elif isSles(): + elif isSles(): print "Using zyppr..." elif isUbuntu(): print "Using apt-get..." else: - print "Error!" + print "Error!" From 7e78b19117b78baf6ce0c44a37a5ea5510fa0c9d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0740/1681] Remove trailing spaces in file xCAT-SoftLayer/pods/man1/getslnodes.1.pod --- xCAT-SoftLayer/pods/man1/getslnodes.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-SoftLayer/pods/man1/getslnodes.1.pod b/xCAT-SoftLayer/pods/man1/getslnodes.1.pod index d9e3bbb1c..c89fb61d2 100644 --- a/xCAT-SoftLayer/pods/man1/getslnodes.1.pod +++ b/xCAT-SoftLayer/pods/man1/getslnodes.1.pod @@ -4,7 +4,7 @@ B - queries your SoftLayer account and gets attributes for each serv =head1 SYNOPSIS -B [B<-v>|B<--verbose>] [I] +B [B<-v>|B<--verbose>] [I] B [B<-?> | B<-h> | B<--help>] @@ -15,7 +15,7 @@ server. The attributes can be piped to 'mkdef -z' to define the nodes in the xCAT DB so that xCAT can manage them. Before using this command, you must download and install the SoftLayer API perl module. -For example: +For example: cd /usr/local/lib git clone https://github.com/softlayer/softlayer-api-perl-client.git From c59953033533904aab6101e617492ce5e466747e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0741/1681] Remove trailing spaces in file xCAT-SoftLayer/pods/man1/pushinitrd.1.pod --- xCAT-SoftLayer/pods/man1/pushinitrd.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-SoftLayer/pods/man1/pushinitrd.1.pod b/xCAT-SoftLayer/pods/man1/pushinitrd.1.pod index 45c6e0168..73b8dc409 100644 --- a/xCAT-SoftLayer/pods/man1/pushinitrd.1.pod +++ b/xCAT-SoftLayer/pods/man1/pushinitrd.1.pod @@ -4,7 +4,7 @@ B - queries your SoftLayer account and gets attributes for each serv =head1 SYNOPSIS -B [B<-v>|B<--verbose>] [B<-w> I] [I] +B [B<-v>|B<--verbose>] [B<-w> I] [I] B [B<-?> | B<-h> | B<--help>] From 2b9ee635f7e867dd1a6a47fafbb6d91106d45299 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0742/1681] Remove trailing spaces in file xCAT-SoftLayer/si-post-install/15all.configefi --- xCAT-SoftLayer/si-post-install/15all.configefi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-SoftLayer/si-post-install/15all.configefi b/xCAT-SoftLayer/si-post-install/15all.configefi index 34b112f0c..d76c4fb58 100755 --- a/xCAT-SoftLayer/si-post-install/15all.configefi +++ b/xCAT-SoftLayer/si-post-install/15all.configefi @@ -51,7 +51,7 @@ else echo "Can not find the boot device, return error" exit 1 fi - + # set grub to use this boot device if grep -qe '^VERSION\s*=\s*11' /etc/SuSE-release; then #sles11, run grub-install.unsupported directly From 9f6963d040602b93b175ca312fc8c493ca12a49e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0743/1681] Remove trailing spaces in file xCAT-SoftLayer/si-post-install/99all.killsyslog --- xCAT-SoftLayer/si-post-install/99all.killsyslog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-SoftLayer/si-post-install/99all.killsyslog b/xCAT-SoftLayer/si-post-install/99all.killsyslog index 348910189..6f2f5245a 100755 --- a/xCAT-SoftLayer/si-post-install/99all.killsyslog +++ b/xCAT-SoftLayer/si-post-install/99all.killsyslog @@ -22,4 +22,4 @@ sync #todo: remove #echo "Processes still using /:" #fuser -v / -#sleep 30 \ No newline at end of file +#sleep 30 From 59bef04afc4e0de9816ad37d40bb66412d3a2569 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0744/1681] Remove trailing spaces in file xCAT-UI/configure.php --- xCAT-UI/configure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/configure.php b/xCAT-UI/configure.php index f518ad157..a0b19786d 100644 --- a/xCAT-UI/configure.php +++ b/xCAT-UI/configure.php @@ -14,4 +14,4 @@ if (!isAuthenticated()) { } else { loadContent(); } -?> \ No newline at end of file +?> From 40a9e6b460374d1b19d339295e5b20511e8c9f83 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0745/1681] Remove trailing spaces in file xCAT-UI/css/login.css --- xCAT-UI/css/login.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/css/login.css b/xCAT-UI/css/login.css index 8aea60065..9ad5b8479 100644 --- a/xCAT-UI/css/login.css +++ b/xCAT-UI/css/login.css @@ -57,4 +57,4 @@ body { text-align: right; color: #f5f5f5; font-weight: bold; -} \ No newline at end of file +} From cebece0cf5f518aad6f2e08e9bc3504a353ca9a5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0746/1681] Remove trailing spaces in file xCAT-UI/css/style.css --- xCAT-UI/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css index ae084294f..4417c0126 100644 --- a/xCAT-UI/css/style.css +++ b/xCAT-UI/css/style.css @@ -870,4 +870,4 @@ td.jqplot-table-legend>div { #discoverTab td{ border-style: none; text-align: left; -} \ No newline at end of file +} From 4930f58b2d6d47e52eadf575f6ba20f3d5be1dbc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0747/1681] Remove trailing spaces in file xCAT-UI/debian/copyright --- xCAT-UI/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/debian/copyright b/xCAT-UI/debian/copyright index f61d34dfe..87e60f492 100644 --- a/xCAT-UI/debian/copyright +++ b/xCAT-UI/debian/copyright @@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - + From 8fbd3cf3f9da5786b85534228bca6223612cd2a0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0748/1681] Remove trailing spaces in file xCAT-UI/ganglianode.php --- xCAT-UI/ganglianode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/ganglianode.php b/xCAT-UI/ganglianode.php index 88f8d060f..8ec61d9c6 100644 --- a/xCAT-UI/ganglianode.php +++ b/xCAT-UI/ganglianode.php @@ -90,4 +90,4 @@ echo << EEE; -?> \ No newline at end of file +?> From cf659481e797220181ebff8f242be34a43fa983d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0749/1681] Remove trailing spaces in file xCAT-UI/help.php --- xCAT-UI/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/help.php b/xCAT-UI/help.php index 95bf6e353..e5141cef6 100644 --- a/xCAT-UI/help.php +++ b/xCAT-UI/help.php @@ -14,4 +14,4 @@ if (!isAuthenticated()) { } else { loadContent(); } -?> \ No newline at end of file +?> From cb27419323e1b32837fb8e3e34795ed3d93f49f8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0750/1681] Remove trailing spaces in file xCAT-UI/index.php --- xCAT-UI/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/index.php b/xCAT-UI/index.php index b55a5842c..aa26906c7 100644 --- a/xCAT-UI/index.php +++ b/xCAT-UI/index.php @@ -15,4 +15,4 @@ if (!isAuthenticated()) { } else { loadContent(); } -?> \ No newline at end of file +?> From d4a093ab9ba0186db7e77f5e0e7ad73be89f7c6d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0751/1681] Remove trailing spaces in file xCAT-UI/js/configure/configure.js --- xCAT-UI/js/configure/configure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/configure/configure.js b/xCAT-UI/js/configure/configure.js index 79cff6f25..8888915ca 100644 --- a/xCAT-UI/js/configure/configure.js +++ b/xCAT-UI/js/configure/configure.js @@ -555,4 +555,4 @@ function updatePanel(data) { infoBar.append(icon, msg, close); infoBar.prependTo($('#' + dialogId)); -} \ No newline at end of file +} From c37f31a48a816489e12c2231c4756e4d9f657b01 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0752/1681] Remove trailing spaces in file xCAT-UI/js/configure/discover.js --- xCAT-UI/js/configure/discover.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/configure/discover.js b/xCAT-UI/js/configure/discover.js index 719c8be2e..6a3bab7a8 100644 --- a/xCAT-UI/js/configure/discover.js +++ b/xCAT-UI/js/configure/discover.js @@ -379,4 +379,4 @@ function complete() { $('#discoverContentDiv').append(showStr); createDiscoverButtons(); -} \ No newline at end of file +} From dec288366d13d7687512bbda091a1e706ee5c6b1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0753/1681] Remove trailing spaces in file xCAT-UI/js/configure/files.js --- xCAT-UI/js/configure/files.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/configure/files.js b/xCAT-UI/js/configure/files.js index 4c79af81f..8f5bead7a 100644 --- a/xCAT-UI/js/configure/files.js +++ b/xCAT-UI/js/configure/files.js @@ -333,4 +333,4 @@ function deleteFile(container, file) { } } }); -} \ No newline at end of file +} From 70e7a98e4b272ec535dcaf82683a76cde14bb7b0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0754/1681] Remove trailing spaces in file xCAT-UI/js/configure/service.js --- xCAT-UI/js/configure/service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/configure/service.js b/xCAT-UI/js/configure/service.js index 036de8dce..13d40ea13 100644 --- a/xCAT-UI/js/configure/service.js +++ b/xCAT-UI/js/configure/service.js @@ -1311,4 +1311,4 @@ function deleteGroupDialog(groups) { } } }); -} \ No newline at end of file +} From 88ee6002acc92833828670c9e17b7955632ada05 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0755/1681] Remove trailing spaces in file xCAT-UI/js/configure/update.js --- xCAT-UI/js/configure/update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/configure/update.js b/xCAT-UI/js/configure/update.js index 1d8684891..1dab10795 100644 --- a/xCAT-UI/js/configure/update.js +++ b/xCAT-UI/js/configure/update.js @@ -319,4 +319,4 @@ function showUpdateResult(data) { }); $('#rpm button').attr('disabled', ''); -} \ No newline at end of file +} From 09f0e9c33e5b9e9d6103338c4f01386c09108dfc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0756/1681] Remove trailing spaces in file xCAT-UI/js/configure/users.js --- xCAT-UI/js/configure/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/configure/users.js b/xCAT-UI/js/configure/users.js index 0faf86959..9117ba4f1 100644 --- a/xCAT-UI/js/configure/users.js +++ b/xCAT-UI/js/configure/users.js @@ -546,4 +546,4 @@ function openDeleteUserDialog(users) { } } }); -} \ No newline at end of file +} From ffa9aafaa7f7dc38ee3de31259bb98a1ae84d0ca Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0757/1681] Remove trailing spaces in file xCAT-UI/js/custom/blade.js --- xCAT-UI/js/custom/blade.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/custom/blade.js b/xCAT-UI/js/custom/blade.js index adbfefb66..c3c771962 100644 --- a/xCAT-UI/js/custom/blade.js +++ b/xCAT-UI/js/custom/blade.js @@ -916,4 +916,4 @@ function updateBladeProvisionExistingStatus(data) { $('#' + statBarId).find('div').append('
It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.
'); } } -} \ No newline at end of file +} From 0e48263aa8823fa7057630fa301e5c698e42131f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0758/1681] Remove trailing spaces in file xCAT-UI/js/custom/customUtils.js --- xCAT-UI/js/custom/customUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/custom/customUtils.js b/xCAT-UI/js/custom/customUtils.js index e1b80e34b..c8500c505 100644 --- a/xCAT-UI/js/custom/customUtils.js +++ b/xCAT-UI/js/custom/customUtils.js @@ -796,4 +796,4 @@ function selectAll4Table(event, obj) { var status = obj.attr('checked'); tableObj.find(' :checkbox').attr('checked', status); event.stopPropagation(); -} \ No newline at end of file +} From cbada24a3117b2f9b8e0b3268d90896f542d4075 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0759/1681] Remove trailing spaces in file xCAT-UI/js/custom/esx.js --- xCAT-UI/js/custom/esx.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/custom/esx.js b/xCAT-UI/js/custom/esx.js index c20b05c3c..6da1b2ad2 100644 --- a/xCAT-UI/js/custom/esx.js +++ b/xCAT-UI/js/custom/esx.js @@ -745,4 +745,4 @@ function updateESXProvisionStatus(data) { $('#' + statBarId).find('div').append('
It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.
'); } } -} \ No newline at end of file +} From b1a749ced8a9143c474be048aacc2756da7508b8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0760/1681] Remove trailing spaces in file xCAT-UI/js/custom/hmc.js --- xCAT-UI/js/custom/hmc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/custom/hmc.js b/xCAT-UI/js/custom/hmc.js index f8ffc0d16..a89ef0f9c 100644 --- a/xCAT-UI/js/custom/hmc.js +++ b/xCAT-UI/js/custom/hmc.js @@ -2002,4 +2002,4 @@ function nonihCreateLpar(parentDiv) { var showStr = 'The machine type is not P7 IH, so you had to create lpars by command line manually.'; parentDiv.append(createInfoBar(showStr)); return; -} \ No newline at end of file +} From 3e7fe16aa8dd39d4c591ed7c01487adf6c87819f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0761/1681] Remove trailing spaces in file xCAT-UI/js/custom/ipmi.js --- xCAT-UI/js/custom/ipmi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/custom/ipmi.js b/xCAT-UI/js/custom/ipmi.js index 8adf1c915..f3e93584d 100644 --- a/xCAT-UI/js/custom/ipmi.js +++ b/xCAT-UI/js/custom/ipmi.js @@ -1035,4 +1035,4 @@ function idataplexInitPowerOn() { var infoBar = createInfoBar('Click the refresh button to check all nodes\' status.'); $('#poweronDiv').append(infoBar); createDiscoverButtons(); -} \ No newline at end of file +} From 0c07e14eea022970970f1a00d76ddd6c79e7eca5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0762/1681] Remove trailing spaces in file xCAT-UI/js/custom/kvm.js --- xCAT-UI/js/custom/kvm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/custom/kvm.js b/xCAT-UI/js/custom/kvm.js index 39552654d..73f39459c 100644 --- a/xCAT-UI/js/custom/kvm.js +++ b/xCAT-UI/js/custom/kvm.js @@ -740,4 +740,4 @@ function updateKVMProvisionStatus(data) { $('#' + statBarId).find('div').append('
It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.
'); } } -} \ No newline at end of file +} From ee8ac26dde668b1e475b09351b0c3a10eeab93c5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0763/1681] Remove trailing spaces in file xCAT-UI/js/help/help.js --- xCAT-UI/js/help/help.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/help/help.js b/xCAT-UI/js/help/help.js index aee8f7149..2f7abf9dc 100644 --- a/xCAT-UI/js/help/help.js +++ b/xCAT-UI/js/help/help.js @@ -924,4 +924,4 @@ function updateStatusBar(data) { var prg = writeRsp(rsp, ''); $('#' + statBarId).find('div').append(prg); } -} \ No newline at end of file +} From e60d4685a9b82ac1fe22fd64b608c5b37e405850 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0764/1681] Remove trailing spaces in file xCAT-UI/js/monitor/gangliamon.js --- xCAT-UI/js/monitor/gangliamon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/monitor/gangliamon.js b/xCAT-UI/js/monitor/gangliamon.js index 7aadafbab..bd62e4cf4 100644 --- a/xCAT-UI/js/monitor/gangliamon.js +++ b/xCAT-UI/js/monitor/gangliamon.js @@ -1055,4 +1055,4 @@ function addZoomDiv(obj) { $('#zoomDiv').append(newli); drawGangliaNodesArea(); -} \ No newline at end of file +} From 14ee840c5c72750567cd8aba8c5237089c4d2804 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0765/1681] Remove trailing spaces in file xCAT-UI/js/monitor/monitor.js --- xCAT-UI/js/monitor/monitor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/monitor/monitor.js b/xCAT-UI/js/monitor/monitor.js index d55341cf5..306a9242b 100644 --- a/xCAT-UI/js/monitor/monitor.js +++ b/xCAT-UI/js/monitor/monitor.js @@ -278,4 +278,4 @@ function updateMonStatus(data) { // Prepend info or warning bar to tab bar.prependTo($('#monitorTab .form')); bar.delay(4000).slideUp(); -} \ No newline at end of file +} From 3caba739ff2823623113b288308e3d0d14bd7c30 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0766/1681] Remove trailing spaces in file xCAT-UI/js/monitor/rmcmon.js --- xCAT-UI/js/monitor/rmcmon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/monitor/rmcmon.js b/xCAT-UI/js/monitor/rmcmon.js index 31ef0906f..fae8908a6 100644 --- a/xCAT-UI/js/monitor/rmcmon.js +++ b/xCAT-UI/js/monitor/rmcmon.js @@ -1209,4 +1209,4 @@ function createAssociationTable(cond) { showStr += ''; return showStr; -} \ No newline at end of file +} From 69ad15724ce645aa77b2d82195b88d7e7833b382 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0767/1681] Remove trailing spaces in file xCAT-UI/js/monitor/xcatmon.js --- xCAT-UI/js/monitor/xcatmon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/monitor/xcatmon.js b/xCAT-UI/js/monitor/xcatmon.js index 9eb8a9a5d..b64c118c4 100644 --- a/xCAT-UI/js/monitor/xcatmon.js +++ b/xCAT-UI/js/monitor/xcatmon.js @@ -420,4 +420,4 @@ function deleteXcatMonRow(obj) { break; } } -} \ No newline at end of file +} From b2c49a5f647d9a8222fadd71baf8693e75bd5547 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0768/1681] Remove trailing spaces in file xCAT-UI/js/nodes/mtm.js --- xCAT-UI/js/nodes/mtm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/nodes/mtm.js b/xCAT-UI/js/nodes/mtm.js index 47380cdca..e76477aba 100644 --- a/xCAT-UI/js/nodes/mtm.js +++ b/xCAT-UI/js/nodes/mtm.js @@ -41,4 +41,4 @@ var hardwareInfo = { '8231-E2C' : [ 'P7 HE', 4 ], '9125-F2C' : [ 'Power 775', 2], '78AC-100' : [ 'Power 775', 2] // bpa -}; \ No newline at end of file +}; From ce9c791d29dd90c0347dcc87044b3d1b48225639 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0769/1681] Remove trailing spaces in file xCAT-UI/js/nodes/nodeset.js --- xCAT-UI/js/nodes/nodeset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/nodes/nodeset.js b/xCAT-UI/js/nodes/nodeset.js index 87d84ba1e..4698c728a 100644 --- a/xCAT-UI/js/nodes/nodeset.js +++ b/xCAT-UI/js/nodes/nodeset.js @@ -305,4 +305,4 @@ function updateNodesetStatus(data) { // Hide loader $('#' + statBarId).find('img').hide(); } -} \ No newline at end of file +} From b9474860a0835a4833a562ca50f2337b15b04a0e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0770/1681] Remove trailing spaces in file xCAT-UI/js/nodes/physical.js --- xCAT-UI/js/nodes/physical.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/nodes/physical.js b/xCAT-UI/js/nodes/physical.js index 24b010c8c..11a5b778a 100644 --- a/xCAT-UI/js/nodes/physical.js +++ b/xCAT-UI/js/nodes/physical.js @@ -932,4 +932,4 @@ function calculateBlank(mtm) { return 0; break; } -} \ No newline at end of file +} From ea11a5975c0bbc7c831297988b86128559a71d70 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0771/1681] Remove trailing spaces in file xCAT-UI/js/nodes/rnetboot.js --- xCAT-UI/js/nodes/rnetboot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/nodes/rnetboot.js b/xCAT-UI/js/nodes/rnetboot.js index 7f03e069b..2c1401e6e 100644 --- a/xCAT-UI/js/nodes/rnetboot.js +++ b/xCAT-UI/js/nodes/rnetboot.js @@ -220,4 +220,4 @@ function loadNetbootPage(tgtNodes) { // Select new tab tab.select(newTabId); -} \ No newline at end of file +} From 8412b42d3e77e7d79c4bd33c9088818f40cae3a6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0772/1681] Remove trailing spaces in file xCAT-UI/js/nodes/rscan.js --- xCAT-UI/js/nodes/rscan.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/nodes/rscan.js b/xCAT-UI/js/nodes/rscan.js index 06fdbff09..aa4e37c44 100644 --- a/xCAT-UI/js/nodes/rscan.js +++ b/xCAT-UI/js/nodes/rscan.js @@ -171,4 +171,4 @@ function loadRscanPage(tgtNodes) { // Select new tab tab.select(newTabId); -} \ No newline at end of file +} From 1573077e619c5c962c0f4297ecc8f51ffa281fda Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0773/1681] Remove trailing spaces in file xCAT-UI/js/nodes/updatenode.js --- xCAT-UI/js/nodes/updatenode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/nodes/updatenode.js b/xCAT-UI/js/nodes/updatenode.js index d0a177a40..b96088516 100644 --- a/xCAT-UI/js/nodes/updatenode.js +++ b/xCAT-UI/js/nodes/updatenode.js @@ -406,4 +406,4 @@ function loadUpdatenodePage(tgtNodes) { // Select new tab tab.select(newTabId); -} \ No newline at end of file +} From 1e10decf5f4c8b1c78217a492fc78c54653c6101 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0774/1681] Remove trailing spaces in file xCAT-UI/js/provision/images.js --- xCAT-UI/js/provision/images.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/provision/images.js b/xCAT-UI/js/provision/images.js index fd4967321..84ad0fa67 100644 --- a/xCAT-UI/js/provision/images.js +++ b/xCAT-UI/js/provision/images.js @@ -1459,4 +1459,4 @@ function createImage() { data = decodeRsp(data); } }); -} \ No newline at end of file +} From 95120474566e390872763090faff81414c29a2fd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0775/1681] Remove trailing spaces in file xCAT-UI/js/provision/provision.js --- xCAT-UI/js/provision/provision.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/provision/provision.js b/xCAT-UI/js/provision/provision.js index f3a394df5..f2cd26211 100644 --- a/xCAT-UI/js/provision/provision.js +++ b/xCAT-UI/js/provision/provision.js @@ -255,4 +255,4 @@ function loadProvisionPage() { $('#quickProvisionTab').append(provForm); appendProvisionSection('quick', provForm); } -} \ No newline at end of file +} From 6e6b95031a9b532ad93ec3854d1db510426c6d1f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0776/1681] Remove trailing spaces in file xCAT-UI/js/rcons/rcons.js --- xCAT-UI/js/rcons/rcons.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/rcons/rcons.js b/xCAT-UI/js/rcons/rcons.js index 32662baea..0647225cc 100644 --- a/xCAT-UI/js/rcons/rcons.js +++ b/xCAT-UI/js/rcons/rcons.js @@ -285,4 +285,4 @@ rconsTerm = function(nodeName, height, width) { sendTimeout = window.setTimeout(rconsSend, 1); } } -}; \ No newline at end of file +}; From 3fc2d8a0a3664d07e98430f82a30bb488bd280e1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0777/1681] Remove trailing spaces in file xCAT-UI/js/service/service.js --- xCAT-UI/js/service/service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/js/service/service.js b/xCAT-UI/js/service/service.js index 0ffcaf7d4..0bd570520 100644 --- a/xCAT-UI/js/service/service.js +++ b/xCAT-UI/js/service/service.js @@ -2189,4 +2189,4 @@ function setMaxVM() { $.cookie('xcat_' + userName + '_maxvm', rsp, { expires: exDate }); } }); -} \ No newline at end of file +} From 339eafa8dd2481886f4d34efe719f30f0ef20c8b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0778/1681] Remove trailing spaces in file xCAT-UI/js/service/utils.js --- xCAT-UI/js/service/utils.js | 78 ++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/xCAT-UI/js/service/utils.js b/xCAT-UI/js/service/utils.js index f7de6cfe4..1e6ce4155 100644 --- a/xCAT-UI/js/service/utils.js +++ b/xCAT-UI/js/service/utils.js @@ -1,6 +1,6 @@ /** * Get nodes currently shown in datatable - * + * * @param tableId * Datatable ID * @return String of nodes shown @@ -8,10 +8,10 @@ function getNodesShown(tableId) { // String of nodes shown var shownNodes = ''; - + // Get rows of shown nodes var nodes = $('#' + tableId + ' tbody tr'); - + // Go through each row var cols; for (var i = 0; i < nodes.length; i++) { @@ -19,7 +19,7 @@ function getNodesShown(tableId) { cols = nodes.eq(i).find('td'); shownNodes += cols.eq(1).text() + ','; } - + // Remove last comma shownNodes = shownNodes.substring(0, shownNodes.length-1); return shownNodes; @@ -27,17 +27,17 @@ function getNodesShown(tableId) { /** * Find the row index containing a column with a given string - * + * * @param str String to search for * @param table Table to check * @param col Column to find string under * @return The row index containing the search string */ -function findRow(str, table, col){ +function findRow(str, table, col){ // Get datatable var dTable = $(table).dataTable(); var rows = dTable.fnGetData(); - + // Loop through each row for (var i in rows) { // If the column contains the search string @@ -45,13 +45,13 @@ function findRow(str, table, col){ return parseInt(i); } } - + return -1; } /** * Select all checkboxes in the datatable - * + * * @param event Event on element * @param obj Object triggering event */ @@ -63,13 +63,13 @@ function selectAll(event, obj) { } else { checkboxes.attr('checked', false); } - + event.stopPropagation(); } /** * Get node attributes from HTTP request data - * + * * @param propNames Hash table of property names * @param keys Property keys * @param data Data from HTTP request @@ -120,7 +120,7 @@ function getAttrs(keys, propNames, data) { /** * Create a tool tip for comments - * + * * @param comment Comments to be placed in a tool tip * @return Tool tip */ @@ -137,7 +137,7 @@ function createCommentsToolTip(comment) { 'border': '0px', 'display': 'block' }); - + // Create links to save and cancel changes var lnkStyle = { 'color': '#58ACFA', @@ -146,17 +146,17 @@ function createCommentsToolTip(comment) { 'padding': '5px', 'float': 'right' }; - + var saveLnk = $('Save').css(lnkStyle).hide(); var cancelLnk = $('Cancel').css(lnkStyle).hide(); var infoSpan = $('Click to edit').css(lnkStyle); - + // Save changes onclick saveLnk.bind('click', function(){ // Get node and comment var node = $(this).parent().parent().find('img').attr('id').replace('Tip', ''); var comments = $(this).parent().find('textarea').val(); - + // Save comment $.ajax( { url : 'lib/srv_cmd.php', @@ -167,45 +167,45 @@ function createCommentsToolTip(comment) { args : '-t;node;-o;' + node + ';usercomment=' + comments, msg : 'out=manageTab;tgt=' + node }, - + success: showChdefOutput }); - + // Hide cancel and save links $(this).hide(); cancelLnk.hide(); }); - + // Cancel changes onclick cancelLnk.bind('click', function(){ // Get original comment and put it back var orignComments = $(this).parent().find('textarea').text(); $(this).parent().find('textarea').val(orignComments); - + // Hide cancel and save links $(this).hide(); saveLnk.hide(); infoSpan.show(); }); - + // Show save link when comment is edited txtArea.bind('click', function(){ saveLnk.show(); cancelLnk.show(); infoSpan.hide(); }); - + toolTip.append(txtArea); toolTip.append(cancelLnk); toolTip.append(saveLnk); toolTip.append(infoSpan); - + return toolTip; } /** * Open a dialog and show given message - * + * * @param type Type of dialog, i.e. warn or info * @param msg Message to show */ @@ -220,7 +220,7 @@ function prompt(type, msg) { 'margin': '5px', 'vertical-align': 'middle' }); - + // Append icon var icon; var dialog = $('
'); @@ -229,10 +229,10 @@ function prompt(type, msg) { } else { icon = $('').css(style); } - + dialog.append(icon); dialog.append(msg); - + // Open dialog dialog.dialog({ title: type, @@ -242,7 +242,7 @@ function prompt(type, msg) { }, width: 400, buttons: { - "Ok": function(){ + "Ok": function(){ $(this).dialog("close"); } } @@ -251,7 +251,7 @@ function prompt(type, msg) { /** * Get nodes that are checked in a given datatable - * + * * @param dTableId The datatable ID * @return Nodes that were checked */ @@ -262,10 +262,10 @@ function getNodesChecked(dTableId) { var nodes = $('#' + dTableId + ' input[type=checkbox]:checked'); for (var i in nodes) { var tgtNode = nodes.eq(i).attr('name'); - + if (tgtNode){ tgts += tgtNode; - + // Add a comma at the end if (i < nodes.length - 1) { tgts += ','; @@ -278,7 +278,7 @@ function getNodesChecked(dTableId) { /** * Show chdef output - * + * * @param data Data returned from HTTP request */ function showChdefOutput(data) { @@ -287,7 +287,7 @@ function showChdefOutput(data) { var args = data.msg.split(';'); var tabID = args[0].replace('out=', ''); var tgt = args[1].replace('tgt=', ''); - + // Find info bar on nodes tab, if any var info = $('#' + tabID).find('.ui-state-highlight'); if (!info.length) { @@ -295,19 +295,19 @@ function showChdefOutput(data) { info = createInfoBar(''); $('#' + tabID).append(info); } - + // Go through output and append to paragraph var prg = $('

'); for (var i in out) { prg.append(tgt + ': ' + out[i] + '
'); } - + info.append(prg); } /** * Get an attribute of a given node - * + * * @param node The node * @param attrName The attribute * @return The attribute of the node @@ -318,7 +318,7 @@ function getUserNodeAttr(node, attrName) { // Search for the column containing the attribute var attrCol = null; - + var cols = row.parents('.dataTables_scroll').find('.dataTables_scrollHead thead tr:eq(0) th'); // Loop through each column for (var i in cols) { @@ -328,7 +328,7 @@ function getUserNodeAttr(node, attrName) { break; } } - + // If the column containing the attribute is found if (attrCol) { // Get the attribute column index @@ -340,4 +340,4 @@ function getUserNodeAttr(node, attrName) { } else { return ''; } -} \ No newline at end of file +} From abdc5576a35b88a786a6f1d6f84adc437633d806 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0779/1681] Remove trailing spaces in file xCAT-UI/lib/cmd.php --- xCAT-UI/lib/cmd.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-UI/lib/cmd.php b/xCAT-UI/lib/cmd.php index db9a3a23b..a7a8d67c5 100644 --- a/xCAT-UI/lib/cmd.php +++ b/xCAT-UI/lib/cmd.php @@ -76,7 +76,7 @@ if (isset($_GET["cmd"])) { $opts_array = array($opts); } } - + // Time needed to update /etc/hosts if (strncasecmp($cmd, "makehosts", 9) == 0) { sleep(5); @@ -238,4 +238,4 @@ function extractExtnoderange($xml) { return $rsp; } -?> \ No newline at end of file +?> From 5d471d6cf7bc1f17bf61d2cafa64ca8e75d5db32 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0780/1681] Remove trailing spaces in file xCAT-UI/lib/rcons.php --- xCAT-UI/lib/rcons.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/lib/rcons.php b/xCAT-UI/lib/rcons.php index c84ed0711..0308142e0 100644 --- a/xCAT-UI/lib/rcons.php +++ b/xCAT-UI/lib/rcons.php @@ -93,4 +93,4 @@ function rconsSynchronise($parameter) { return ($return); } -?> \ No newline at end of file +?> From 45a9bcab46dda053953df1e9cfc2e1329d926639 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0781/1681] Remove trailing spaces in file xCAT-UI/lib/srv_cmd.php --- xCAT-UI/lib/srv_cmd.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/lib/srv_cmd.php b/xCAT-UI/lib/srv_cmd.php index ecb4fc1a4..6477b1c04 100644 --- a/xCAT-UI/lib/srv_cmd.php +++ b/xCAT-UI/lib/srv_cmd.php @@ -203,4 +203,4 @@ function extractExtnoderange($xml) { return $rsp; } -?> \ No newline at end of file +?> From 533b1bff6a6ec9b2031f3aea309385b07d6c7068 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0782/1681] Remove trailing spaces in file xCAT-UI/lib/systemcmd.php --- xCAT-UI/lib/systemcmd.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-UI/lib/systemcmd.php b/xCAT-UI/lib/systemcmd.php index 94bbc4444..e4bb1ad5b 100644 --- a/xCAT-UI/lib/systemcmd.php +++ b/xCAT-UI/lib/systemcmd.php @@ -24,7 +24,7 @@ if (isset($_GET["cmd"])) { if (isset($_GET["msg"])) { $msg = $_GET["msg"]; } - + if ($cmd == "ostype") { $ret = strtolower(PHP_OS); } else { @@ -36,4 +36,4 @@ if (isset($_GET["cmd"])) { $msg = htmlentities($msg, ENT_QUOTES | ENT_HTML5, 'UTF-8'); echo json_encode(array("rsp"=>$ret, "msg" => $msg)); } -?> \ No newline at end of file +?> From 5574229663788724551f232a8000cab63f140544 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0783/1681] Remove trailing spaces in file xCAT-UI/lib/tabRestore.php --- xCAT-UI/lib/tabRestore.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/lib/tabRestore.php b/xCAT-UI/lib/tabRestore.php index 77e96c8b0..0e44409a4 100644 --- a/xCAT-UI/lib/tabRestore.php +++ b/xCAT-UI/lib/tabRestore.php @@ -80,4 +80,4 @@ $xml = submit_request($request, 0, NULL); // Reply in the form of JSON $rtn = array("rsp" => $xml); echo json_encode($rtn); -?> \ No newline at end of file +?> From f32f170e465c4a9b2f0be3f35cfbc4a8dfaf8adf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0784/1681] Remove trailing spaces in file xCAT-UI/lib/ui.php --- xCAT-UI/lib/ui.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/lib/ui.php b/xCAT-UI/lib/ui.php index c2e8d515c..458105a75 100644 --- a/xCAT-UI/lib/ui.php +++ b/xCAT-UI/lib/ui.php @@ -83,4 +83,4 @@ function login() {
Open Source. EPL License.
'; } -?> \ No newline at end of file +?> From 0ade610a92c42a3f3ae9ba2f211e7bf4bebc7354 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0785/1681] Remove trailing spaces in file xCAT-UI/lib/upload.php --- xCAT-UI/lib/upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/lib/upload.php b/xCAT-UI/lib/upload.php index 983fa30a1..9371ca81e 100644 --- a/xCAT-UI/lib/upload.php +++ b/xCAT-UI/lib/upload.php @@ -26,4 +26,4 @@ if ($type == "text/plain" || $type == "application/octet-stream" || $type == "ap } else { echo "(Error) File type $type not supported"; } -?> \ No newline at end of file +?> From a50eb01e300d24293ddf422b68d662f5665fa80e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0786/1681] Remove trailing spaces in file xCAT-UI/lib/uploadfile.php --- xCAT-UI/lib/uploadfile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/lib/uploadfile.php b/xCAT-UI/lib/uploadfile.php index fa382c587..75301d2b6 100644 --- a/xCAT-UI/lib/uploadfile.php +++ b/xCAT-UI/lib/uploadfile.php @@ -60,4 +60,4 @@ if (move_uploaded_file($_FILES["file"]["tmp_name"], $path)) { echo $reason; } -?> \ No newline at end of file +?> From 56de4a6149120aad0aee327b129f305f9333d77a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0787/1681] Remove trailing spaces in file xCAT-UI/lib/zCmd.php --- xCAT-UI/lib/zCmd.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/lib/zCmd.php b/xCAT-UI/lib/zCmd.php index c77f4b5fe..67839b288 100644 --- a/xCAT-UI/lib/zCmd.php +++ b/xCAT-UI/lib/zCmd.php @@ -156,4 +156,4 @@ if (isset($_GET["cmd"])) { $rtn = array("rsp" => $rsp, "msg" => $msg); echo json_encode($rtn); } -?> \ No newline at end of file +?> From e42711726a516606d56fb111acbc82a53dd72f68 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0788/1681] Remove trailing spaces in file xCAT-UI/monitor.php --- xCAT-UI/monitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/monitor.php b/xCAT-UI/monitor.php index 29010ad74..908c6684a 100644 --- a/xCAT-UI/monitor.php +++ b/xCAT-UI/monitor.php @@ -14,4 +14,4 @@ if (!isAuthenticated()) { } else { loadContent(); } -?> \ No newline at end of file +?> From 6ea16d19ea60db1e7f1e4c989cf4f99d62c0daf6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0789/1681] Remove trailing spaces in file xCAT-UI/provision.php --- xCAT-UI/provision.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-UI/provision.php b/xCAT-UI/provision.php index ef494bee5..afd8bb77a 100644 --- a/xCAT-UI/provision.php +++ b/xCAT-UI/provision.php @@ -14,4 +14,4 @@ if (!isAuthenticated()) { } else { loadContent(); } -?> \ No newline at end of file +?> From 76a3795765696e70e5ac406da861dce34878b4af Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0790/1681] Remove trailing spaces in file xCAT-buildkit/bin/buildkit --- xCAT-buildkit/bin/buildkit | 82 +++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit index dc825a660..eb119cde1 100755 --- a/xCAT-buildkit/bin/buildkit +++ b/xCAT-buildkit/bin/buildkit @@ -4,7 +4,7 @@ #----------------------------------------------------------------------------- -=head1 buildkit +=head1 buildkit xCAT/PCM Kit Build utilities @@ -496,7 +496,7 @@ exit $rc; #----------------------------------------------------------------------------- -=head3 usage +=head3 usage Displays message for -h option @@ -505,48 +505,48 @@ exit $rc; #----------------------------------------------------------------------------- sub usage { - print "Usage: + print "Usage: buildkit [-?│-h│--help] [-v│--version] To build a new Kit - buildkit [-V│--verbose] [] [│all] + buildkit [-V│--verbose] [] [│all] [-l│--kitloc ] To add packages to an existing Kit. buildkit [-V│--verbose] addpkgs [-p│--pkgdir ] [-k│--kitversion ] [-r│--kitrelease ] [-k│--kitversion ] [-r│--kitrelease ] - This tool is used to build and manage a Kit package. - The options are: - -h - Provide usage info. + This tool is used to build and manage a Kit package. + The options are: + -h - Provide usage info. -k - Kit version. -l - Location of kit files. (Including kit name.) -p - RPM package directory locations. -r - Kit release. - -v - Provide the version info. - command - Several commands are supported. See the list below. - -V - Verbose mode. Outputs additional debug messages. - - Supported subcommands: - create - creates a new Kit with the specified basename - chkconfig - checks the Kit build file - listrepo - lists the Kit package repositories in the Kit - build file, and their build status - buildrepo - builds the specified Kit package repository - buildrepo all - builds all the Kit package repositories - cleanrepo - deletes the build files for the specified Kit - package repository - cleanrepo all - deletes the build files for all Kit package - repositories - buildtar - builds the Kit tarfile - cleantar - deletes the Kit deployment directory and Kit - tarfile + -v - Provide the version info. + command - Several commands are supported. See the list below. + -V - Verbose mode. Outputs additional debug messages. + + Supported subcommands: + create - creates a new Kit with the specified basename + chkconfig - checks the Kit build file + listrepo - lists the Kit package repositories in the Kit + build file, and their build status + buildrepo - builds the specified Kit package repository + buildrepo all - builds all the Kit package repositories + cleanrepo - deletes the build files for the specified Kit + package repository + cleanrepo all - deletes the build files for all Kit package + repositories + buildtar - builds the Kit tarfile + cleantar - deletes the Kit deployment directory and Kit + tarfile cleanall - equivalent to buildkit cleanrepo all and buildkit cleantar - addpkgs -p + addpkgs -p - add product package rpms to a shipped tarfile named kitname.NEEDS_PRODUCT_PKGS.tar.bz2 \n"; @@ -667,7 +667,7 @@ sub kit_buildrepo =head3 kit_buildrepo1 - + =cut @@ -1224,7 +1224,7 @@ sub edit_bldkitconf =head3 load_bldkitconf - load the kitbuild.conf file into a global data structure and + load the kitbuild.conf file into a global data structure and verify that the general syntax is correct. =cut @@ -1514,7 +1514,7 @@ sub validate_bldkitconf print "Warning: Kit osminorversion is set to \"$::bldkit_config->{kit}{entries}[0]->{osminorversion}\", but this does not match kitrepo $kr->{kitrepoid} osminorversion \"$kr->{osminorversion}\". Processing will continue, but verify that you do not have an error in your buildkit configuration file. \n"; } $reponame .= '.' . $krminor; - $::bldkit_config->{kit}{entries}[0]->{osminorversion} = $krminor; + $::bldkit_config->{kit}{entries}[0]->{osminorversion} = $krminor; } if ((defined($::bldkit_config->{kit}{entries}[0]->{osarch})) && ($::bldkit_config->{kit}{entries}[0]->{osarch} ne @@ -2172,7 +2172,7 @@ sub build_kitcomp #----------------------------------------------------------------------------- -=head3 update_kitcomp_kitpkgdeps +=head3 update_kitcomp_kitpkgdeps Update the kitcomponent kitpkgdeps string For any kitpkgdep that does not explicitly specify a version-release @@ -2181,7 +2181,7 @@ sub build_kitcomp comparison string. Reason we need to do all this: We need to force yum/zypper to update the product rpms. A simple package name in the kitcomponent meta rpm - REQUIRES entry will not cause the product to get updated if an older + REQUIRES entry will not cause the product to get updated if an older version is already installed. Need to explicitly require this version and release of the product package. input: kitcomponent hash @@ -2264,7 +2264,7 @@ sub update_kitcomp_kitpkgdeps =head3 gen_kitcomp_spec - generate the rpm spec file for the kitcomponent metapkg rpm + generate the rpm spec file for the kitcomponent metapkg rpm input: kitcomponent hash kitrepo hash @@ -2466,7 +2466,7 @@ s/<<>>/$postunscript/; #----------------------------------------------------------------------------- -=head3 build_kitcomp_debian +=head3 build_kitcomp_debian @@ -2822,7 +2822,7 @@ s/<<>>/$postunscript/; =head3 load_script - load a kitcomponent script into a single return string + load a kitcomponent script into a single return string with imbedded newline chars input: fullpath of scriptname @@ -3186,7 +3186,7 @@ sub create_builddir Create the build directory for a PARTIAL kit (needs external pkgs) and copy in all required files for building the kit tar file. - This includes most build input without editting files since + This includes most build input without editting files since they will need to be generated at addpkgs time. =cut @@ -3277,8 +3277,8 @@ sub create_PARTIAL_builddir =head3 edit_deployparams Edit the kit deployment parameters to make sure it has correct - syntax for xCAT otherpkglist support - + syntax for xCAT otherpkglist support + =cut @@ -3364,7 +3364,7 @@ sub edit_deployparams =head3 edit_plugin Edit the kit plugin file to insert the full kit name - + =cut @@ -4058,11 +4058,11 @@ sub NEW_kit_addpkgs Check the compatible frameworks of the kit to see if it is compatible with the running code. - If one of the compatible frameworks of the kit matches one of the + If one of the compatible frameworks of the kit matches one of the compatible frameworks of the running code then we're good. NOTE: compatible_kitframeworks are the kitframeworks that I can add - and kit frameworks that I can be added to. + and kit frameworks that I can be added to. Returns: 0 - kit framework value From 1cbf6652cceaa386cf20dadc0d242272798ba56c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0791/1681] Remove trailing spaces in file xCAT-buildkit/debian/copyright --- xCAT-buildkit/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-buildkit/debian/copyright b/xCAT-buildkit/debian/copyright index f61d34dfe..87e60f492 100644 --- a/xCAT-buildkit/debian/copyright +++ b/xCAT-buildkit/debian/copyright @@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - + From 1cf901a9313ab7ffe27ee6df441d8c93394756fb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0792/1681] Remove trailing spaces in file xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm --- xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm b/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm index 0ee8c8669..4b9dfc0df 100644 --- a/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm +++ b/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm @@ -227,7 +227,7 @@ sub get_latest_version_deb =head3 find_latest_pkg - Find the latest rpm package give the rpm name and a list of + Find the latest rpm package give the rpm name and a list of possible package locations. Arguments: @@ -325,7 +325,7 @@ sub find_latest_pkg =head3 find_latest_pkg_deb - Find the latest deb package give the deb name and a list of + Find the latest deb package give the deb name and a list of possible package locations. Arguments: @@ -432,7 +432,7 @@ sub find_latest_pkg_deb Example: Comments: - The return value is generated with the Require query + The return value is generated with the Require query =cut @@ -733,7 +733,7 @@ sub CheckVersion #------------------------------------------------------------------------------- =head3 osver - Returns the os and version of the System you are running on + Returns the os and version of the System you are running on Arguments: none Returns: @@ -898,7 +898,7 @@ sub release_lock { #------------------------------------------------------------------------------- -=head3 get_unique_members +=head3 get_unique_members Description: Return an array which have unique members From 87de02f45e6f72d9ce26d19a41449049ea8af424 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0793/1681] Remove trailing spaces in file xCAT-buildkit/pods/man1/buildkit.1.pod --- xCAT-buildkit/pods/man1/buildkit.1.pod | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xCAT-buildkit/pods/man1/buildkit.1.pod b/xCAT-buildkit/pods/man1/buildkit.1.pod index b5029a152..7d9c49756 100644 --- a/xCAT-buildkit/pods/man1/buildkit.1.pod +++ b/xCAT-buildkit/pods/man1/buildkit.1.pod @@ -8,7 +8,7 @@ B [B<-?>|B<-h>|B<--help>] [B<-v>|B<--version>] To build a new Kit -B [B<-V>|B<--verbose]> I [I] [I | B] [B<-l>|B<--kitloc> I] +B [B<-V>|B<--verbose]> I [I] [I | B] [B<-l>|B<--kitloc> I] To add packages to an existing Kit. @@ -33,11 +33,11 @@ For example, to create a new kit named "prodkit" in the directory /home/mykits/ =item 1. If no location is provided then the command will create a subdirectory called "prodkit" in the current directory "/home/mykits" and the new kit files will be created there. - + B -B - +B + or =item 2. @@ -47,16 +47,16 @@ If a location is provided then the Kit files will be created there. Note that th B =back - + In both cases the /home/mykits/prodkit directory is created and the inital files for the kit are created in that directory. - + The following example illustrates the basic process for building a new Kit. In this example we are building a Kit named "mytstkit". =over 4 =item 1. -Change to the directory where you wish to create the Kit. +Change to the directory where you wish to create the Kit. =item 2. @@ -98,7 +98,7 @@ B For each repo name listed, build the repository. Note that if you need to build repositories for OS distributions, versions, or architectures that do not match the current system, you may need to copy your kit template directory to an appropriate server to build that repository, and then copy the results back to your main build server. For example, to build a repo named "rhels6.3" you would run the following command. -B +B or, you can build all of the repos at one time if there are no OS or architecture dependencies for kitcomponent package builds or kitpackage builds: @@ -156,9 +156,9 @@ Creates a new kit build directory structure for kit I using the lo =item B -Reads the buildkit.conf file, verifies that the file syntax is correct and that all specified files exist. +Reads the buildkit.conf file, verifies that the file syntax is correct and that all specified files exist. -=item B +=item B Reads the buildkit.conf file, lists all Kit package repositories listed in the file, and reports the build status for each repository. @@ -170,11 +170,11 @@ Reads the buildkit.conf file, and builds the specified Kit package repository. Reads the buildkit.conf file, and deletes all the package files and package meta data files from the /build/kit_repodir/I directory. If B is specified, all kit repository files are deleted. -=item B +=item B Reads the buildkit.conf file, validates that all kit repositories have been built, and builds the Kit tar file /I.tar.bz2. -=item B +=item B Reads the /buildkit.conf file and I the following: @@ -188,7 +188,7 @@ Reads the /buildkit.conf file and I the following: - /tmp -- /debbuild +- /debbuild =back @@ -198,7 +198,7 @@ Caution: Make sure you back up any tar files you would like to keep before runn Equivalent to running B and B. -=item B +=item B I {B<-p> | B<--pkgdir> I} [B<-k> | B<--kitversion> I] [B<-r> | B<--kitrelease> I] From bec1ab9762a19e035d59762289e5328ed76c9bf4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0794/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf --- .../kit_build/chef/chef-x86_64/buildkit.conf | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf index bc42a7e94..42bf16678 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf @@ -1,13 +1,13 @@ # Kit Build File -# +# # This file was initially auto-generated by the buildkit CLI command. # To create a new kit, the user should modify this file accordingly. # Refer to the buildkit manpage for further details. # -# kit: This section defines general info for the Kit. +# kit: This section defines general info for the Kit. # There must be exactly one kit section in a kit build file. -# +# # kit attributes: # basename (mandatory) Kit base name. e.g., kit-lsf # description (optional) Kit description. @@ -24,7 +24,7 @@ # kitlicense (mandatory) Kit license string to be built into all # kitcomponent packages # kittarfilename (optional) Filename.tar.bz2 to be used for the generated -# kit. Default is --.tar.bz2 +# kit. Default is --.tar.bz2 kit: basename=chef description=Kit for installing chef server, client and workstation @@ -35,9 +35,9 @@ kit: # kitrepo: This section defines a Kit Package Repository. -# There must be at least one kitrepo section in a kit build file. +# There must be at least one kitrepo section in a kit build file. # If you want to support multiple OSes, you should create a separate -# repo for each OS. Also, no two repos can be defined with the same +# repo for each OS. Also, no two repos can be defined with the same # OS name, major/minor version and arch. For example, you cannot have # two repos for RHEL 6.2 x86_64 in the same kit. # @@ -48,7 +48,7 @@ kit: # osmajorversion (mandatory) OS major version. e.g., 6 # osminorversion (optional) OS minor version. # osarch (mandatory) OS architecture. e.g., x86_64 -# compat_osbasenames (optional) Comma-separated list of compatible +# compat_osbasenames (optional) Comma-separated list of compatible # OS distro base names. e.g., centos kitrepo: @@ -61,14 +61,14 @@ kitrepo: #compat_osbasenames= -# kitcomponent: This section defines one Kit Component. -# There can be zero or more kitcomponent sections. +# kitcomponent: This section defines one Kit Component. +# There can be zero or more kitcomponent sections. # If you want to build a component which supports multiple OSes, -# you should create one kitcomponent section for each OS. -# Also, no two components in a kit can be defined with the same -# base name. +# you should create one kitcomponent section for each OS. +# Also, no two components in a kit can be defined with the same +# base name. # You can define multiple kit components with the same base name -# only if each kit component using this base name meets these +# only if each kit component using this base name meets these # requirements: # - Each kit component must be defined with the same version # and release number @@ -95,20 +95,20 @@ kitrepo: # kitpkgdeps (optional) Comma-separated list of kit package names that # will be listed as "REQUIRES" when building this kit # component. Each package must be defined in a separate -# kitpackage section. Each package must be in the same +# kitpackage section. Each package must be in the same # kitrepo as this kit component. -# non_native_pkgs (optional) -# Comma-separated list of non-native package -# paths that will be included as files in this kit -# component. All filenames are relative to +# non_native_pkgs (optional) +# Comma-separated list of non-native package +# paths that will be included as files in this kit +# component. All filenames are relative to # /source_packages and may contain # wildcards. If a filename is prefixed by 'EXTERNALPKGS:' # the file will not be built into the kit tarfile, but # will need to be added later with a 'buildkit addpkgs' -# command. -# Files will be placed in +# command. +# Files will be placed in # /opt/xcat/kits// -# when the kitcomponent package is deployed to an +# when the kitcomponent package is deployed to an # OS image. # Kit component deployment scripts must be specified # to manage these files. @@ -117,11 +117,11 @@ kitrepo: # section. # exlist (optional) Exclude list file for stateless image, relative # to /other_files -# Kit component deployment scripts (optional) Each attribute specifies +# Kit component deployment scripts (optional) Each attribute specifies # script path relative to /scripts # Script attributes: -# preinstall, postinstall, preuninstall, postuninstall, -# preupgrade, postupgrade, postbootscripts, +# preinstall, postinstall, preuninstall, postuninstall, +# preupgrade, postupgrade, postbootscripts, # genimage_postinstall kitcomponent: basename=chef_server_kit @@ -132,7 +132,7 @@ kitcomponent: kitrepoid=rhels6_x86_64 kitpkgdeps=chef-server postinstall=server.rpm_post - postbootscripts=server.post + postbootscripts=server.post kitcomponent: basename=chef_client_kit @@ -143,7 +143,7 @@ kitcomponent: kitrepoid=rhels6_x86_64 kitpkgdeps=chef postinstall=client.rpm_post - postbootscripts=client.post + postbootscripts=client.post kitcomponent: basename=chef_workstation_kit @@ -159,38 +159,38 @@ kitcomponent: # kitpackage: This section defines one Kit Package, and how to build it. -# There can be zero or more kitpackage sections. +# There can be zero or more kitpackage sections. # All filenames should be relative paths to -# /source_packages -# If you want to build a package which can run on multiple OSes, +# /source_packages +# If you want to build a package which can run on multiple OSes, # you have two options: -# 1. Build a separate package for each OS you want to support. -# For this option, you need to define one kitpackage section +# 1. Build a separate package for each OS you want to support. +# For this option, you need to define one kitpackage section # per supported OS. -# 2. Build one package that can run on multiple OSes. -# If you are building an RPM package, you are responsible for -# creating an RPM spec file that can run on multiple OSes. +# 2. Build one package that can run on multiple OSes. +# If you are building an RPM package, you are responsible for +# creating an RPM spec file that can run on multiple OSes. # For this option, you need to define one kitpackage section # which contains multiple kitrepoid lines. -# +# # kitpackage attributes: -# filename (mandatory) Package filename. +# filename (mandatory) Package filename. # kitrepoid (mandatory) A comma-separated list of kit reponames this package # belongs to. If multiple repos are defined, the package will # be built for the first repo only. For the other repos, # a symlink is created to the package built for the first repo. -# Package build methods (optional) -# Define how to build the packages. +# Package build methods (optional) +# Define how to build the packages. # If you don't specify a build method, the default behavior is -# to assume the package is pre-built under +# to assume the package is pre-built under # /source_packages -# All files in this section are relative to +# All files in this section are relative to # /source_packages # There are four methods to build packages. # 1. Use pre-built RPM package # The filename may contain wildcards to avoid needing to # specify an explicit package version-release filename. -# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') +# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') # Indicates whether the RPM package will be added to the # the kit tar file now as part of the kit build process, # or whether the customer will need to separately From 82e9d29fd121973b5c164128179536778a00721f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0795/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post --- .../kit_build/chef/chef-x86_64/scripts/client.post | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post index f76525258..23d69a127 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post @@ -1,21 +1,21 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html #------------------------------------------------------------------------------- #=head1 client.post -#=head2 This command configures the chef client on a xCAT node. It is used +#=head2 This command configures the chef client on a xCAT node. It is used # as a postbootscript for chef_client kit #=cut #------------------------------------------------------------------------------- -if [ "$NODESETSTATE" = "install" ]; then - #prevent getting called during full install bootup +if [ "$NODESETSTATE" = "install" ]; then + #prevent getting called during full install bootup #because the function will be called in the rpm %post section instead exit 0 else if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image #configure the chef client configuration files - /xcatpost/config_chef_client "$@" + /xcatpost/config_chef_client "$@" fi fi From e5a19ddcc4fc723c723317feb17ec7ab03921207 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0796/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post --- .../kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post index 709c34b10..857af6938 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post @@ -1,16 +1,16 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html #------------------------------------------------------------------------------- #=head1 client.post -#=head2 This command configures the chef client on a xCAT node. It is used +#=head2 This command configures the chef client on a xCAT node. It is used # as a post installation script for chef_client_kit.rpm #=cut #------------------------------------------------------------------------------- if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image #configure the chef client configuration files - /xcatpost/config_chef_client "$@" + /xcatpost/config_chef_client "$@" fi exit 0 From b45b0270e487578be5e54d99a5fa74704a915d25 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0797/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post --- .../kits/kit_build/chef/chef-x86_64/scripts/server.post | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post index 8b5d534d4..bdb880520 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post @@ -8,14 +8,14 @@ # It is used as a postbootscript for chef_server kit #=cut #------------------------------------------------------------------------------- -if [ "$NODESETSTATE" = "install" ]; then - #prevent getting called during full install bootup +if [ "$NODESETSTATE" = "install" ]; then + #prevent getting called during full install bootup #because the function will be called in the rpm %post section instead exit 0 else if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image #Now configure the chef server - /xcatpost/config_chef_server + /xcatpost/config_chef_server fi fi From 1c4cdf5921a3464b7e33a5d4602f1a3155162654 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0798/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post --- .../kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post index 8c6ac5de7..f42f7b2d8 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post @@ -10,7 +10,7 @@ #------------------------------------------------------------------------------- if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image #Now configure the chef server - /xcatpost/config_chef_server + /xcatpost/config_chef_server fi exit 0 From d006a8fe622db597a70a264b0380c6e870418b36 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0799/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post --- .../chef/chef-x86_64/scripts/workstation.post | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post index 44e5a87a8..9f39b9135 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post @@ -1,21 +1,21 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html #------------------------------------------------------------------------------- #=head1 workstation.post -#=head2 This command configures the chef workstation on a xCAT node. It is used -# as a postbootscript for chef_workstation kit +#=head2 This command configures the chef workstation on a xCAT node. It is used +# as a postbootscript for chef_workstation kit #=cut #------------------------------------------------------------------------------- -if [ "$NODESETSTATE" = "install" ]; then - #prevent getting called during full install bootup +if [ "$NODESETSTATE" = "install" ]; then + #prevent getting called during full install bootup #because the function will be called in the rpm %post section instead exit 0 else if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image #configure the chef workstation configuration files - /xcatpost/config_chef_workstation "$@" + /xcatpost/config_chef_workstation "$@" fi fi From a91e4ddc850b734298a4c8022ca764bf4303c83b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0800/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post --- .../chef/chef-x86_64/scripts/workstation.rpm_post | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post index 5446e8fa1..6d0f8ab58 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post @@ -1,16 +1,16 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html #------------------------------------------------------------------------------- #=head1 workstation.post -#=head2 This command configures the chef workstation on a xCAT node. It is used -# as a post installation script for chef_workstation_kit.rpm +#=head2 This command configures the chef workstation on a xCAT node. It is used +# as a post installation script for chef_workstation_kit.rpm #=cut #------------------------------------------------------------------------------- if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image #configure the chef workstation configuration files - /xcatpost/config_chef_workstation "$@" + /xcatpost/config_chef_workstation "$@" fi exit 0 From d0abdbc222de6145441ea348c0fdcfe5bcffb9ca Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0801/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf --- .../puppet/puppet-x86_64/buildkit.conf | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf index 7adca4452..ef304eb99 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf @@ -1,13 +1,13 @@ # Kit Build File -# +# # This file was initially auto-generated by the buildkit CLI command. # To create a new kit, the user should modify this file accordingly. # Refer to the buildkit manpage for further details. # -# kit: This section defines general info for the Kit. +# kit: This section defines general info for the Kit. # There must be exactly one kit section in a kit build file. -# +# # kit attributes: # basename (mandatory) Kit base name. e.g., kit-lsf # description (optional) Kit description. @@ -23,7 +23,7 @@ # kitlicense (mandatory) Kit license string to be built into all # kitcomponent packages # kittarfilename (optional) Filename.tar.bz2 to be used for the generated -# kit. Default is --.tar.bz2 +# kit. Default is --.tar.bz2 kit: basename=puppet description=Kit for installing puppet server and client @@ -38,9 +38,9 @@ kit: # kitrepo: This section defines a Kit Package Repository. -# There must be at least one kitrepo section in a kit build file. +# There must be at least one kitrepo section in a kit build file. # If you want to support multiple OSes, you should create a separate -# repo for each OS. Also, no two repos can be defined with the same +# repo for each OS. Also, no two repos can be defined with the same # OS name, major/minor version and arch. For example, you cannot have # two repos for RHEL 6.2 x86_64 in the same kit. # @@ -51,7 +51,7 @@ kit: # osmajorversion (mandatory) OS major version. e.g., 6 # osminorversion (optional) OS minor version. # osarch (mandatory) OS architecture. e.g., x86_64 -# compat_osbasenames (optional) Comma-separated list of compatible +# compat_osbasenames (optional) Comma-separated list of compatible # OS distro base names. e.g., centos kitrepo: @@ -64,14 +64,14 @@ kitrepo: #compat_osbasenames= -# kitcomponent: This section defines one Kit Component. -# There can be zero or more kitcomponent sections. +# kitcomponent: This section defines one Kit Component. +# There can be zero or more kitcomponent sections. # If you want to build a component which supports multiple OSes, -# you should create one kitcomponent section for each OS. -# Also, no two components in a kit can be defined with the same -# base name. +# you should create one kitcomponent section for each OS. +# Also, no two components in a kit can be defined with the same +# base name. # You can define multiple kit components with the same base name -# only if each kit component using this base name meets these +# only if each kit component using this base name meets these # requirements: # - Each kit component must be defined with the same version # and release number @@ -96,13 +96,13 @@ kitrepo: # kitpkgdeps (optional) Comma-separated list of kit package names that # will be listed as "REQUIRES" when building this kit # component. Each package must be defined in a separate -# kitpackage section. Each package must be in the same +# kitpackage section. Each package must be in the same # kitrepo as this kit component. # non_native_pkgs (optional) TBD -- NOT SUPPORTED YET! -# Comma-separated list of non-native package -# paths that will be included as files in this kit -# component. All filenames are relative to -# /source_packages +# Comma-separated list of non-native package +# paths that will be included as files in this kit +# component. All filenames are relative to +# /source_packages # Kit component deployment scripts must be specified # to manage these files. # driverpacks (optional) Comma-separated list of driver package filenames @@ -110,11 +110,11 @@ kitrepo: # section. # exlist (optional) Exclude list file for stateless image, relative # to /other_files -# Kit component deployment scripts (optional) Each attribute specifies +# Kit component deployment scripts (optional) Each attribute specifies # script path relative to /scripts # Script attributes: -# preinstall, postinstall, preuninstall, postuninstall, -# preupgrade, postupgrade, postbootscripts, +# preinstall, postinstall, preuninstall, postuninstall, +# preupgrade, postupgrade, postbootscripts, # genimage_postinstall kitcomponent: basename=puppet_client_kit @@ -125,7 +125,7 @@ kitcomponent: kitrepoid=rhels6_x86_64 kitpkgdeps=puppet postinstall=client.rpm_post - postbootscripts=client.post + postbootscripts=client.post kitcomponent: basename=puppet_server_kit @@ -136,40 +136,40 @@ kitcomponent: kitrepoid=rhels6_x86_64 kitpkgdeps=puppet-server postinstall=server.rpm_post - postbootscripts=server.post + postbootscripts=server.post # kitpackage: This section defines one Kit Package, and how to build it. -# There can be zero or more kitpackage sections. +# There can be zero or more kitpackage sections. # All filenames should be relative paths to -# /source_packages -# If you want to build a package which can run on multiple OSes, +# /source_packages +# If you want to build a package which can run on multiple OSes, # you have two options: -# 1. Build a separate package for each OS you want to support. -# For this option, you need to define one kitpackage section +# 1. Build a separate package for each OS you want to support. +# For this option, you need to define one kitpackage section # per supported OS. -# 2. Build one package that can run on multiple OSes. -# If you are building an RPM package, you are responsible for -# creating an RPM spec file that can run on multiple OSes. +# 2. Build one package that can run on multiple OSes. +# If you are building an RPM package, you are responsible for +# creating an RPM spec file that can run on multiple OSes. # For this option, you need to define one kitpackage section # which contains multiple kitrepoid lines. -# +# # kitpackage attributes: # filename (mandatory) Package filename -# kitrepoid (mandatory) The repo(s) this package belongs to. +# kitrepoid (mandatory) The repo(s) this package belongs to. # If multiple repos are defined, the package will be built for # the first repo only. For the other repos, a symlink is created # to the package built for the first repo. -# Package build methods (optional) -# Define how to build the packages. +# Package build methods (optional) +# Define how to build the packages. # If you don't specify a build method, the default behavior is -# to assume the package is pre-built under +# to assume the package is pre-built under # /source_packages -# All files in this section are relative to +# All files in this section are relative to # /source_packages # There are four methods to build packages. # 1. Use pre-built RPM package -# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') +# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') # Indicates whether the RPM package will be added to the # the kit tar file now as part of the kit build process, # or whether the customer will need to separately From 73a4c1e3b161aafe8b1980a4ac8ec426cd03abe1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0802/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post --- .../puppet/puppet-x86_64/scripts/client.post | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post index bdec2334a..a0a548486 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post @@ -1,20 +1,20 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html #------------------------------------------------------------------------------- #=head1 client.post -#=head2 This command configures the puppet client on a xCAT node. It is used -# as a postbootscript for puppet kit. +#=head2 This command configures the puppet client on a xCAT node. It is used +# as a postbootscript for puppet kit. #=cut #------------------------------------------------------------------------------- -if [ "$NODESETSTATE" = "install" ]; then - #prevent getting called during full install bootup +if [ "$NODESETSTATE" = "install" ]; then + #prevent getting called during full install bootup #because the function will be called in the rpm %post section instead exit 0 else #configure the puppet agent configuration files - /xcatpost/config_puppet_client "$@" + /xcatpost/config_puppet_client "$@" fi exit 0 From 7bc398550309892166e4fec1885ef6dea76a8349 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0803/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post --- .../puppet/puppet-x86_64/scripts/client.rpm_post | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post index e6c12c2df..65b311191 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post @@ -1,17 +1,17 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html #------------------------------------------------------------------------------- #=head1 client.rpm_post -#=head2 This command configures the puppet client on a xCAT node. It is used -# as a post installation script for puppet_client_kit.rpm. +#=head2 This command configures the puppet client on a xCAT node. It is used +# as a post installation script for puppet_client_kit.rpm. #=cut #------------------------------------------------------------------------------- if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image #configure the puppet agent configuration files - /xcatpost/config_puppet_client "$@" + /xcatpost/config_puppet_client "$@" fi exit 0 From 329182660c895a3d21d241cfa4e316f74c54c151 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0804/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post --- .../kits/kit_build/puppet/puppet-x86_64/scripts/server.post | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post index b253cf331..7a11229ff 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post @@ -8,8 +8,8 @@ # It is used as a postbootscript for puppet kit. #=cut #------------------------------------------------------------------------------- -if [ "$NODESETSTATE" = "install" ]; then - #prevent getting called during full install bootup +if [ "$NODESETSTATE" = "install" ]; then + #prevent getting called during full install bootup #because the function will be called in the rpm %post section instead exit 0 else @@ -18,7 +18,7 @@ else #restart puppet master service puppetmaster stop - kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}') + kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}') service puppetmaster start fi From 35b74a99684c8f426cb020bcca65c0455c9541dd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0805/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post --- .../kit_build/puppet/puppet-x86_64/scripts/server.rpm_post | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post index 7e2e81899..2b2af0709 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post @@ -12,10 +12,10 @@ if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image #Now configure the pupper server /xcatpost/config_puppet_server "$@" - + #restart puppet master service puppetmaster stop - kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}') + kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}') service puppetmaster start fi From 317a2adcf754e268b268a6059e220618b723d6ec Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0806/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf --- .../xcat/kits/kit_template/buildkit.conf | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf index edeeb644b..f38c68be2 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf @@ -1,8 +1,8 @@ # Kit Build File -# +# # A unique version of this file is automatically generated for a new Kit -# when you run the buildkit command to create a new Kit. The basic template -# for this file is contained in the /opt/xcat/share/xcat/kits/kit_template +# when you run the buildkit command to create a new Kit. The basic template +# for this file is contained in the /opt/xcat/share/xcat/kits/kit_template # directory. Once the initial version of this file is generated you will # have to modify it by adding the details needed to build your new Kit. # @@ -48,9 +48,9 @@ # Use 1 for yes, 0 for no. Default: 0 # # kitdeployparams (optional) Filename containing a list of kit deployment -# parameters. The name should be the full path name of -# the file relative to /other_files -# +# parameters. The name should be the full path name of +# the file relative to /other_files +# # kitlicense (mandatory) Kit license string to be built into all # kitcomponent packages. (template default "EPL") # @@ -75,7 +75,7 @@ kit: # osarch= # isinternal= # kitdeployparams=sample/kitdeployparams.lst - # kittarfilename= + # kittarfilename= # # kitrepo: This stanza defines a Kit Package Repository. # There must be at least one kitrepo stanza in a kit build file. @@ -86,8 +86,8 @@ kit: # # kitrepo attributes: # kitrepoid (mandatory) Kit package repository ID. Must be unique within -# this file. A typical name may be something like: -# "._". +# this file. A typical name may be something like: +# "._". # (ex. "rhels6.4_x86_64") # # osbasename (mandatory) OS distro base name. (ex. "rhels") @@ -119,17 +119,17 @@ kitrepo: # - Each kit component must be defined with the same version # and release number # - Each kit component must be defined with a unique kitrepoid -# +# # kitcomponent attributes: -# basename (mandatory) Kit component base name +# basename (mandatory) Kit component base name # (ex. "myproduct_compute") # # description (optional) Kit component description # -# version (optional) Kit component version. The default is +# version (optional) Kit component version. The default is # the kit version. # -# release (optional) Kit component release. The default is the +# release (optional) Kit component release. The default is the # kit release. # # serverroles (mandatory) Comma-separated list of node types that this @@ -144,17 +144,17 @@ kitrepo: # dependencies. These kit components can be included in # this kit or in other kits. # -# ospkgdeps (optional) Comma-separated list of OS RPM dependency +# ospkgdeps (optional) Comma-separated list of OS RPM dependency # basenames. # These packages must be shipped with the OS distro. # (ex. "libacl(x86-32)") # -# kitpkgdeps (mandatory IF product RPMs will be included in this Kit) -# Comma-separated list of RPM basenames. Each RPM must -# be defined in a separate kitpackage stanza. Each RPM -# package must be in the same kitrepo as this kit component. +# kitpkgdeps (mandatory IF product RPMs will be included in this Kit) +# Comma-separated list of RPM basenames. Each RPM must +# be defined in a separate kitpackage stanza. Each RPM +# package must be in the same kitrepo as this kit component. # (ex. "xlc(x86-32)") -# +# # non_native_pkgs (optional) # Comma-separated list of non-native package # paths that will be included as files in this kit @@ -221,7 +221,7 @@ kitcomponent: # # # kitpackage attributes: -# filename (mandatory) Package filename. The filename may contain +# filename (mandatory) Package filename. The filename may contain # wildcards to avoid needing to # specify an explicit package version-release filename. # @@ -230,17 +230,17 @@ kitcomponent: # be built for the first repo only. For the other repos, # a symlink is created to the package built for the first repo. # -# isexternalpkg (mandatory) Indicates if the package will be included +# isexternalpkg (mandatory) Indicates if the package will be included # in this kit or added later. # 'no' or '0' means the package is included. # 'yes' or '1' means the packages will be added later. # The default if not set is 'no'. # -# rpm_prebuiltdir (mandatory IF isexternalpkg=no) Path to the directory -# containing the pre-built RPMs relative to +# rpm_prebuiltdir (mandatory IF isexternalpkg=no) Path to the directory +# containing the pre-built RPMs relative to # /source_packages directory. -# For example, if the file is -# "/source_packages/foobar/foo.rpm" +# For example, if the file is +# "/source_packages/foobar/foo.rpm" # then set "rpm_prebuiltdir=foobar". kitpackage: filename=pkg1-*.noarch.rpm From c9972bc4fc7f024c87642dbc254d710ffbaba862 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0807/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm --- .../plugins/sample/imageprofile.pm | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm index dc1108125..4da8db07e 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm +++ b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm @@ -96,7 +96,7 @@ $PLUGIN_KITNAME = "<<>>"; =head1 Image Profile Kit Plugin - This plugin contains commands to run custom actions + This plugin contains commands to run custom actions during image profile operations. =cut @@ -232,7 +232,7 @@ sub process_request { =head3 kitimagepregenerate - This command is called before an image profile + This command is called before an image profile is created with a specified set of parameters. Command-line interface: @@ -303,7 +303,7 @@ sub kitimagepregenerate { =head3 kitimagepostgenerate - This command is called after an image profile + This command is called after an image profile is created. Command-line interface: @@ -353,7 +353,7 @@ sub kitimagepostgenerate { =head3 kitimageprecopy - This command is called before an image profile + This command is called before an image profile is copied with a specified set of parameters. Command-line interface: @@ -424,7 +424,7 @@ sub kitimageprecopy { =head3 kitimagepostcopy - This command is called after an image profile + This command is called after an image profile is copied. Command-line interface: @@ -474,7 +474,7 @@ sub kitimagepostcopy { =head3 kitimagepreupdate - This command is called before an image profile + This command is called before an image profile is updated with a specified set of parameters. Command-line interface: @@ -545,7 +545,7 @@ sub kitimagepreupdate { =head3 kitimagepostupdate - This command is called after an image profile + This command is called after an image profile is updated. Command-line interface: @@ -594,7 +594,7 @@ sub kitimagepostupdate { =head3 kitimagepredelete - This command is called before an image profile + This command is called before an image profile is deleted. Command-line interface: @@ -644,7 +644,7 @@ sub kitimagepredelete { =head3 kitimagepostdelete - This command is called after an image profile + This command is called after an image profile is deleted. Command-line interface: @@ -695,7 +695,7 @@ sub kitimagepostdelete { =head3 parse_str_arg - Utility function to extract the string value of an + Utility function to extract the string value of an argument in this format: PARAM=string1 @@ -725,7 +725,7 @@ sub parse_str_arg { =head3 parse_list_arg - Utility function to extract the list of values of + Utility function to extract the list of values of an argument in this format: PARAM=value1,value2,value3 From 703320580286edd52e1529224b8e3a2a06e58da1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0808/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm --- .../xcat/kits/kit_template/plugins/sample/nodemgmt.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm index 8df5872fb..2cd58785c 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm +++ b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm @@ -85,7 +85,7 @@ $PLUGIN_KITNAME = "<<>>"; =head1 Node Management Kit Plugin - This plugin contains commands to run custom actions + This plugin contains commands to run custom actions during node management operations. =cut @@ -197,7 +197,7 @@ sub process_request { =head3 kitnodeadd - This command is called when one or more nodes are added + This command is called when one or more nodes are added to the cluster. Command-line interface: @@ -248,7 +248,7 @@ sub kitnodeadd { =head3 kitnoderemove - This command is called when one or more nodes are + This command is called when one or more nodes are removed from the cluster. Command-line interface: @@ -299,7 +299,7 @@ sub kitnoderemove { =head3 kitnodeupdate - This command is called when the configuration of one + This command is called when the configuration of one or more nodes are updated. Command-line interface: @@ -351,7 +351,7 @@ sub kitnodeupdate { =head3 kitnoderefresh This command is called to refresh node-related configuration - files. + files. Command-line interface: kitnoderefresh From 826dcd50b8b5abfc9121db952b4274a1b7bacb52 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0809/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh --- .../xcat/kits/kit_template/scripts/sample/genimage_post.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh index 98829792d..d47430437 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh +++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh @@ -5,14 +5,14 @@ rpmdir="/opt/xcat/kits/<<>>/<< /dev/null`" ] ; then dpkg -i --force-all --instdir=$installroot $installroot$rpmdir/*.deb - + elif [ -n "`ls $installroot$rpmdir/*.rpm 2> /dev/null`" ] ; then rpm --force --root $installroot -Uvh $installroot$rpmdir/*.rpm fi else if [ -n "`ls $rpmdir/*.deb 2> /dev/null`" ] ; then dpkg -i --force-all $rpmdir/*.deb - + elif [ -n "`ls $rpmdir/*.rpm 2> /dev/null`" ] ; then rpm --force -Uvh $rpmdir/*.rpm fi From 6520a795793fc13b3d6eefb2f979ce2fb83adfae Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0810/1681] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template --- xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template b/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template index 6032399db..f6237ff71 100644 --- a/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template +++ b/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template @@ -31,7 +31,7 @@ rm -rf $RPM_BUILD_ROOT %pre <<>> - + <<>> From bcce7d195d144be67ea02b6fca82eb7f454ef407 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0811/1681] Remove trailing spaces in file xCAT-client/bin/db2sqlsetup --- xCAT-client/bin/db2sqlsetup | 116 ++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/xCAT-client/bin/db2sqlsetup b/xCAT-client/bin/db2sqlsetup index bb84dfd18..1ace78436 100755 --- a/xCAT-client/bin/db2sqlsetup +++ b/xCAT-client/bin/db2sqlsetup @@ -4,39 +4,39 @@ #----------------------------------------------------------------------------- -=head1 db2sqlsetup +=head1 db2sqlsetup - This script is called after the installation of DB2 + This script is called after the installation of DB2 on xCAT. It will automate the setup of the DB2 to run xCAT on the IBM DB2 database on AIX and Linux. - On AIX ( AIX61J - AIX61 TL5(AIX 6.1.5.0)) or later and Linux. + On AIX ( AIX61J - AIX61 TL5(AIX 6.1.5.0)) or later and Linux. As an option it will also setup the ODBC for C/C++ applications to be able to use the database. It will setup an xcatdb - database ,a db2instance id, name xcatdb ( same as database), + database ,a db2instance id, name xcatdb ( same as database), and instance password to be used in the /etc/xcat/cfgloc file to access the database. - It will interact for the password to assign to the xcatdb + It will interact for the password to assign to the xcatdb for the Unix id and DB2 instance id, - unless the XCATDB2PW env var is set to the password for the instance id. + unless the XCATDB2PW env var is set to the password for the instance id. For Client setup, it will interact for the hostname or ip address of the DB2 Server as known by the Service Node, unless the XCATDB2SERVER environement variable is set. - See man db2setup for more information - The script will assume the default install paths of /opt/IBM/db2 for AIX and - /opt/ibm/db2 for Linux, unless overridden with the XCATDB2INSPATH - environment variable. + See man db2setup for more information + The script will assume the default install paths of /opt/IBM/db2 for AIX and + /opt/ibm/db2 for Linux, unless overridden with the XCATDB2INSPATH + environment variable. The script will assume /var/lib/db2 for the xcat db2 database directory - unless the + unless the DATABASELOC environment variable is set or the site.databaseloc attribute is set. The environment variable should match the databaseloc attribute in the site table, but the DATABASELOC environment - variable will take precedence. DATABASELOC points to the directory that + variable will take precedence. DATABASELOC points to the directory that contains the db2 database directory, so if DATABASELOC=/db2database then - the actual location for the db2 database is /db2database/db2. - + the actual location for the db2 database is /db2database/db2. + =cut BEGIN @@ -557,7 +557,7 @@ exit; #----------------------------------------------------------------------------- -=head3 usage +=head3 usage Displays message for -h option @@ -579,9 +579,9 @@ sub usage #----------------------------------------------------------------------------- -=head3 startxcatd +=head3 startxcatd - start the daemon + start the daemon =cut @@ -612,9 +612,9 @@ sub startxcatd #----------------------------------------------------------------------------- -=head3 shutdownxcatd +=head3 shutdownxcatd - shutdown the daemon + shutdown the daemon =cut @@ -643,9 +643,9 @@ sub shutdownxcatd #----------------------------------------------------------------------------- -=head3 backupxcatdb +=head3 backupxcatdb - Backup xCATdb + Backup xCATdb =cut @@ -695,9 +695,9 @@ sub backupxcatdb #----------------------------------------------------------------------------- -=head3 mkdb2user +=head3 mkdb2user - adds db2instance user and group and xcatdb instance id + adds db2instance user and group and xcatdb instance id =cut #----------------------------------------------------------------------------- @@ -867,11 +867,11 @@ sub mkdb2user #----------------------------------------------------------------------------- -=head3 setupservices +=head3 setupservices - add db2 xcatdb instance entries into /etc/services on Server or Client - + add db2 xcatdb instance entries into /etc/services on Server or Client + =cut @@ -906,14 +906,14 @@ db2c_xcatdb 50001/tcp # Port for server connection"; #----------------------------------------------------------------------------- -=head3 setupinstance +=head3 setupinstance - Create the db2 server or client instance + Create the db2 server or client instance For server - run /instance/db2icrt -a server -p db2c_xcatdb -u xcatdb xcatdb + run /instance/db2icrt -a server -p db2c_xcatdb -u xcatdb xcatdb For Client - run /instance/db2icrt -s client xcatdb + run /instance/db2icrt -s client xcatdb =cut @@ -1034,11 +1034,11 @@ sub setupinstance #----------------------------------------------------------------------------- -=head3 rundb2cmd +=head3 rundb2cmd - Run a commmand as the xcatdb instance id - Input: command + Run a commmand as the xcatdb instance id + Input: command =cut @@ -1061,7 +1061,7 @@ sub rundb2cmd #----------------------------------------------------------------------------- -=head3 setupdb2env +=head3 setupdb2env Setup the db2 environment variables and libpaths @@ -1143,10 +1143,10 @@ sub setupdb2env #----------------------------------------------------------------------------- -=head3 db2start +=head3 db2start - Start the db2 server + Start the db2 server =cut @@ -1188,10 +1188,10 @@ sub db2start #----------------------------------------------------------------------------- -=head3 catalogServer +=head3 catalogServer - Catalog the location of the db2 server on the Service Node + Catalog the location of the db2 server on the Service Node =cut @@ -1230,10 +1230,10 @@ sub catalogServer #----------------------------------------------------------------------------- -=head3 updateDBM +=head3 updateDBM - Setup configuration requirements for the DBM + Setup configuration requirements for the DBM =cut @@ -1259,10 +1259,10 @@ sub updateDBM #----------------------------------------------------------------------------- -=head3 createxcatdb +=head3 createxcatdb - Create the xcat database + Create the xcat database =cut @@ -1381,10 +1381,10 @@ sub createxcatdb #----------------------------------------------------------------------------- -=head3 db2reboot +=head3 db2reboot - Setup for db2 to start on reboot + Setup for db2 to start on reboot =cut @@ -1484,7 +1484,7 @@ ly restart on reboot."); #----------------------------------------------------------------------------- -=head3 setupODBC +=head3 setupODBC Will setup the ODBC. C++ applications are running that need access to the DB2 database for example LoadLeveler. @@ -1820,10 +1820,10 @@ sub setupODBC #----------------------------------------------------------------------------- -=head3 createcfgloc +=head3 createcfgloc - Creates the cfgloc file - to run xCAT on DB2 + Creates the cfgloc file + to run xCAT on DB2 =cut @@ -1883,8 +1883,8 @@ sub createcfgloc #----------------------------------------------------------------------------- -=head3 restorexcatdb - +=head3 restorexcatdb + Restores the database from ~/xcat-dbback and restarts the xcatd using DB2 @@ -1936,9 +1936,9 @@ sub restorexcatdb #----------------------------------------------------------------------------- -=head3 updatecrontab - - Sets up a crontab entry to reorg the database, once a week on Sunday +=head3 updatecrontab + + Sets up a crontab entry to reorg the database, once a week on Sunday night midnight =cut @@ -1961,7 +1961,7 @@ sub updatecrontab =head3 adddb2paths - Add paths to db2 commands to /etc/profile and ~.profile + Add paths to db2 commands to /etc/profile and ~.profile =cut @@ -2100,8 +2100,8 @@ qq~echo '# xCAT DB2 setup\nPATH=\$PATH:$db2paths\nexport PATH\n' >>$profname~; #----------------------------------------------------------------------------- =head3 remove - - remove DB2 on management node or service node. if you want to remove it + + remove DB2 on management node or service node. if you want to remove it from service node, you should use -s and -r flag together. Note this function is not supported and the code has not been kept up to date @@ -2508,11 +2508,11 @@ sub remove #----------------------------------------------------------------------------- -=head3 updatepasswd +=head3 updatepasswd if -S , then update the xcatdb instance password on the MN -C , then update the xcatdb instance password on the clients (SN) - if just -p , then update the xcatdb intance password on both + if just -p , then update the xcatdb intance password on both =cut From 47ecc0e01ed2bdfafd7a4f96a66eb0c955aeb313 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0812/1681] Remove trailing spaces in file xCAT-client/bin/mysqlsetup --- xCAT-client/bin/mysqlsetup | 68 +++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup index 36a39b86c..b7ad6f850 100755 --- a/xCAT-client/bin/mysqlsetup +++ b/xCAT-client/bin/mysqlsetup @@ -4,19 +4,19 @@ #----------------------------------------------------------------------------- -=head1 mysqlsetup +=head1 mysqlsetup This script automates the setup of the MySQL/MariaDB server and creates the xCAT database to run xCAT on MySQL/MariaDB. - Note: it will setup an xcat database (xcatdb),a xcatadmin id , and a MySQL root password. + Note: it will setup an xcat database (xcatdb),a xcatadmin id , and a MySQL root password. It will interact for the - password to assign, unless the XCATMYSQLADMIN_PW and the XCATMYSQLROOT_PW - env variables are set to the admin and mysql root password, resp. - Setups up AIX and Linux, but most work needs to be done on AIX. - See man mysqlsetup for more information and the xCAT2.SetupMySQL.pdf - documentation. + password to assign, unless the XCATMYSQLADMIN_PW and the XCATMYSQLROOT_PW + env variables are set to the admin and mysql root password, resp. + Setups up AIX and Linux, but most work needs to be done on AIX. + See man mysqlsetup for more information and the xCAT2.SetupMySQL.pdf + documentation. =cut @@ -415,7 +415,7 @@ if (($::INIT) && ($::xcatrunningmysql == 0)) $hname = `hostname`; chomp $hname; } - + #my ($name, $aliases, $addrtype, $length, @addrs) = gethostbyname($hname); my $ipaddr = xCAT::NetworkUtils->getipaddr($hname); if ($ipaddr) @@ -501,7 +501,7 @@ exit; #----------------------------------------------------------------------------- -=head3 usage +=head3 usage Displays message for -h option @@ -523,7 +523,7 @@ sub usage #----------------------------------------------------------------------------- -=head3 setulimits +=head3 setulimits sets ulimits unlimited, needed to run MySQL update /etc/security/limits with the info @@ -606,9 +606,9 @@ sub setulimits #----------------------------------------------------------------------------- -=head3 backupxcatdb +=head3 backupxcatdb - Backup xCATdb + Backup xCATdb =cut @@ -664,9 +664,9 @@ sub backupxcatdb #----------------------------------------------------------------------------- -=head3 shutdownxcatd +=head3 shutdownxcatd - shutdown the daemon + shutdown the daemon =cut @@ -697,10 +697,10 @@ sub shutdownxcatd #----------------------------------------------------------------------------- -=head3 fixinstall +=head3 fixinstall - If AIX, Fixes ownership and permssion on install - adds mysql user and group + If AIX, Fixes ownership and permssion on install + adds mysql user and group =cut @@ -775,7 +775,7 @@ sub fixinstalldir #----------------------------------------------------------------------------- -=head3 initmysqldb +=head3 initmysqldb Create the MySQL data directory and initialize the grant tables @@ -940,10 +940,10 @@ sub initmysqldb #----------------------------------------------------------------------------- -=head3 mysqlstart +=head3 mysqlstart - Start the mysql server + Start the mysql server =cut @@ -1023,10 +1023,10 @@ sub mysqlstart #----------------------------------------------------------------------------- -=head3 mysqlreboot +=head3 mysqlreboot - Setup for MySQL to start on reboot + Setup for MySQL to start on reboot =cut @@ -1151,10 +1151,10 @@ sub verifymysqlroot #----------------------------------------------------------------------------- -=head3 setupmysqlroot +=head3 setupmysqlroot - Set mysql root password in the database + Set mysql root password in the database =cut @@ -1196,9 +1196,9 @@ sub setupmysqlroot #----------------------------------------------------------------------------- -=head3 setupxcatdb +=head3 setupxcatdb - Creates the xcatdb in MySQL + Creates the xcatdb in MySQL Add xcatadmin to the database Give Management Node database access @@ -1335,9 +1335,9 @@ sub setupxcatdb #----------------------------------------------------------------------------- -=head3 setupLL +=head3 setupLL - Adds special LoadLeveler setup in MySQL + Adds special LoadLeveler setup in MySQL =cut @@ -1453,11 +1453,11 @@ sub setupLL #----------------------------------------------------------------------------- -=head3 addhosts +=head3 addhosts Will add all host ids that need access to the MySQL database. User will input names, ipaddress or wild cards like 9.112.%.% - or %.ibm.com in a file after the -f flag. + or %.ibm.com in a file after the -f flag. =cut @@ -1591,7 +1591,7 @@ sub addhosts #----------------------------------------------------------------------------- -=head3 setupODBC +=head3 setupODBC Will setup the ODBC. Only needed if C, C++ applications are running that need access to the MySQL database for example LoadLeveler. @@ -1832,7 +1832,7 @@ sub setupODBC #----------------------------------------------------------------------------- -=head3 createcfgloc +=head3 createcfgloc Creates the cfgloc.mysql file which will be copied to cfgloc to run xCAT on MySQL @@ -1885,8 +1885,8 @@ sub createcfgloc #----------------------------------------------------------------------------- -=head3 restorexcatdb - +=head3 restorexcatdb + Restores the database from ~/xcat-dbback and restarts the xcatd using MySQL From 78e4ea528524de40bd77a8fde5395b985d9a8b80 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0813/1681] Remove trailing spaces in file xCAT-client/bin/pgsqlsetup --- xCAT-client/bin/pgsqlsetup | 76 +++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/xCAT-client/bin/pgsqlsetup b/xCAT-client/bin/pgsqlsetup index 5e9152c3c..b5b85b611 100755 --- a/xCAT-client/bin/pgsqlsetup +++ b/xCAT-client/bin/pgsqlsetup @@ -4,14 +4,14 @@ #----------------------------------------------------------------------------- -=head1 pgsqlsetup +=head1 pgsqlsetup - This is script is called after the installation or upgrade of PostgreSQL + This is script is called after the installation or upgrade of PostgreSQL on xCAT. It will automate the setup of the PostgreSQL and xCAT to run xCAT on the PostgreSQL DB on AIX and Linux. - On AIX 6.1 or later , It will setup an xcatdb database ,a postgres id, + On AIX 6.1 or later , It will setup an xcatdb database ,a postgres id, a xcatadm id and password to be used in the /etc/xcat/cfgloc file to access the database. On Linux , It will setup an xcatdb database , and get an xcatadm password @@ -21,11 +21,11 @@ You can set the XCATPGPW environment variable to a password for the database to avoid prompting otherwise it will prompt for the - password to assign to the xcatadm userid for the Unix id and PgSQL database - id. + password to assign to the xcatadm userid for the Unix id and PgSQL database + id. - Setups up AIX 6.1+ and Linux, but most work needs to be done on AIX. - See man pgsqlsetup for more information and the documentation. + Setups up AIX 6.1+ and Linux, but most work needs to be done on AIX. + See man pgsqlsetup for more information and the documentation. If the -P flag is supplied, we are supporting setup under PCM. Additional setup for PCM is required. @@ -136,7 +136,7 @@ if ((!($INIT)) && ($SETUPODBC)) my $listenaddrs = undef; if (@LISTENADDRS) { - $listenaddrs = join ',', @LISTENADDRS; + $listenaddrs = join ',', @LISTENADDRS; } # @@ -424,7 +424,7 @@ exit; #----------------------------------------------------------------------------- -=head3 usage +=head3 usage Displays message for -h option @@ -446,9 +446,9 @@ sub usage #----------------------------------------------------------------------------- -=head3 shutdownxcatd +=head3 shutdownxcatd - shutdown the daemon + shutdown the daemon =cut @@ -477,9 +477,9 @@ sub shutdownxcatd #----------------------------------------------------------------------------- -=head3 backupxcatdb +=head3 backupxcatdb - Backup xCATdb + Backup xCATdb =cut @@ -529,9 +529,9 @@ sub backupxcatdb #----------------------------------------------------------------------------- -=head3 mkpgusers +=head3 mkpgusers - adds postgres user and group and xcatadm id + adds postgres user and group and xcatadm id Only needed on AIX, Linux install does this Note this does not support postgresql 9.0 on AIX =cut @@ -642,11 +642,11 @@ sub mkpgusers #----------------------------------------------------------------------------- -=head3 runpostgrescmd +=head3 runpostgrescmd - Run a commmand as the postgres id - Input: command + Run a commmand as the postgres id + Input: command =cut @@ -665,12 +665,12 @@ sub runpostgrescmd #----------------------------------------------------------------------------- -=head3 runpgcmd_chkoutput +=head3 runpgcmd_chkoutput - Run a commmand as the postgres id + Run a commmand as the postgres id Input: command - Output: return code + Output: return code Note: this version checks for specific error conditions =cut @@ -714,7 +714,7 @@ sub runpgcmd_chkoutput #----------------------------------------------------------------------------- -=head3 initpgdb +=head3 initpgdb Create the PostgreSQL database and setup the config files @@ -737,7 +737,7 @@ sub initpgdb } &runpostgrescmd($cmd); - # insert MN ip address and any -a addresses + # insert MN ip address and any -a addresses # in the # IPv4 local connections: stanza of # the /var/lib/pgsql/data/pg_hba.conf file # if it is not already there @@ -802,7 +802,7 @@ sub initpgdb if ($::osname eq 'Linux') { $cmd = qq~ echo listen_addresses = \\'localhost,$::MN\\' >> $pgconf~; - if ($::listenaddrs) + if ($::listenaddrs) { $cmd = qq~ echo listen_addresses = \\'localhost,$::MN,$::listenaddrs\\' >> $pgconf~; } @@ -863,12 +863,12 @@ sub initpgdb #----------------------------------------------------------------------------- -=head3 pgstart +=head3 pgstart - Start or restart the Postgresql server - startflg = 0 start postgresql - startflg = 1 restart postgresql + Start or restart the Postgresql server + startflg = 0 start postgresql + startflg = 1 restart postgresql =cut @@ -942,10 +942,10 @@ sub pgstart #----------------------------------------------------------------------------- -=head3 pgreboot +=head3 pgreboot - Setup for postgresql to start on reboot, only Linux + Setup for postgresql to start on reboot, only Linux =cut @@ -990,10 +990,10 @@ sub pgreboot #----------------------------------------------------------------------------- -=head3 setupxcatdb +=head3 setupxcatdb - Creates the xcatdb in Postgresql - Add xcatadm to the database and make owner of the database + Creates the xcatdb in Postgresql + Add xcatadm to the database and make owner of the database =cut @@ -1162,7 +1162,7 @@ sub setupxcatdb #----------------------------------------------------------------------------- -=head3 setupODBC +=head3 setupODBC Will setup the ODBC interface to the ODBC. Only supported on Linux @@ -1319,10 +1319,10 @@ sub setupODBC #----------------------------------------------------------------------------- -=head3 createcfgloc +=head3 createcfgloc Creates the cfgloc file which will be copied to cfgloc - to run xCAT on PostgreSQL + to run xCAT on PostgreSQL =cut @@ -1369,8 +1369,8 @@ sub createcfgloc #----------------------------------------------------------------------------- -=head3 restorexcatdb - +=head3 restorexcatdb + Restores the database from ~/xcat-dbback and restarts the xcatd using PostgreSQL From 7bac909a358ef2a33bf313a9bc9b357a99254416 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0814/1681] Remove trailing spaces in file xCAT-client/bin/rcons --- xCAT-client/bin/rcons | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons index fd10fa4d4..610b20101 100755 --- a/xCAT-client/bin/rcons +++ b/xCAT-client/bin/rcons @@ -4,7 +4,7 @@ # To handle cases like running this via sudo, get the home dir properly os=`uname` -if [ "$os" == "Linux" ]; then +if [ "$os" == "Linux" ]; then HOME=`getent passwd $(whoami)|cut -d: -f 6` export HOME fi @@ -59,7 +59,7 @@ for parameter in $@; do done # xCAT 2.9.1 allows for an option to use confluent as a rcons replacement and only use -# confluent if this keyword is defined in the site table. This allows for confluent to +# confluent if this keyword is defined in the site table. This allows for confluent to # be installed on the xCAT management node and switch between conserver & confluent USE_CONFLUENT=0 # If conluent is not enable, check the service status of goconserver. @@ -91,7 +91,7 @@ fi if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/usr/bin/confetty" ] || [ -x "/usr/local/bin/confetty" ]); then # use confluent, make sure conserver is not also running CONSERVER_RC=`pidof conserver >> /dev/null; echo $?` - if [[ ${CONSERVER_RC} == 0 ]]; then + if [[ ${CONSERVER_RC} == 0 ]]; then echo "Error: consoleservice is set to 'confluent' but conserver is running. Stop conserver, run makeconfluentcfg, and retry..." exit 1 fi @@ -110,8 +110,8 @@ if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/ if [ -z "$CONSERVER" ]; then CONSERVER=`nodels $1 nodehm.conserver 2>/dev/null | awk -F: '{print $2}' | tr -d ' '` declare -a ipaddrs=`ip -o a | awk {'print $4'} | cut -d/ -f1 | grep -v : | tr '\n' ' '` - for IP in ${ipaddrs[*]}; do - if [[ "${CONSERVER}" == "${IP}" ]]; then + for IP in ${ipaddrs[*]}; do + if [[ "${CONSERVER}" == "${IP}" ]]; then # conserver is the same node, do not connect using -s CONSERVER="" break @@ -176,9 +176,9 @@ elif [ $USE_GOCONSERVER == "1" ]; then elif [ -f "/usr/bin/console" ] || [ -f "/bin/console" ]; then # use conserver # make sure confluent is not also running, only if confluent is installed - if [[ -f "/etc/init.d/confluent" ]]; then + if [[ -f "/etc/init.d/confluent" ]]; then CONFLUENT_RC=`service confluent status >& /dev/null; echo $?` - if [[ ${CONFLUENT_RC} == 0 ]]; then + if [[ ${CONFLUENT_RC} == 0 ]]; then echo "Error: consoleservice is set to 'conserver' but confluent is running. Stop confluent, run makeconservercf, and retry..." exit 1 fi @@ -187,7 +187,7 @@ elif [ -f "/usr/bin/console" ] || [ -f "/bin/console" ]; then if [ -z "$CONSERVER" ]; then CONSERVER=`nodels $1 nodehm.conserver 2>/dev/null | awk -F: '{print $2}' | tr -d ' '` fi - + if [ -z "$CONSERVER" ]; then CONSERVER=$XCATHOST fi @@ -233,19 +233,19 @@ EOF sed -i 's/sslauthority/sslcacertificatefile/1' $HOME/.consolerc fi exec console $FORCE -M $CONSERVER $1 -else +else if [[ "$FORCE" == "-s" ]]; then echo "Read-only mode is not supported, please run rcons without -s option." exit 1 fi #deal with consoles directly - output=`nodels $1 nodehm.conserver nodehm.cons nodehm.mgt 2>&1` + output=`nodels $1 nodehm.conserver nodehm.cons nodehm.mgt 2>&1` if [ $? -ne 0 ]; then echo "$output" exit 1 - fi + fi - if [ -z "$CONSERVER" ]; then + if [ -z "$CONSERVER" ]; then CONSERVER=`echo "$output"|grep nodehm.conserver|cut -d: -f3|tr -d ' \n'` fi CONS=`echo "$output" |grep /nodehm.cons$/|cut -d: -f3 | tr -d ' \n'` @@ -256,7 +256,7 @@ else echo "Error: nodehm.mgt or nodehm.cons for node $1 not setup." exit 1; fi - + #check if conserver is local host result=`ping -c1 $CONSERVER 2>&1` if [ $? -eq 0 ]; then @@ -274,7 +274,7 @@ else if [ $? -eq 0 ]; then CONSERVER="" fi - else + else echo "Error: conserver $CONSERVER is not reachable." exit 1; fi @@ -283,7 +283,7 @@ else # check if others are using the console if [[ -n $CONSERVER ]]; then ssh $CONSERVER ps -ef |grep $1 |grep -v grep |grep "$XCATROOT/share/xcat/cons" > /dev/null - else + else ps -ef |grep $1 |grep -v grep |grep "$XCATROOT/share/xcat/cons" > /dev/null fi if [ $? -eq 0 ]; then From ea3342d521587e48762ae4c961115e849aa2b3a3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0815/1681] Remove trailing spaces in file xCAT-client/bin/rinstall --- xCAT-client/bin/rinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/bin/rinstall b/xCAT-client/bin/rinstall index 2d68b3f37..05c56dfff 100755 --- a/xCAT-client/bin/rinstall +++ b/xCAT-client/bin/rinstall @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/env perl # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html # Used as a convience command combined of [nodech]-nodeset-rsetboot-rpower-[rcons/wcons] From efb8ab519faf721dcb80f59556ca45f729d9f889 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0816/1681] Remove trailing spaces in file xCAT-client/bin/tcons --- xCAT-client/bin/tcons | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xCAT-client/bin/tcons b/xCAT-client/bin/tcons index cc0af755d..2cf994f9b 100755 --- a/xCAT-client/bin/tcons +++ b/xCAT-client/bin/tcons @@ -1,18 +1,18 @@ #!/bin/sh -f=1 -p=0 +f=1 +p=0 for i in `nodels "$1"`; do - if [ "$f" = 1 ]; then - f=0 + if [ "$f" = 1 ]; then + f=0 qdate=$((`date +%s`+5)) - tmux new-session -d -s tcons.$$ -x 800 -y 800 "rcons $i;if [ \`date +%s\` -lt $qdate ]; then echo Press enter to close; read qdate; fi" - continue - fi - tmux select-pane -t $p - p=$((p+1)) + tmux new-session -d -s tcons.$$ -x 800 -y 800 "rcons $i;if [ \`date +%s\` -lt $qdate ]; then echo Press enter to close; read qdate; fi" + continue + fi + tmux select-pane -t $p + p=$((p+1)) qdate=$((`date +%s`+5)) tmux split -h "rcons $i;if [ \`date +%s\` -lt $qdate ]; then echo Press enter to close; read qdate; fi" tmux select-layout tiled -done +done tmux select-pane -t 0 -tmux attach -t tcons.$$ +tmux attach -t tcons.$$ From 3f85add4a630f01da0a1415d136f744ff383d8e4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0817/1681] Remove trailing spaces in file xCAT-client/bin/verifynode --- xCAT-client/bin/verifynode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/bin/verifynode b/xCAT-client/bin/verifynode index b031ba968..cf8d51ae3 100644 --- a/xCAT-client/bin/verifynode +++ b/xCAT-client/bin/verifynode @@ -3022,4 +3022,4 @@ if ( $needToFinishLogFile ) { finishLogFile(); } -exit $rc; \ No newline at end of file +exit $rc; From a3a169ba4d3f376bcc0b9043d19e59a4d4bf771e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0818/1681] Remove trailing spaces in file xCAT-client/bin/xcatchroot --- xCAT-client/bin/xcatchroot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xCAT-client/bin/xcatchroot b/xCAT-client/bin/xcatchroot index fb2c755e2..694fd4c9b 100755 --- a/xCAT-client/bin/xcatchroot +++ b/xCAT-client/bin/xcatchroot @@ -3,16 +3,16 @@ #(C)IBM Corp ################################################################ # Usage: -# xcatchroot -h +# xcatchroot -h # xcatchroot [-v] -i osimage cmd_string # # # WARNING: -# Be very careful when using this script!!! Make sure you are +# Be very careful when using this script!!! Make sure you are # very clear about exactly what you are changing and what effect # it will have. # -# As a precaution it is advisable to make a copy of the original +# As a precaution it is advisable to make a copy of the original # spot in case your changes wind up corrupting the image. # # Note: @@ -24,18 +24,18 @@ # modification. # # In the bosboot code, there is a check for the creation of a boot -# image; if the image creation is anything other than disk, the +# image; if the image creation is anything other than disk, the # odm values are not picked up. You will have to confirm that # the bosboot command in your spot has the check removed. # -# Edit the bosboot command contained in the spot (save a backup). +# Edit the bosboot command contained in the spot (save a backup). # (ex. "vi /usr/sbin/bosboot"). Search for # "zap it as". The next line checks to see if the # device prefix is "hdisk". Comment out the line and the # corresponding "fi" which ends the "if" statement. Now this # code will always execute. Save changes. # -# Note: Always run the NIM check operation after you are done updating +# Note: Always run the NIM check operation after you are done updating # your spot. # # nim -Fo check spotName @@ -95,7 +95,7 @@ do case ${z} in h) echo $usage - exit 0 + exit 0 ;; i) # xCAT osimage name @@ -177,10 +177,10 @@ if ${LSNIM} $spot >/dev/null ; then then echo "Running command: ${LSNIM} -a location $spotObj | ${AWK} '/location/ {print $3}'\n" fi - location=`${LSNIM} -a location $spotObj | ${AWK} '/location/ {print $3}'` + location=`${LSNIM} -a location $spotObj | ${AWK} '/location/ {print $3}'` else - echo "ERROR: Cannot use chroot with remote resources $spot." + echo "ERROR: Cannot use chroot with remote resources $spot." echo "xcatchroot: ERROR: Cannot use chroot with remote resources $spot." | logger -t xcat -p local4.err exit 1 fi From 456433e84b09cec24ba3824f96ca8793c4cd0367 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0819/1681] Remove trailing spaces in file xCAT-client/bin/zvmMsg --- xCAT-client/bin/zvmMsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/bin/zvmMsg b/xCAT-client/bin/zvmMsg index d7b451c26..b10df0486 100644 --- a/xCAT-client/bin/zvmMsg +++ b/xCAT-client/bin/zvmMsg @@ -110,4 +110,4 @@ if ( $group eq '' ) { } FINISH: -exit; \ No newline at end of file +exit; From 70709eb28135fe2cbd0d49a3a11c47ff1bb72930 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0820/1681] Remove trailing spaces in file xCAT-client/bin/zxcatIVP.pl --- xCAT-client/bin/zxcatIVP.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/bin/zxcatIVP.pl b/xCAT-client/bin/zxcatIVP.pl index 5e1a79604..4a0d6a8b5 100644 --- a/xCAT-client/bin/zxcatIVP.pl +++ b/xCAT-client/bin/zxcatIVP.pl @@ -1130,7 +1130,7 @@ sub hexDecode { =head3 logTest - Description : Log the start and result of a test. + Description : Log the start and result of a test. Failures are added to syslog and printed as script output. Arguments : Status of the test: bypassed: Bypassed a test (STDOUT, optionally SYSLOGged) @@ -1331,7 +1331,7 @@ sub setOverrides{ # Don't specify the same option on both the command line and in the environment variable. if ( defined $glob_moreCmdOps ) { $glob_moreCmdOps =~ hexDecode( $glob_moreCmdOps ); - ($rc, $unrecognizedOps) = GetOptionsFromString( + ($rc, $unrecognizedOps) = GetOptionsFromString( $glob_moreCmdOps, 'bypassMsg=s' => \$cmdOp_bypassMsg, 'cNAddress=s' => \$cmdOp_cNAddress, From 6b46661e0491100bcc8685c799b961b893be0d99 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0821/1681] Remove trailing spaces in file xCAT-client/debian/copyright --- xCAT-client/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/debian/copyright b/xCAT-client/debian/copyright index 2926a3f87..a52f21f06 100644 --- a/xCAT-client/debian/copyright +++ b/xCAT-client/debian/copyright @@ -94,4 +94,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - + From 2170134b7f966261bbd48ecf3738c66701f57c6f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0822/1681] Remove trailing spaces in file xCAT-client/debian/postrm --- xCAT-client/debian/postrm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/debian/postrm b/xCAT-client/debian/postrm index 224d603dd..aaa4c1a20 100644 --- a/xCAT-client/debian/postrm +++ b/xCAT-client/debian/postrm @@ -22,7 +22,7 @@ set -e case "$1" in purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; - + remove) if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image rm /etc/profile.d/xcat.* From f2b8de244f8222b10e4a0e4e8dabbcf31bdeb829 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0823/1681] Remove trailing spaces in file xCAT-client/podchecker --- xCAT-client/podchecker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/podchecker b/xCAT-client/podchecker index 1b5fb6d29..b8b7f7b9f 100755 --- a/xCAT-client/podchecker +++ b/xCAT-client/podchecker @@ -68,7 +68,7 @@ POD files are ok. B returns the exit status 1 if at least one of the given POD files has syntax errors. -The status 2 indicates that at least one of the specified +The status 2 indicates that at least one of the specified files does not contain I POD commands. Status 1 overrides status 2. If you want unambiguous From be90edc9dd2e136c49569920b54b65b8815883f1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0824/1681] Remove trailing spaces in file xCAT-client/pods/man1/addkitcomp.1.pod --- xCAT-client/pods/man1/addkitcomp.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/addkitcomp.1.pod b/xCAT-client/pods/man1/addkitcomp.1.pod index 2d3bdfaf4..99b138700 100644 --- a/xCAT-client/pods/man1/addkitcomp.1.pod +++ b/xCAT-client/pods/man1/addkitcomp.1.pod @@ -17,7 +17,7 @@ B xCAT Kit support is ONLY available for Linux operating systems. =head1 OPTIONS =over 10 - + =item B<-a|--adddeps> Assign kitcomponent dependencies to the osimage. @@ -74,7 +74,7 @@ A comma-delimited list of valid full kit component names or kit component basena addkitcomp -a -i rhels6.2-ppc64-netboot-compute comp-test2-1.0-1-rhels-6.2-ppc64 -3. To add a kit component to osimage with incompatable osarch, osversion or ostype, use the -f (force) option: +3. To add a kit component to osimage with incompatable osarch, osversion or ostype, use the -f (force) option: addkitcomp -f -i rhels6.2-ppc64-netboot-compute comp-test1-1.0-1-rhels-6.2-ppc64 From 411890ed4d67dcbacd0510d93e8687a0da814e92 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0825/1681] Remove trailing spaces in file xCAT-client/pods/man1/bmcdiscover.1.pod --- xCAT-client/pods/man1/bmcdiscover.1.pod | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-client/pods/man1/bmcdiscover.1.pod b/xCAT-client/pods/man1/bmcdiscover.1.pod index 63d30b815..00d6d8170 100644 --- a/xCAT-client/pods/man1/bmcdiscover.1.pod +++ b/xCAT-client/pods/man1/bmcdiscover.1.pod @@ -13,47 +13,47 @@ B [B<--sn> I] [B<-s> I] [B<-u> I command will discover Baseboard Management Controllers (BMCs) using a scan method. +The B command will discover Baseboard Management Controllers (BMCs) using a scan method. -The command uses B to scan active nodes over a specified IP range. The IP range format should be a format that is acceptable by B. +The command uses B to scan active nodes over a specified IP range. The IP range format should be a format that is acceptable by B. The B command can also obtain some information about the BMC. (Check username/password, IP address source, DHCP/static configuration) -Note: The scan method currently support is B. +Note: The scan method currently support is B. =head1 OPTIONS =over 10 -=item B<--range> +=item B<--range> -Specify one or more IP ranges acceptable to nmap. IP range can be hostnames, IP addresses, networks, etc. A single IP address (10.1.2.3), several IPs with commas (10.1.2.3,10.1.2.10), Ip range with "-" (10.1.2.0-100) or an IP range (10.1.2.0/24) can be specified. If the range is very large, the B command may take a long time to return. +Specify one or more IP ranges acceptable to nmap. IP range can be hostnames, IP addresses, networks, etc. A single IP address (10.1.2.3), several IPs with commas (10.1.2.3,10.1.2.10), Ip range with "-" (10.1.2.0-100) or an IP range (10.1.2.0/24) can be specified. If the range is very large, the B command may take a long time to return. =item B<--sn> Specify one or more service nodes on which bmcdiscover will run. In hierarchical cluster, the MN may not be able to access the BMC of CN directly, but SN can. With this option, bmcdiscover will be dispatched to the specified SNs. Then, the nodename of the service node that 'bmcdiscover' is running on will be set to the 'servicenode' attribute of the discovered BMC node. -=item B<-s> +=item B<-s> Scan method (The only supported scan method at this time is B) -=item B<-z> +=item B<-z> List the data returned in xCAT stanza format -=item B<-w> +=item B<-w> Write to the xCAT database. -=item B<-i|--bmcip> +=item B<-i|--bmcip> BMC IP address. -=item B<-u|--bmcuser> +=item B<-u|--bmcuser> BMC user name. -=item B<-p|--bmcpasswd> +=item B<-p|--bmcpasswd> BMC user password. @@ -103,7 +103,7 @@ Output is similar to: 4. Discover the BMCs and write the discovered-node definitions into the xCAT database and write out the stanza foramt to the console: - bmcdiscover -s nmap --range "10.4.22-23.100-254" -w -z + bmcdiscover -s nmap --range "10.4.22-23.100-254" -w -z =head1 SEE ALSO From a30b7fc405220f78ea11ce0aa2fb67c0f6a62870 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0826/1681] Remove trailing spaces in file xCAT-client/pods/man1/cfgve.1.pod --- xCAT-client/pods/man1/cfgve.1.pod | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/xCAT-client/pods/man1/cfgve.1.pod b/xCAT-client/pods/man1/cfgve.1.pod index e2df6268f..c5e35a1ae 100644 --- a/xCAT-client/pods/man1/cfgve.1.pod +++ b/xCAT-client/pods/man1/cfgve.1.pod @@ -17,17 +17,17 @@ B B<-t tpl -m> I B<-o> I [B<-r>] =head1 DESCRIPTION -The B command can be used to configure a virtual environment for +The B command can be used to configure a virtual environment for 'Storage Domain', 'Network' and 'Template' objects. -The mandatory parameter B<-m> I is used to specify the address of the +The mandatory parameter B<-m> I is used to specify the address of the manager of virtual environment. xCAT needs it to access the RHEV manager. -The mandatory parameter B<-t> I is used to specify the type of the target +The mandatory parameter B<-t> I is used to specify the type of the target object. -Basically, B command supports five types of object: B, B, -B, B and B. +Basically, B command supports five types of object: B, B, +B, B and B. =over 3 @@ -35,7 +35,7 @@ B - The B and B operations are supported. B - The B and B operations are supported. -B - The B, B, B, B, +B - The B, B, B, B, B and B operations are supported. B - The B, B, B and B operations are supported. @@ -60,35 +60,35 @@ To detach the target object. =item B<-c> To create the target object. -For creating of B, the target storage domain will be created +For creating of B, the target storage domain will be created first, then attached to data center and activated. -The parameters that used to create the storage domain are gotten +The parameters that used to create the storage domain are gotten from 'virtsd' table. The detail parameters in the virtsd table: =over 3 B - The name of the storage domain. -B - The type of storage domain. Valid value: data, iso, export. +B - The type of storage domain. Valid value: data, iso, export. Default value is 'data'. B - The storage type. "nfs" or "localfs". -B - The location of the storage. -B: Format: [nfsserver:nfspath]. -The NFS export directory must be configured for read write access and must +B - The location of the storage. +B: Format: [nfsserver:nfspath]. +The NFS export directory must be configured for read write access and must be owned by vdsm:kvm. B: "/data/images/rhev" is set by default. -B - A host must be specified for a storage domain as SPM -(Storage Pool Manager) when initialize the storage domain. The role of SPM -may be migrated to other host by rhev-m during the running of the datacenter -(For example, when the current SPM encountered issue or going to maintenance +B - A host must be specified for a storage domain as SPM +(Storage Pool Manager) when initialize the storage domain. The role of SPM +may be migrated to other host by rhev-m during the running of the datacenter +(For example, when the current SPM encountered issue or going to maintenance status. -B - The storage will be attached to. 'Default' data center -is the default value. +B - The storage will be attached to. 'Default' data center +is the default value. =back @@ -96,7 +96,7 @@ is the default value. The name of data center. -Specify the 'Data Center' that will be used for the object to be attached to. +Specify the 'Data Center' that will be used for the object to be attached to. It is used by type. =item B<-f> @@ -120,11 +120,11 @@ Supported type: nfs; localfs. Specify the cluster for the network to attach to. -=item B<-m> I +=item B<-m> I -Specify the manager of the virtual environment. +Specify the manager of the virtual environment. -For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have +For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have to be specified. =item B<-n> I From 661dd64bbd911c525640181194fbb38d97879b31 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0827/1681] Remove trailing spaces in file xCAT-client/pods/man1/cfm2xcat.1.pod --- xCAT-client/pods/man1/cfm2xcat.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/cfm2xcat.1.pod b/xCAT-client/pods/man1/cfm2xcat.1.pod index 4680b2057..f5a6c71cf 100644 --- a/xCAT-client/pods/man1/cfm2xcat.1.pod +++ b/xCAT-client/pods/man1/cfm2xcat.1.pod @@ -1,21 +1,21 @@ =head1 NAME -B - Migrates the CFM setup in CSM to the xdcp rsync setup in xCAT. +B - Migrates the CFM setup in CSM to the xdcp rsync setup in xCAT. =head1 B B [B<-i> I] [B<-o> I] -B [B<-h>] +B [B<-h>] =head1 B -Copy the cfm2xcat command to the CSM Management Server. Run the command, indicating where you want your files saved with the -i and -o flags. They can be in the same directory. +Copy the cfm2xcat command to the CSM Management Server. Run the command, indicating where you want your files saved with the -i and -o flags. They can be in the same directory. The cfm2xcat command will run cfmupdatenode -a, saving the generated CFM distribution files in the directory indicates with (-i). From those distribution files, it will generate xdcp rsync input files (-F option on xdcp) in the directory indicated by ( -o). -Check the rsync files generated. There will be a file generated (rsyncfiles) from the input -o option on the command, and the same file with a (.nr) extension generated for each different noderange that will used to sync files based on your CFM setup in CSM. The rsyncfiles will contain the rsync file list. The rsyncfiles.nr will contain the noderange. If multiple noderanges then the file name (rsyncfiles) will be appended with a number. +Check the rsync files generated. There will be a file generated (rsyncfiles) from the input -o option on the command, and the same file with a (.nr) extension generated for each different noderange that will used to sync files based on your CFM setup in CSM. The rsyncfiles will contain the rsync file list. The rsyncfiles.nr will contain the noderange. If multiple noderanges then the file name (rsyncfiles) will be appended with a number. =head1 OPTIONS From 144b9168a9c6bc5bebdd40916c93e3cf2cc06dac Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0828/1681] Remove trailing spaces in file xCAT-client/pods/man1/chdef.1.pod --- xCAT-client/pods/man1/chdef.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/chdef.1.pod b/xCAT-client/pods/man1/chdef.1.pod index a5428d089..c3c36f542 100644 --- a/xCAT-client/pods/man1/chdef.1.pod +++ b/xCAT-client/pods/man1/chdef.1.pod @@ -6,7 +6,7 @@ B - Change xCAT data object definitions. B [B<-h>|B<--help>] [B<-t> I] -B [B<-t> I] [B<-o> I] [B<-n> I] [I] +B [B<-t> I] [B<-o> I] [B<-n> I] [I] B [B<-V>|B<--verbose>] [B<-t> I] [B<-o> I] [B<-d>|B<--dynamic>] [B<-p>|B<--plus>] [B<-m>|B<--minus>] [B<-z>|B<--stanza>] @@ -64,7 +64,7 @@ A set of comma delimited object types. Use the help option to get a list of val Verbose mode. -=item B<-w> I B<-w> I ... +=item B<-w> I B<-w> I ... Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. Use the help option to get a list of valid attributes for each object type. @@ -164,13 +164,13 @@ To change the node hwtype, this command will change the value of ppc.nodetype. To change the policy table for policy number 7.0 for admin1 - chdef -t policy -o 7.0 name=admin1 rule=allow + chdef -t policy -o 7.0 name=admin1 rule=allow =item 12. To change the node nic attributes - chdef -t node -o cn1 nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet" + chdef -t node -o cn1 nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet" =item 13. From f83d5e0a19af9c8308506eb447b272e50acefc13 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0829/1681] Remove trailing spaces in file xCAT-client/pods/man1/chhypervisor.1.pod --- xCAT-client/pods/man1/chhypervisor.1.pod | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/xCAT-client/pods/man1/chhypervisor.1.pod b/xCAT-client/pods/man1/chhypervisor.1.pod index 5c7802dd6..83025a9ba 100644 --- a/xCAT-client/pods/man1/chhypervisor.1.pod +++ b/xCAT-client/pods/man1/chhypervisor.1.pod @@ -52,10 +52,10 @@ B I [B<--smcli> I I] The B command can be used to configure the RHEV-h. -The rhev-h host will register to the rhev-m automatically, but admin needs to +The rhev-h host will register to the rhev-m automatically, but admin needs to approve the host can be added to the 'cluster' with B<-a> flag . -After registering, the network interfaces of host need to be added to the 'network' of +After registering, the network interfaces of host need to be added to the 'network' of RHEV. And the power management for the host should be configured so that rhev-m could make proper decision when certain host encountered error. @@ -75,8 +75,8 @@ B - The rhev manager (The FQDN of rhev-m server) for the host. B - The configuration for the nics. Refer to B<-n>. -B - The cluster that the host will be added to. The -default is 'Default' cluster if not specified. +B - The cluster that the host will be added to. The +default is 'Default' cluster if not specified. =back @@ -94,45 +94,45 @@ Before approve, the status of the host must be 'pending_approval'. =item B<-n> Configure the network interfaces for the host. -Note: This operation only can be run when host is in 'maintenance mode'. +Note: This operation only can be run when host is in 'maintenance mode'. Use B<-d> to switch the host to 'maintenance' mode. The interfaces which configured in hypervisor.interface will be added to the network of RHEV. The format of hypervisor.interface is multiple [network:interfacename: -protocol:IP:netmask:gateway] sections separated with '|'. For example: +protocol:IP:netmask:gateway] sections separated with '|'. For example: [rhevm2:eth0:static:10.1.0.236:255.255.255.0:0.0.0.0]. =over 2 -B - The logic network which has been created by 'cfgve -t nw' +B - The logic network which has been created by 'cfgve -t nw' or the default management network 'rhevm'. B - Physical network name: 'eth0','eth1'... -B - To identify which boot protocol to use for the interface: dhcp +B - To identify which boot protocol to use for the interface: dhcp or static. B - The IP address for the interface. B - The network mask for the interface. -B - The gateay for the interface. This field only can be set when -the interface is added to 'rhevm' network. +B - The gateay for the interface. This field only can be set when +the interface is added to 'rhevm' network. =back =item B<-p> Configure the power management for the host. -The power management must be configured for the rhev-h host to make the -rhev-m to monitor the power status of the host, so that when certain host +The power management must be configured for the rhev-h host to make the +rhev-m to monitor the power status of the host, so that when certain host failed to function, rhev-m will fail over certain role like SPM to other active host. -For rack mounted server, the bmc IP and user:password need to be set for the -power management (These parameters are gotten from ipmi table). rhev-m uses the -ipmi protocol to get the power status of the host. +For rack mounted server, the bmc IP and user:password need to be set for the +power management (These parameters are gotten from ipmi table). rhev-m uses the +ipmi protocol to get the power status of the host. =item B<-e> To activate the host. @@ -151,9 +151,9 @@ Display usage message. =item B<--adddisk2pool> I I I I -Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be -either: (4) Define region as full volume and add to group OR (5) Add existing -region to group. If the volume already exists in the EXTENT CONTROL, use +Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be +either: (4) Define region as full volume and add to group OR (5) Add existing +region to group. If the volume already exists in the EXTENT CONTROL, use function 5. If the volume does not exist in the EXTENT CONTROL, but is attached to SYSTEM, use function 4. @@ -171,15 +171,15 @@ Create a virtual switch. =item B<--addzfcp2pool> I I I I I I -Add a zFCP device to a device pool defined in xCAT. The device must have been -carved up in the storage controller and configured with a WWPN/LUN before it -can be added to the xCAT storage pool. z/VM does not have the ability to +Add a zFCP device to a device pool defined in xCAT. The device must have been +carved up in the storage controller and configured with a WWPN/LUN before it +can be added to the xCAT storage pool. z/VM does not have the ability to communicate directly with the storage controller to carve up disks dynamically. =item B<--removediskfrompool> I I I -Remove a disk from a disk pool defined in the EXTENT CONTROL. Function type can -be either: (1) Remove region, (2) Remove region from group, (3) Remove region +Remove a disk from a disk pool defined in the EXTENT CONTROL. Function type can +be either: (1) Remove region, (2) Remove region from group, (3) Remove region from all groups, OR (7) Remove entire group . =item B<--removescsi> I I @@ -200,11 +200,11 @@ Remove a zFCP device from a device pool defined in xCAT. =item B<--smcli> I I -Execute a SMAPI function. A list of APIs supported can be found by using the -help flag, e.g. chhypervisor pokdev61 --smcli -h. Specific arguments associated -with a SMAPI function can be found by using the help flag for the function, -e.g. chhypervisor pokdev61 --smcli Image_Query_DM -h. Only z/VM 6.2 and older -SMAPI functions are supported at this time. Additional SMAPI functions will be +Execute a SMAPI function. A list of APIs supported can be found by using the +help flag, e.g. chhypervisor pokdev61 --smcli -h. Specific arguments associated +with a SMAPI function can be found by using the help flag for the function, +e.g. chhypervisor pokdev61 --smcli Image_Query_DM -h. Only z/VM 6.2 and older +SMAPI functions are supported at this time. Additional SMAPI functions will be added in subsequent zHCP versions. =back @@ -256,22 +256,22 @@ To deactivate the host 'host1', enter: To add a disk to a disk pool defined in the EXTENT CONTROL, enter: chhypervisor pokdev61 --adddisk2pool 4 DM1234 DM1234 POOL1 - + =item 2. To add a zFCP device to a device pool defined in xCAT, enter: chhypervisor pokdev61 --addzfcp2pool zfcp1 free 500501234567C890 4012345600000000 8G - + =item 3. To remove a region from a group in the EXTENT CONTROL, enter: chhypervisor pokdev61 --removediskfrompool 2 DM1234 POOL1 - + =item 4. To remove a zFCP device from a device pool defined in xCAT, enter: chhypervisor pokdev61 --removezfcpfrompool zfcp1 4012345600000000 500501234567C890 - + =item 5. To execute a SMAPI function (Image_Query_DM), enter: From bfd798ffab0082448f61450b7a594d2c395c5a9a Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0830/1681] Remove trailing spaces in file xCAT-client/pods/man1/chkosimage.1.pod --- xCAT-client/pods/man1/chkosimage.1.pod | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xCAT-client/pods/man1/chkosimage.1.pod b/xCAT-client/pods/man1/chkosimage.1.pod index 92d72a84b..d050d2f9e 100644 --- a/xCAT-client/pods/man1/chkosimage.1.pod +++ b/xCAT-client/pods/man1/chkosimage.1.pod @@ -6,18 +6,18 @@ B - Use this xCAT command to check an xCAT osimage. B -B I +B I =head1 DESCRIPTION This command is currently supported for AIX osimages only. -Use this command to verify if the NIM lpp_source directories contain the +Use this command to verify if the NIM lpp_source directories contain the correct software. The lpp_source directory must contain all the software -that is specified in the "installp_bundle" and "otherpkgs" -attributes of the osimage definition. +that is specified in the "installp_bundle" and "otherpkgs" +attributes of the osimage definition. -The command gets the name of the lpp_source resource from the xCAT osimage +The command gets the name of the lpp_source resource from the xCAT osimage definition and the location of the lpp_source directory from the NIM resource definition. @@ -27,16 +27,16 @@ Note: Remember to use the prefixes, "I:", "R:", and "E:", respectively, when specifying package names in an installp_bundle file or an otherpkgs list. In addition to checking for missing software the chkosimage command will -also check to see if there are multiple matches. This could happen +also check to see if there are multiple matches. This could happen when you use wildcards in the software file names. For example, if you -have perl-xCAT* in a bundle file it could match multiple versions of the xCAT +have perl-xCAT* in a bundle file it could match multiple versions of the xCAT rpm package saved in your lpp_source directory. If this happens you must remove the unwanted versions of the rpms. If the extra rpms are not removed you will get install errors. -To help with this process you can use the "-c|--clean" option. This -option will keep the rpm package with the most recent timestamp and +To help with this process you can use the "-c|--clean" option. This +option will keep the rpm package with the most recent timestamp and remove the others. The chkosimage command should always be used to verify the lpp_source content @@ -57,7 +57,7 @@ Display usage message. =item I -The name of the xCAT for AIX osimage definition. +The name of the xCAT for AIX osimage definition. =item B<-V |--verbose> @@ -82,7 +82,7 @@ An error has occurred. =over 3 =item 1. -Check the XCAT osimage called "61image" to verify that the lpp_source +Check the XCAT osimage called "61image" to verify that the lpp_source directories contain all the software that is specified in the "installp_bundle" and "otherpkgs" attributes. From 56ffbfdb4d8b24dd73040fee79b23ad10ff6fe7e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0831/1681] Remove trailing spaces in file xCAT-client/pods/man1/chvm.1.pod --- xCAT-client/pods/man1/chvm.1.pod | 82 ++++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/xCAT-client/pods/man1/chvm.1.pod b/xCAT-client/pods/man1/chvm.1.pod index f1ac27855..52331a325 100644 --- a/xCAT-client/pods/man1/chvm.1.pod +++ b/xCAT-client/pods/man1/chvm.1.pod @@ -31,11 +31,11 @@ B I [B<--cpupin> I] B I [B<--membind> I] -B I [B<--devpassthru> I...] +B I [B<--devpassthru> I...] + +B I [B<--devdetach> I...] -B I [B<--devdetach> I...] - =head2 VMware/KVM specific: B I [B<-a> I] [B<-d> I] [B<-p> I] [B<--resize> I=I] [B<--cpus> I] [B<--mem> I] @@ -106,7 +106,7 @@ B I [B<--undedicatedevice> I] =head2 PPC (with HMC) specific: -The chvm command modifies the partition profile for the partitions specified in noderange. A partitions current profile can be read using lsvm, modified, and piped into the chvm command, or changed with the -p flag. +The chvm command modifies the partition profile for the partitions specified in noderange. A partitions current profile can be read using lsvm, modified, and piped into the chvm command, or changed with the -p flag. This command also supports to change specific partition attributes by specifying one or more "attribute equals value" pairs in command line directly, without whole partition profile. @@ -114,15 +114,15 @@ This command also supports to change specific partition attributes by specifying For Power 755(use option I<--p775> to specify): -chvm could be used to change the octant configuration values for generating LPARs. chvm is designed to set the Octant configure value to split the CPU and memory for partitions, and set Octant Memory interleaving value. The chvm will only set the pending attributes value. After chvm, the CEC needs to be rebooted manually for the pending values to be enabled. Before reboot the cec, the administrator can use chvm to change the partition plan. If the partition needs I/O slots, the administrator should use chvm to assign the I/O slots. +chvm could be used to change the octant configuration values for generating LPARs. chvm is designed to set the Octant configure value to split the CPU and memory for partitions, and set Octant Memory interleaving value. The chvm will only set the pending attributes value. After chvm, the CEC needs to be rebooted manually for the pending values to be enabled. Before reboot the cec, the administrator can use chvm to change the partition plan. If the partition needs I/O slots, the administrator should use chvm to assign the I/O slots. -chvm is also designed to assign the I/O slots to the new LPAR. Both the current IO owning lpar and the new IO owning lpar must be powered off before an IO assignment. Otherwise, if the I/O slot is belonged to an Lpar and the LPAR is power on, the command will return an error when trying to assign that slot to a different lpar. +chvm is also designed to assign the I/O slots to the new LPAR. Both the current IO owning lpar and the new IO owning lpar must be powered off before an IO assignment. Otherwise, if the I/O slot is belonged to an Lpar and the LPAR is power on, the command will return an error when trying to assign that slot to a different lpar. The administrator should use lsvm to get the profile content, and then edit the content, and add the node name with ":" manually before the I/O which will be assigned to the node. And then the profile can be piped into the chvm command, or changed with the -p flag. For normal power machine: -chvm could be used to modify the resources assigned to partitions. The admin shall specify the attributes with options I, I, I, I, I and/or I. If nothing specified, nothing will be returned. +chvm could be used to modify the resources assigned to partitions. The admin shall specify the attributes with options I, I, I, I, I and/or I. If nothing specified, nothing will be returned. =head2 zVM specific: @@ -175,13 +175,13 @@ Specify the operation is for Power 775 machines. Starting numeric id of the newly created partitions. For Power 775 using Direct FSP Management, the id value only could be B<1>, B<5>, B<9>, B<13>, B<17>, B<21>, B<25> and B<29>. Shall work with option B<--p775>. -=item B<-m> +=item B<-m> memory interleaving. The setting value only could be B<1> or B<2>. B<2> means B mode (also 2MC mode), the memory cannot be shared across the processors in an octant. B<1> means B mode (also 8MC mode) , the memory can be shared. The default value is B<1>. Shall work with option B<--p775>. -=item B<-r> +=item B<-r> -partition rule. Shall work with option B<--p775>. +partition rule. Shall work with option B<--p775>. If all the octants configuration value are same in one CEC, it will be " B<-r> B<0-7>:I" . @@ -201,7 +201,7 @@ Name of I/O slots assignment profile. Shall work with option B<--p775>. =item B={B<*>|B} -Set LPAR name for the specified lpars. If '*' specified, it means to get names from xCAT database and then set them for the specified lpars. If a string is specified, it only supports single node and the string will be set for the specified lpar. The user can use lsvm to check the lparnames for lpars. +Set LPAR name for the specified lpars. If '*' specified, it means to get names from xCAT database and then set them for the specified lpars. If a string is specified, it only supports single node and the string will be set for the specified lpar. The user can use lsvm to check the lparnames for lpars. =item B B B B @@ -209,7 +209,7 @@ To specify the parameters that will be modified. =item B B [B<--vios>] -To create new virtual adapter for the specified node. +To create new virtual adapter for the specified node. =item B @@ -262,26 +262,26 @@ Change the size of the Hard disk. The disk in I format can not be set to To pin guest domain virtual CPUs to physical host CPUs specified with I. I is a list of physical CPU numbers. Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and -the '^' denotes exclusive. +the '^' denotes exclusive. Note: The expression is sequentially evaluated, so "0-15,^8" is identical to "9-14,0-7,15" but not identical to "^8,0-15". =item B<--membind numanodeset> -It is possible to restrict a guest to allocate memory from the specified set of NUMA nodes I. +It is possible to restrict a guest to allocate memory from the specified set of NUMA nodes I. If the guest vCPUs are also pinned to a set of cores located on that same set of NUMA nodes, memory access is local and improves memory access performance. =item B<--devpassthru pcidevice1,pcidevice2...> -The PCI passthrough gives a guest VM direct access to I/O devices I. +The PCI passthrough gives a guest VM direct access to I/O devices I. The PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively. -The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running B on the host. +The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running B on the host. =item B<--devdetach pcidevice1,pcidevice2...> -To detaching the PCI devices which are attached to VM guest via PCI passthrough from the VM guest. The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running B on the host. +To detaching the PCI devices which are attached to VM guest via PCI passthrough from the VM guest. The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running B on the host. =back @@ -328,12 +328,12 @@ Adds a v-disk to a virtual machine's directory entry. =item B<--addzfcp> I I I I I I I -Add a zFCP device to a device pool defined in xCAT. The device must have been -carved up in the storage controller and configured with a WWPN/LUN before it can -be added to the xCAT storage pool. z/VM does not have the ability to communicate -directly with the storage controller to carve up disks dynamically. xCAT will -find the a zFCP device in the specified pool that meets the size required, if -the WWPN and LUN are not given. The device address can be automatically assigned +Add a zFCP device to a device pool defined in xCAT. The device must have been +carved up in the storage controller and configured with a WWPN/LUN before it can +be added to the xCAT storage pool. z/VM does not have the ability to communicate +directly with the storage controller to carve up disks dynamically. xCAT will +find the a zFCP device in the specified pool that meets the size required, if +the WWPN and LUN are not given. The device address can be automatically assigned by specifying 'auto'. The WWPN/LUN can be set as the LOADDEV in the directory entry if (1) is specified as the 'loaddev'. @@ -451,7 +451,7 @@ Output is similar to: =head2 PPC (using Direct FSP Management) specific: -1. For Power 775, to create a new partition lpar1 on the first octant of the cec cec01, lpar1 will use all the cpu and memory of the octant 0, enter: +1. For Power 775, to create a new partition lpar1 on the first octant of the cec cec01, lpar1 will use all the cpu and memory of the octant 0, enter: mkdef -t node -o lpar1 mgt=fsp groups=all parent=cec01 nodetype=lpar hcp=cec01 @@ -492,7 +492,7 @@ then: chvm lpar1-lpar9 --p775 -i 1 -m 1 -r 0:5,1-7:1 -Output is similar to: +Output is similar to: lpar1: Success lpar2: Success @@ -526,7 +526,7 @@ then run the command: Output is similar to: lpar1: Success - + 7. For Normal Power machine, to modify the resource assigned to a partition: Before modify, the resource assigned to node 'lpar1' can be shown with: @@ -553,8 +553,8 @@ To modify the resource assignment: chvm lpar1 vmcpus=1/2/16 vmmemory=1G/8G/32G add_physlots=0x21010202 The output is similar to: - - lpar1: Success + + lpar1: Success The resource information after modification is similar to: @@ -572,7 +572,7 @@ The resource information after modification is similar to: lpar1: 1/2/2 lpar1: 128. -Note: The physical I/O resources specified with I will be appended to the specified partition. The physical I/O resources which are not specified but belonged to the partition will not be removed. For more information about I, refer to L. +Note: The physical I/O resources specified with I will be appended to the specified partition. The physical I/O resources which are not specified but belonged to the partition will not be removed. For more information about I, refer to L. =head2 VMware/KVM specific: @@ -587,31 +587,31 @@ Output is similar to: 1. To adds a 3390 (ECKD) disk to a virtual machine's directory entry: chvm gpok3 --add3390 POOL1 0101 2G MR - + Output is similar to: - + gpok3: Adding disk 0101 to LNX3... Done - + 2. To add a network adapter to a virtual machine's directory entry: chvm gpok3 --addnic 0600 QDIO 3 - + Output is similar to: - + gpok3: Adding NIC 0900 to LNX3... Done 3. To connects a given network adapter to a GuestLAN: chvm gpok3 --connectnic2guestlan 0600 GLAN1 LN1OWNR - + Output is similar to: - + gpok3: Connecting NIC 0600 to GuestLan GLAN1 on LN1OWNR... Done - + 4. To connects a given network adapter to a vSwitch: - + chvm gpok3 --connectnic2vswitch 0600 VSW1 - + Output is similar to: gpok3: Connecting NIC 0600 to vSwitch VSW1 on LNX3... Done @@ -619,7 +619,7 @@ Output is similar to: 5. To removes a minidisk from a virtual machine's directory entry: chvm gpok3 --removedisk 0101 - + Output is similar to: gpok3: Removing disk 0101 on LNX3... Done @@ -627,7 +627,7 @@ Output is similar to: 6. To Removes a network adapter from a virtual machine's directory entry: chvm gpok3 --removenic 0700 - + Output is similar to: gpok3: Removing NIC 0700 on LNX3... Done From c57e923be85db1b6397acd0e73a5e5c62c72361f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0832/1681] Remove trailing spaces in file xCAT-client/pods/man1/chzone.1.pod --- xCAT-client/pods/man1/chzone.1.pod | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/xCAT-client/pods/man1/chzone.1.pod b/xCAT-client/pods/man1/chzone.1.pod index 4a7fbe4bd..4ac96916d 100644 --- a/xCAT-client/pods/man1/chzone.1.pod +++ b/xCAT-client/pods/man1/chzone.1.pod @@ -1,10 +1,10 @@ =head1 B -B - Changes a zone defined in the cluster. +B - Changes a zone defined in the cluster. =head1 B -B I [B<--defaultzone>] B<[-K]> [B<-k> I] [B<-a> I | B<-r> I] [B<-g>] [B<-f>] [B<-s> B<{yes|no}>] [B<-V>] +B I [B<--defaultzone>] B<[-K]> [B<-k> I] [B<-a> I | B<-r> I] [B<-g>] [B<-f>] [B<-s> B<{yes|no}>] [B<-V>] B [B<-h> | B<-v>] @@ -13,20 +13,20 @@ B [B<-h> | B<-v>] The B command is designed to change the definition of a zone previous defined in the cluster. The chzone command is only supported on Linux ( No AIX support). -The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. +The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. =head1 B =over 5 -=item B<-h>|B<--help> +=item B<-h>|B<--help> -Displays usage information. +Displays usage information. -=item B<-v>|B<--version> +=item B<-v>|B<--version> -Displays command version and build date. +Displays command version and build date. =item B<-k | --sshkeypath> I @@ -42,7 +42,7 @@ The nodes are not automatically updated with the new root ssh keys by chzone. Yo if B<--defaultzone> is input, then it will set the zone defaultzone attribute to yes. if B<--defaultzone> is input and another zone is currently the default, then the B<-f> flag must be used to force a change to the new defaultzone. -If B<-f> flag is not use an error will be returned and no change made. +If B<-f> flag is not use an error will be returned and no change made. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. =item B<-a | --addnoderange> I @@ -61,13 +61,13 @@ it will remove the group name "zonename" from each node in the noderange. =item B<-s| --sshbetweennodes> B -If -s entered, the zone sshbetweennodes attribute will be set to yes or no based on the input. When this is set to yes, then ssh will be setup to allow passwordless root access between nodes. If no, then root will be prompted for a password when running ssh between the nodes in the zone. +If -s entered, the zone sshbetweennodes attribute will be set to yes or no based on the input. When this is set to yes, then ssh will be setup to allow passwordless root access between nodes. If no, then root will be prompted for a password when running ssh between the nodes in the zone. -=item B<-f | --force> +=item B<-f | --force> Used with the B<--defaultzone> flag to override the current default zone. -=item B<-g | --assigngroup> +=item B<-g | --assigngroup> Used with the B<-a> or B<-r> flag to add or remove the group zonename for all nodes in the input noderange. @@ -93,14 +93,14 @@ To generate new root ssh keys for zone2A using the ssh id_rsa private key in /ro chzone zone2A -k /root/.ssh -Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys +Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys =item 3. To generate new root ssh keys for zone2A, enter : - chzone zone2A -K + chzone zone2A -K -Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys +Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys =item 4. To add a new group of nodes (compute3) to zone3 and add zone3 group to the nodes, enter: @@ -116,7 +116,7 @@ To remove a group of nodes (compute4) from zone4 and remove zone4 group from the =item 6. To change the sshbetweennodes setting on the zone to not allow passwordless ssh between nodes, enter: - chzone zone5 -s no + chzone zone5 -s no Note: you must use B or B to update the nodes with this new setting. From 5d354b5cd780dc4d7780c27bb6a30bf9c1b351cf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0833/1681] Remove trailing spaces in file xCAT-client/pods/man1/clonevm.1.pod --- xCAT-client/pods/man1/clonevm.1.pod | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-client/pods/man1/clonevm.1.pod b/xCAT-client/pods/man1/clonevm.1.pod index 81de9c85e..cf026fda4 100644 --- a/xCAT-client/pods/man1/clonevm.1.pod +++ b/xCAT-client/pods/man1/clonevm.1.pod @@ -8,19 +8,19 @@ B I [ B<-t> I | B<-b> I argument will request that a master be made of the VM anyway. -Also, by default a VM that is used to create a master will be rebased as a thin +Also, by default a VM that is used to create a master will be rebased as a thin clone of that master. If the B<--force> argument is used to create a master of a powered -on vm, this will not be done. Additionally, the B<--detached> option can be used to -explicitly request that a clone not be tethered to a master image, allowing the +on vm, this will not be done. Additionally, the B<--detached> option can be used to +explicitly request that a clone not be tethered to a master image, allowing the clones to not be tied to the health of a master, at the cost of additional storage. -When promoting a VM's current state to master, all related virtual disks will be +When promoting a VM's current state to master, all related virtual disks will be copied and merged with any prerequisite images. A master will not be tethered to other masters. From 2df8e8e1de3542c66cc95f88704b279d03b57340 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0834/1681] Remove trailing spaces in file xCAT-client/pods/man1/configfpc.1.pod --- xCAT-client/pods/man1/configfpc.1.pod | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-client/pods/man1/configfpc.1.pod b/xCAT-client/pods/man1/configfpc.1.pod index 10ab7944b..1c4396e93 100644 --- a/xCAT-client/pods/man1/configfpc.1.pod +++ b/xCAT-client/pods/man1/configfpc.1.pod @@ -8,7 +8,7 @@ B B<-i> I B B<-i> I B<--ip> I -B [B<-V>|B<--verbose>] +B [B<-V>|B<--verbose>] B [B<-h>|B<--help>|B<-?>] @@ -22,9 +22,9 @@ There are several bits of information that must be included in the xCAT database You must create the FPC node definitions for all FPCs being discovered including the IP address and switch port information. -The B command discovers the FPCs and collects the MAC address. The MAC address is used to relate the FPC to a FPC node using the switch information for this MAC. Once the relationship is discovered the FPC is configured with the FPC node IP settings. +The B command discovers the FPCs and collects the MAC address. The MAC address is used to relate the FPC to a FPC node using the switch information for this MAC. Once the relationship is discovered the FPC is configured with the FPC node IP settings. -This process is repeated until no more FPCs are discovered. +This process is repeated until no more FPCs are discovered. For more information on xCAT support of NeXtScale and configfpc see the following doc: XCAT_NeXtScale_Clusters @@ -35,11 +35,11 @@ XCAT_NeXtScale_Clusters =item B<-i> I -Use this flag to specify which xCAT MN interface (example: eth4) that is connected to the NeXtScale FPCs. This option is required. +Use this flag to specify which xCAT MN interface (example: eth4) that is connected to the NeXtScale FPCs. This option is required. =item B<--ip> I -Use this flag to override the default ip address of 192.168.0.100 with a new address. +Use this flag to override the default ip address of 192.168.0.100 with a new address. =item B<-V>|B<--verbose> @@ -52,12 +52,12 @@ Verbose mode =over 6 =item 1. -To discover and configure all NeXtScale Fan Power Controllers (FPCs) connected on eth0 interface. +To discover and configure all NeXtScale Fan Power Controllers (FPCs) connected on eth0 interface. configfpc -i eth0 =item 2. -To override the default ip address and run in Verbose mode. +To override the default ip address and run in Verbose mode. configfpc -i eth0 --ip 196.68.0.100 -V From 2d28c9c314487748625952eaa3cbde58de200d66 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0835/1681] Remove trailing spaces in file xCAT-client/pods/man1/csm2xcat.1.pod --- xCAT-client/pods/man1/csm2xcat.1.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-client/pods/man1/csm2xcat.1.pod b/xCAT-client/pods/man1/csm2xcat.1.pod index dffc47c79..34ba5313b 100644 --- a/xCAT-client/pods/man1/csm2xcat.1.pod +++ b/xCAT-client/pods/man1/csm2xcat.1.pod @@ -1,17 +1,17 @@ =head1 NAME -B - Allows the migration of a CSM database to an xCAT database. +B - Allows the migration of a CSM database to an xCAT database. =head1 SYNOPSIS B [B<--dir> I] -B [B<-h>] +B [B<-h>] =head1 DESCRIPTION -The csm2xcat command must be run on the Management Server of the CSM system that you want to migrate to xCAT. The command will build two xCAT stanza files that can update the xCAT database with the chdef command. +The csm2xcat command must be run on the Management Server of the CSM system that you want to migrate to xCAT. The command will build two xCAT stanza files that can update the xCAT database with the chdef command. Copy the csm2xcat command to the CSM Management Server. Run the command, indicating where you want your stanza files saved with the B<--dir> parameter. Check the stanza files to see if the information is what you want put in the xCAT database. Copy the two stanza files: node.stanza, device.stanza back to your xCAT Management node, and run the chdef command to input into the xCAT database. From 2fd7bbb9ca566fefcb405aa5b78c4865894d22f7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0836/1681] Remove trailing spaces in file xCAT-client/pods/man1/db2sqlsetup.1.pod --- xCAT-client/pods/man1/db2sqlsetup.1.pod | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xCAT-client/pods/man1/db2sqlsetup.1.pod b/xCAT-client/pods/man1/db2sqlsetup.1.pod index 8d9e9f059..67f6a1d41 100644 --- a/xCAT-client/pods/man1/db2sqlsetup.1.pod +++ b/xCAT-client/pods/man1/db2sqlsetup.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Sets up the IBM DB2 for xCAT to use. +B - Sets up the IBM DB2 for xCAT to use. =head1 SYNOPSIS @@ -13,26 +13,26 @@ B [B<-i>|B<--init>] {B<-S> | B<-C>} [B<-o>|B<--setupODBC>] [B<-V>|B B [B<-i>|B<--init>] {B<-S>} [B<-N>|B<--nostart>] [B<-o>|B<--setupODBC>] [B<-V>|B<--verbose>] -B [B<-o>|B<--setupODBC>] {B<-S> | B<-C>} [B<-V>|B<--verbose>] +B [B<-o>|B<--setupODBC>] {B<-S> | B<-C>} [B<-V>|B<--verbose>] B [B<-p>|B<--passwd>] [B<-S> | B<-C>] =head1 DESCRIPTION B - Sets up the IBM DB2 database for xCAT to use. The db2sqlsetup script is run on the Management Node, after the DB2 Server code has been installed, to setup the DB2 Server (-S). -The xcatd daemon will be stopped during migration on the MN. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to DB2 and restarting the xcatd daemon. +The xcatd daemon will be stopped during migration on the MN. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to DB2 and restarting the xcatd daemon. -The db2sqlsetup script must be run on each Service Node, after the DB2 Client code has been installed, to setup the DB2 Client (-C). There are two postscripts that are provided ( db2install and odbcsetup) that will automatically setup you Service Node as a DB2 client. +The db2sqlsetup script must be run on each Service Node, after the DB2 Client code has been installed, to setup the DB2 Client (-C). There are two postscripts that are provided ( db2install and odbcsetup) that will automatically setup you Service Node as a DB2 client. For full information on the setup of DB2, see Setting_Up_DB2_as_the_xCAT_DB. When running of db2sqlsetup on the MN: One password must be supplied for the setup, a password for the xcatdb unix id which will be used as the DB2 instance id and database name. The password will be prompted for interactively or can be input with the XCATDB2PW environment variable. The script will create the xcat database instance (xcatdb) in the /var/lib/db2 directory unless overridden by setting the site.databaseloc attribute. This attribute should not be set to the directory that is defined in the installloc attribute and it is recommended that the databaseloc be a new filesystem dedicated to the DB2 database, especially in very large clusters. - -When running db2sqlseutp on the SN: -Not only will the password for the DB2 instance Id be prompted for and must match the one on the Management Node; but also the hostname or ip address of the Management Node as known by the Service Node must be supplied , unless the XCATDB2SERVER environment variable is set. -You can automatically install and setup of DB2 on the SN using the db2install and odbcsetup postscripts and not need to manually run the command. See the full documentation. + +When running db2sqlseutp on the SN: +Not only will the password for the DB2 instance Id be prompted for and must match the one on the Management Node; but also the hostname or ip address of the Management Node as known by the Service Node must be supplied , unless the XCATDB2SERVER environment variable is set. +You can automatically install and setup of DB2 on the SN using the db2install and odbcsetup postscripts and not need to manually run the command. See the full documentation. Note: On AIX , root must be running ksh and on Linux, bash shell. @@ -54,11 +54,11 @@ Displays verbose messages. =item B<-i|--init> -The init option is used to setup an installed DB2 database on AIX or Linux (p-Series) so that xCAT can use the database. This must be combined with either the -S or -C flag to indicate whether we are setting up the Server or the Client. With the -S flag, it involves creating the xcatdb database, the xcatdb instance id, allowing access to the xcatdb database by the Management Node. It also backs up the current xCAT database and restores it into the newly setup xcatdb DB2 database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the DB2 database and restarts the xcatd daemon using the database. +The init option is used to setup an installed DB2 database on AIX or Linux (p-Series) so that xCAT can use the database. This must be combined with either the -S or -C flag to indicate whether we are setting up the Server or the Client. With the -S flag, it involves creating the xcatdb database, the xcatdb instance id, allowing access to the xcatdb database by the Management Node. It also backs up the current xCAT database and restores it into the newly setup xcatdb DB2 database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the DB2 database and restarts the xcatd daemon using the database. =item B<-p|--passwd> -The password change option is to change the database access password for the DB2 xcatdb database. If -S is input then it will only change the password on the DB2 Server (MN). If -C is input it will only change on the DB2 clients (SN). If neither -S or -C are input with this flag, then it will change both the DB2 Server and Clients. When changing the password the xcatd daemon will be stopped and restarted. Any other tools accessing the database should also be stopped before changing and restarted after changing. +The password change option is to change the database access password for the DB2 xcatdb database. If -S is input then it will only change the password on the DB2 Server (MN). If -C is input it will only change on the DB2 clients (SN). If neither -S or -C are input with this flag, then it will change both the DB2 Server and Clients. When changing the password the xcatd daemon will be stopped and restarted. Any other tools accessing the database should also be stopped before changing and restarted after changing. =item B<-S|-C> @@ -67,7 +67,7 @@ This options says whether to setup the Server (-S) on the Management Node, or th =item B<-N|--nostart> -This option with the -S flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database. This can be used to setup the xCAT DB2 database during or before install. +This option with the -S flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database. This can be used to setup the xCAT DB2 database during or before install. =item B<-o|--setupODBC> From a310fc17064f11d908235d91d9881ec6ebadc544 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0837/1681] Remove trailing spaces in file xCAT-client/pods/man1/dumpxCATdb.1.pod --- xCAT-client/pods/man1/dumpxCATdb.1.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-client/pods/man1/dumpxCATdb.1.pod b/xCAT-client/pods/man1/dumpxCATdb.1.pod index fbdf7e392..62730dbde 100644 --- a/xCAT-client/pods/man1/dumpxCATdb.1.pod +++ b/xCAT-client/pods/man1/dumpxCATdb.1.pod @@ -15,9 +15,9 @@ B [B<-h>|B<--help>] [B<-v>|B<--version>] If not using the binary dump option (-b), then the dumpxCATdb command creates .csv files for xCAT database tables and puts them in the directory given by the -p flag. These files can be used by the restorexCATdb command to restore the database. The command will read the list of tables in the site.skiptables attribute and not backup those tables. Supports using XCAT_SKIPTABLES env variable to provide a list of skip tables. -The command will never backup TEAL or ISNM tables, except isnm_config. To dump TEAL tables use the documented process for TEAL. For ISNM use tabdump, after using tabprune to get to prune unnecessary records. +The command will never backup TEAL or ISNM tables, except isnm_config. To dump TEAL tables use the documented process for TEAL. For ISNM use tabdump, after using tabprune to get to prune unnecessary records. -If using the binary dump option for the DB2 or postgreSQL database, then the routine will use the Database provide utilities for backup of the entire database. +If using the binary dump option for the DB2 or postgreSQL database, then the routine will use the Database provide utilities for backup of the entire database. =head1 OPTIONS @@ -30,7 +30,7 @@ B<-V> Verbose. B<-a> All, without this flag the eventlog and auditlog will be skipped. -B<-b> This flag is only used for the DB2 or postgreSQL database. The routine will use the database backup utilities to create a binary backup of the entire database. Note to use this backup on DB2, you will have first had to modify the logging of the database and have taken an offline initial backup. Refer to the xCAT DB2 documentation for more instructions. +B<-b> This flag is only used for the DB2 or postgreSQL database. The routine will use the database backup utilities to create a binary backup of the entire database. Note to use this backup on DB2, you will have first had to modify the logging of the database and have taken an offline initial backup. Refer to the xCAT DB2 documentation for more instructions. B<-p> Path to the directory to dump the database. It will be created, if it does not exist. From 68f700e46e95d9daf30ae624554352aefca9084c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0838/1681] Remove trailing spaces in file xCAT-client/pods/man1/genimage.1.pod --- xCAT-client/pods/man1/genimage.1.pod | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-client/pods/man1/genimage.1.pod b/xCAT-client/pods/man1/genimage.1.pod index bc4f09d8b..56dfb2af1 100644 --- a/xCAT-client/pods/man1/genimage.1.pod +++ b/xCAT-client/pods/man1/genimage.1.pod @@ -14,7 +14,7 @@ B [B<-h> | B<--help> | B<-v> | B<--version>] =head1 DESCRIPTION -Generates a stateless and a statelite image that can be used to boot xCAT nodes in a diskless mode. +Generates a stateless and a statelite image that can be used to boot xCAT nodes in a diskless mode. genimage will use the osimage definition for information to generate this image. Additional options specified on the command line will override any corresponding previous osimage settings, and will be written back to the osimage definition. @@ -29,7 +29,7 @@ for stateless: B for statelite: B -Besides prompting for some parameter values, the B command takes default guesses for the parameters not specified or not defined in the I and I tables. It also assumes default answers for questions from the yum/zypper command when installing rpms into the image. Use B<--interactive> flag if you want the yum/zypper command to prompt you for the answers. +Besides prompting for some parameter values, the B command takes default guesses for the parameters not specified or not defined in the I and I tables. It also assumes default answers for questions from the yum/zypper command when installing rpms into the image. Use B<--interactive> flag if you want the yum/zypper command to prompt you for the answers. If B<--onlyinitrd> is specified, genimage only regenerates the initrd for a stateless image to be used for a diskless install. @@ -72,7 +72,7 @@ This argument is now optional, and allows you to specify the network boot interf This argument is now optional, and allows you to specify the driver modules needed for the network interface(s) on your stateless nodes. If you do not specify this option, the default is to include all recent IBM -xSeries network drivers. +xSeries network drivers. If specified, I should be a comma separated list of network drivers to be used by the stateless nodes (Ie.: -n tg3,e1000). @@ -108,15 +108,15 @@ in the install image. =item B<-g> I -Use this flag to specify the rpm version for kernel packages in the image. It must be present if -k flag is specified in the command for SLES. Generally, the value of -g is the part after B and before B<.rpm> in a kernel rpm name. +Use this flag to specify the rpm version for kernel packages in the image. It must be present if -k flag is specified in the command for SLES. Generally, the value of -g is the part after B and before B<.rpm> in a kernel rpm name. =item B<-m> statelite This flag is for Ubuntu, Debian and Fedora12 only. Use this flag to specify if you want to generate statelite image. The default is to generate stateless image for these three operating systems. For others, this flag is invalid because both stateless and statelite images will be generated with this command. -=item B<--interactive> +=item B<--interactive> -This flag allows the user to answer questions from yum/zypper command when installing rpms into the image. If it is not specified, '-y' will be passed to the yum command and '--non-interactive --no-gpg-checks' will be passed to the zypper command as default answers. +This flag allows the user to answer questions from yum/zypper command when installing rpms into the image. If it is not specified, '-y' will be passed to the yum command and '--non-interactive --no-gpg-checks' will be passed to the zypper command as default answers. =item B<--dryrun> @@ -125,7 +125,7 @@ This flag shows the underlying call to the os specific genimage function. The us =item B<-t> I -(Deprecated) This flag allows the user to setup the /tmp and the /var/tmp file system sizes. This flag is no longer supported. You can overwrite any file system size using the .postinstall script where you can create a new /etc/fstab file. +(Deprecated) This flag allows the user to setup the /tmp and the /var/tmp file system sizes. This flag is no longer supported. You can overwrite any file system size using the .postinstall script where you can create a new /etc/fstab file. =item B<--ignorekernelchk> From ea1e8e66481c208934a9da27fb9b628641f03874 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0839/1681] Remove trailing spaces in file xCAT-client/pods/man1/geninitrd.1.pod --- xCAT-client/pods/man1/geninitrd.1.pod | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/xCAT-client/pods/man1/geninitrd.1.pod b/xCAT-client/pods/man1/geninitrd.1.pod index f2d4cfc7a..bd4b132a4 100644 --- a/xCAT-client/pods/man1/geninitrd.1.pod +++ b/xCAT-client/pods/man1/geninitrd.1.pod @@ -6,7 +6,7 @@ B - Generate an initrd (initial ramfs) which to be used for stateful B I [B<--ignorekernelchk>] -B [B<-h> | B<--help>] +B [B<-h> | B<--help>] =head1 DESCRIPTION @@ -17,26 +17,26 @@ B =over 2 -If the B is a stateful one (The provmethod attribute for the osimage is 'install'), -this command is used to rebuild the initrd to inject the new drivers from driver rpms or -'update distro' and copy the rebuilt initrd and new kernel (If there's new kernel in 'update +If the B is a stateful one (The provmethod attribute for the osimage is 'install'), +this command is used to rebuild the initrd to inject the new drivers from driver rpms or +'update distro' and copy the rebuilt initrd and new kernel (If there's new kernel in 'update distro') to the directory I>. -If the initrd has been rebuilt by geninitrd, when run nodeset, the I<--noupdateinitrd> option +If the initrd has been rebuilt by geninitrd, when run nodeset, the I<--noupdateinitrd> option should be used to skip the rebuilding of initrd to improve the performance. -Three attributes of osimage object can be used to specify the Driver RPM location and Driver names +Three attributes of osimage object can be used to specify the Driver RPM location and Driver names for injecting new drivers to initrd. -B - comma separated driver names that need to be injected to the initrd. -The postfix '.ko' can be ignored. The netdrivers attribute must be set to specify the new driver list. -If you want to load all the drivers from the driver rpms, using the keyword allupdate. +B - comma separated driver names that need to be injected to the initrd. +The postfix '.ko' can be ignored. The netdrivers attribute must be set to specify the new driver list. +If you want to load all the drivers from the driver rpms, using the keyword allupdate. B - comma separated driver rpm packages (full path should be specified) -B - comma separated 'osdistroupdate' object. Each 'osdistroupdate' object specifies a -Linux distro update. When run geninitrd, 'kernel-*.rpm' will be searched from osdistroupdate.dirpath -to get all the rpm packages and then search the drivers from the rpm packages. +B - comma separated 'osdistroupdate' object. Each 'osdistroupdate' object specifies a +Linux distro update. When run geninitrd, 'kernel-*.rpm' will be searched from osdistroupdate.dirpath +to get all the rpm packages and then search the drivers from the rpm packages. Refer to the doc: Using_Linux_Driver_Update_Disk @@ -47,10 +47,10 @@ B =over 2 If the B is a stateless one (The provmethod attribute for the osimage is 'netboot'), -this command is used to generate the initrd from the rootimg which generated by 'genimage' command. +this command is used to generate the initrd from the rootimg which generated by 'genimage' command. So the 'genimage' must be run once before running the geninitrd command. -Two attributes of osimage object can be used to specify the Driver RPM location and Driver names +Two attributes of osimage object can be used to specify the Driver RPM location and Driver names for injecting new drivers to initrd. B - comma separated driver names that need to be injected to the initrd. @@ -61,7 +61,7 @@ B - comma separated driver rpm packages (full path should be sp =back - + =head1 Parameters I specifies the name of an os image definition to be used. The specification for the image is stored in the I table and I table. From f20b680870d4f57bca85f4ac8860b0506d1a67a8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0840/1681] Remove trailing spaces in file xCAT-client/pods/man1/getmacs.1.pod --- xCAT-client/pods/man1/getmacs.1.pod | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/xCAT-client/pods/man1/getmacs.1.pod b/xCAT-client/pods/man1/getmacs.1.pod index 8bbbb8d17..beb877afb 100644 --- a/xCAT-client/pods/man1/getmacs.1.pod +++ b/xCAT-client/pods/man1/getmacs.1.pod @@ -40,35 +40,35 @@ Note: If "B<-d>" is specified, all the MAC of the blades will be displayed. If n =head1 OPTIONS -B<--arp> +B<--arp> Read MAC address with ARP protocol. -B<-C> +B<-C> -Specify the IP address of the partition for ping test. The default is to read from xCAT database if no B<-C> specified. +Specify the IP address of the partition for ping test. The default is to read from xCAT database if no B<-C> specified. -B<-d> +B<-d> Display MAC only. The default is to write the first valid adapter MAC to the xCAT database. -B<-D> +B<-D> Perform discovery for mac address. By default, it will run ping test to test the connection between adapter and xCAT management node. Use '--noping' can skip the ping test to save time. Be aware that in this way, the lpars will be reset. -B<-f> +B<-f> Force immediate shutdown of the partition. This flag must be used with -D flag. -B<-F> +B<-F> Specify filters to select the correct adapter. Acceptable filters are Type, MAC_Address, Phys_Port_Loc, Adapter, Port_Group, Phys_Port, Logical_Port, VLan, VSwitch, Curr_Conn_Speed. -B<-G> +B<-G> Gateway IP address of the partition. The default is to read from xCAT database if no B<-G> specified. -B<-h> +B<-h> Display usage message. @@ -80,25 +80,25 @@ B<--noping> Only can be used with '-D' to display all the available adapters with mac address but do NOT run ping test. -B<-o> +B<-o> Read MAC address when the lpar is in openfirmware state. This option mush be used with [B<-D>] option to perform ping test. Before use B<-o>, the lpar must be in openfirmware state. -B<-S> +B<-S> The IP address of the machine to ping. The default is to read from xCAT database if no B<-S> specified. -B<-v> +B<-v> Command Version. -B<-V> +B<-V> Verbose output. B<-i> -Specify the interface whose mac address will be collected and written into mac table. If 4 mac addresses are returned by option '-d', they all are the mac addresses of the blade. The N can start from 0(map to the eth0 of the blade) to 3. If 5 mac addresses are returned, the 1st mac address must be the mac address of the blade's FSP, so the N will start from 1(map to the eth0 of the blade) to 4. +Specify the interface whose mac address will be collected and written into mac table. If 4 mac addresses are returned by option '-d', they all are the mac addresses of the blade. The N can start from 0(map to the eth0 of the blade) to 3. If 5 mac addresses are returned, the 1st mac address must be the mac address of the blade's FSP, so the N will start from 1(map to the eth0 of the blade) to 4. =head1 RETURN VALUE @@ -111,7 +111,7 @@ Specify the interface whose mac address will be collected and written into mac t =head1 EXAMPLES 1. To retrieve the MAC address for the HMC-managed partition lpar4 and write the first valid adapter MAC to the xCAT database, enter: - + getmacs lpar4 Output is similar to: From 44f52d5cd2adb99311e688d0634d1f5c8ce00c87 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0841/1681] Remove trailing spaces in file xCAT-client/pods/man1/groupfiles4dsh.1.pod --- xCAT-client/pods/man1/groupfiles4dsh.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/groupfiles4dsh.1.pod b/xCAT-client/pods/man1/groupfiles4dsh.1.pod index 7f2281eba..11169cdc5 100644 --- a/xCAT-client/pods/man1/groupfiles4dsh.1.pod +++ b/xCAT-client/pods/man1/groupfiles4dsh.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Builds a directory of files for each defined nodegroup in xCAT. +B - Builds a directory of files for each defined nodegroup in xCAT. =head1 SYNOPSIS @@ -49,7 +49,7 @@ To use with dsh: export DSH_NODEGROUP_PATH= /tmp/nodegroupfiles dsh -N all date (where all is a group defined in xCAT) - dsh -a date (will look in all nodegroupfiles and build a list of all nodes) + dsh -a date (will look in all nodegroupfiles and build a list of all nodes) =head1 FILES From ed2e341862676276e83e1be557c251998fb7d671 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0842/1681] Remove trailing spaces in file xCAT-client/pods/man1/imgcapture.1.pod --- xCAT-client/pods/man1/imgcapture.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/imgcapture.1.pod b/xCAT-client/pods/man1/imgcapture.1.pod index 5c67d9a8a..841cd9848 100644 --- a/xCAT-client/pods/man1/imgcapture.1.pod +++ b/xCAT-client/pods/man1/imgcapture.1.pod @@ -18,11 +18,11 @@ The B command supports two image types: B and B. The B type: -The attributes of osimage will be used to capture and prepare the root image. The B, B and B attributes for the stateless/statelite image to be created are duplicated from the B's attribute. If the B<-p|--profile> I option is specified, the image will be created under "/>/netboot///>/rootimg". +The attributes of osimage will be used to capture and prepare the root image. The B, B and B attributes for the stateless/statelite image to be created are duplicated from the B's attribute. If the B<-p|--profile> I option is specified, the image will be created under "/>/netboot///>/rootimg". The default files/directories excluded in the image are specified by /opt/xcat/share/xcat/netboot//>...imgcapture.exlist; also, you can put your customized file (>...imgcapture.exlist) to /install/custom/netboot/. The directories in the default I<.imgcapture.exlist> file are necessary to capture the image from the diskful Linux node managed by xCAT, don't remove it. -The image captured will be extracted into the />/netboot/>/>/>/rootimg directory. +The image captured will be extracted into the />/netboot/>/>/>/rootimg directory. After the B command returns without any errors, you can customize the rootimg and run the B/B command with the options you want. @@ -40,7 +40,7 @@ The B command will create the I definition after the image Specify the osimage type you want to capture, two types are supported: diskless and sysclone. -=item B<-p|--profile> I +=item B<-p|--profile> I Assign I as the profile of the image to be created. @@ -72,7 +72,7 @@ For S390x: If the network interface is not in the above list, you'd better specify the driver modules with this option. -=item B<-h|--help> +=item B<-h|--help> Display the usage message. From 50fea637a7708468ad1672a733d4404314340a20 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0843/1681] Remove trailing spaces in file xCAT-client/pods/man1/imgexport.1.pod --- xCAT-client/pods/man1/imgexport.1.pod | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-client/pods/man1/imgexport.1.pod b/xCAT-client/pods/man1/imgexport.1.pod index 0e535a57b..46c165a1a 100644 --- a/xCAT-client/pods/man1/imgexport.1.pod +++ b/xCAT-client/pods/man1/imgexport.1.pod @@ -45,7 +45,7 @@ For statelite: where x is the name of the profile. -Any files specified by the B<-e> flag will also be exported. If B<-p> flag is specified, the names of the postscripts and the postbootscripts for the given node will be exported. The postscripts themselves need to be manualy exported using B<-e> flag. +Any files specified by the B<-e> flag will also be exported. If B<-p> flag is specified, the names of the postscripts and the postbootscripts for the given node will be exported. The postscripts themselves need to be manualy exported using B<-e> flag. For statelite, the litefile table settings for the image will also be exported. The litetree and statelite tables are not exported. @@ -55,15 +55,15 @@ For statelite, the litefile table settings for the image will also be exported. =item B<-e|--extra> I -Pack up extra files. If I is omitted, the destination directory will be the same as the source directory. +Pack up extra files. If I is omitted, the destination directory will be the same as the source directory. =item B<-h|--help> Display usage message. - + =item B<-p|--postscripts> I -Get the names of the postscripts and postbootscripts for the given node and pack them into the image. +Get the names of the postscripts and postbootscripts for the given node and pack them into the image. =item B<-v|--verbose> @@ -71,11 +71,11 @@ Verbose output. =item I -The name of the image. Use B to find out all the image names. +The name of the image. Use B to find out all the image names. =item I -The output bundle file name. +The output bundle file name. =back @@ -98,7 +98,7 @@ foo.tgz will be built in the current working directory. Make sure that you have imgexport Default_Stateless_1265981465 foo.tgz -e /install/postscripts/myscript1 -e /tmp/mydir:/usr/mydir -In addition to all the default files, this will export I and the whole directory I into the file called foo.tgz. And when imgimport is called I will be copied into the same directory and I will be copied to I. +In addition to all the default files, this will export I and the whole directory I into the file called foo.tgz. And when imgimport is called I will be copied into the same directory and I will be copied to I. 3. To include postscript with your image: From fc894f968776ce876fda4b67f4083de94e5d2862 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0844/1681] Remove trailing spaces in file xCAT-client/pods/man1/imgimport.1.pod --- xCAT-client/pods/man1/imgimport.1.pod | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-client/pods/man1/imgimport.1.pod b/xCAT-client/pods/man1/imgimport.1.pod index 2757ee48a..1c1891485 100644 --- a/xCAT-client/pods/man1/imgimport.1.pod +++ b/xCAT-client/pods/man1/imgimport.1.pod @@ -40,22 +40,22 @@ For statelite, the following files will be copied to the appropriate directories x.postinstall x.exlist -where x is the profile name. +where x is the profile name. -Any extra files, included by B<--extra> flag in the B command, will also be copied to the appropriate directories. +Any extra files, included by B<--extra> flag in the B command, will also be copied to the appropriate directories. For statelite, the litefile table will be updated for the image. The litetree and statelite tables are not imported. If B<-p> flag is specified, the I table will be updated with the postscripts and the postbootscripts names from the image for the nodes given by this flag. -If B<-f> flag is not specified, all the files will be copied to the same directories as the source. If it is specified, the old profile name x will be changed to the new and the files will be copied to the appropriate directores for the new profiles. For example, I will be copied to I and I will be copied to I. This flag is commonly used when you want to copy the image on the same xCAT mn so you can make modification on the new one. +If B<-f> flag is not specified, all the files will be copied to the same directories as the source. If it is specified, the old profile name x will be changed to the new and the files will be copied to the appropriate directores for the new profiles. For example, I will be copied to I and I will be copied to I. This flag is commonly used when you want to copy the image on the same xCAT mn so you can make modification on the new one. -After this command, you can run the B command and then start deploying the nodes. You can also choose to modify the files and run the following commands before the node deployment. +After this command, you can run the B command and then start deploying the nodes. You can also choose to modify the files and run the following commands before the node deployment. For stateful: nodeset -For stateless: +For stateless: genimage packimage nodeset @@ -72,7 +72,7 @@ For statelite =item B<-f|--profile> I -Import the image with a new profile name. +Import the image with a new profile name. =item B<-h|--help> @@ -101,14 +101,14 @@ Verbose output. imgimport foo.gz -2. Import the image with postscript names. +2. Import the image with postscript names. imgimport foo.gz -p node1,node2 The I table will be updated with the name of the I and the I for node1 and node2. -3. Import the image with a new profile name +3. Import the image with a new profile name imgimport foo.gz -f compute_test From 6699284e72ccbf29f03f939381ac1ca22ee642df Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0845/1681] Remove trailing spaces in file xCAT-client/pods/man1/liteimg.1.pod --- xCAT-client/pods/man1/liteimg.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/liteimg.1.pod b/xCAT-client/pods/man1/liteimg.1.pod index 9f8ed39ff..bc9052f68 100644 --- a/xCAT-client/pods/man1/liteimg.1.pod +++ b/xCAT-client/pods/man1/liteimg.1.pod @@ -12,7 +12,7 @@ B I =head1 DESCRIPTION -This command modifies the statelite image by creating a series of links. +This command modifies the statelite image by creating a series of links. It creates 2 levels of indirection so that files can be modified while in their image state as well as during runtime. For example, a file like <$imgroot>/etc/ntp.conf will have the following operations done to it: From 54ce017ed40322db56dfbf9e98b88741f622d1bf Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0846/1681] Remove trailing spaces in file xCAT-client/pods/man1/lsdef.1.pod --- xCAT-client/pods/man1/lsdef.1.pod | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-client/pods/man1/lsdef.1.pod b/xCAT-client/pods/man1/lsdef.1.pod index 1a1b23f9f..ac677d0f1 100644 --- a/xCAT-client/pods/man1/lsdef.1.pod +++ b/xCAT-client/pods/man1/lsdef.1.pod @@ -6,12 +6,12 @@ B - Use this command to list xCAT data object definitions. B [B<-h>|B<--help>] [B<-t> I] [B<-i> I] -B [B<-V>|B<--verbose>] [B<-l>|B<--long>] [B<-s>|B<--short>] [B<-a>|B<--all>] [B<-S>] +B [B<-V>|B<--verbose>] [B<-l>|B<--long>] [B<-s>|B<--short>] [B<-a>|B<--all>] [B<-S>] [B<-t> I] [B<-o> I] [B<-z>|B<--stanza>] [B<-i> I] [B<-c>|B<--compress>] [B<--osimage>] [B<--nics>] [[B<-w> I==I] [B<-w> I=~I] ...] [I] -B [B<-l>|B<--long>] [B<-a>|B<--all>] [B<-t> I] [B<-z>|B<--stanza>] +B [B<-l>|B<--long>] [B<-a>|B<--all>] [B<-t> I] [B<-z>|B<--stanza>] [B<-i> I] [B<--template> [I]] =head1 DESCRIPTION @@ -33,7 +33,7 @@ To list auditlog or eventlog objects, use lsdef -t auditlog or lsdef -t eventlog =item B<-c|--compress> Display information in compressed mode, each output line has format ": ". -The output can be passed to command xcoll or xdshbak for formatted output. +The output can be passed to command xcoll or xdshbak for formatted output. The -c flag must be used with -i flag. =item B<-h|--help> @@ -52,7 +52,7 @@ List the complete object definition. Only list the object names. -=item B<-S> +=item B<-S> List all the hidden nodes (FSP/BPA nodes) with other ones. @@ -237,7 +237,7 @@ To list all the object definition templates shipped in xCAT. =item 19. To display the details of "node" object definition template "ppc64le-template" shipped in xCAT. - + lsdef -t node --template ppc64le-template =item 20. From e46bd593bb976eb1d7041feaa35a421a4cf51f57 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0847/1681] Remove trailing spaces in file xCAT-client/pods/man1/lsdocker.1.pod --- xCAT-client/pods/man1/lsdocker.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/lsdocker.1.pod b/xCAT-client/pods/man1/lsdocker.1.pod index 0f414696c..9448f87f8 100644 --- a/xCAT-client/pods/man1/lsdocker.1.pod +++ b/xCAT-client/pods/man1/lsdocker.1.pod @@ -15,7 +15,7 @@ B {B<-v>|B<--version>} =head1 DESCRIPTION -B To list docker instance info or all the running docker instance info if dockerhost is specified. +B To list docker instance info or all the running docker instance info if dockerhost is specified. =head1 OPTIONS From c5e3a4b697d727dccd6f66fc426af36835f789c7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0848/1681] Remove trailing spaces in file xCAT-client/pods/man1/lsflexnode.1.pod --- xCAT-client/pods/man1/lsflexnode.1.pod | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-client/pods/man1/lsflexnode.1.pod b/xCAT-client/pods/man1/lsflexnode.1.pod index 4fa436316..3086333b7 100644 --- a/xCAT-client/pods/man1/lsflexnode.1.pod +++ b/xCAT-client/pods/man1/lsflexnode.1.pod @@ -9,18 +9,18 @@ B [B<-h> | B<--help>] B [B<-v> | B<--version>] -B I +B I =head1 DESCRIPTION -IBM BladeCenter HX5 offers flexibility ideal that the blades can be combined together for scalability. +IBM BladeCenter HX5 offers flexibility ideal that the blades can be combined together for scalability. There are several concepts to support the HX5 multiple blades combination: =over 2 -B: Multiple blades which combined by a scalability card is a complex. +B: Multiple blades which combined by a scalability card is a complex. B: A logic concept which containing part of the B in a complex. Each partition can map to a system to install Operating System. Each partition could have 1HX5, 1HX5+1MD or 2HX5+2MD. (MD is the Memory Drawer) @@ -28,7 +28,7 @@ B: The physical blade which installed in the slot of a chassis. =back -A B will be created automatically when a multiple blades combination is installed. In this B, every blade belongs to it is working as a B. +A B will be created automatically when a multiple blades combination is installed. In this B, every blade belongs to it is working as a B. A B can be created base on the B, each B can have one or multiple B. @@ -57,7 +57,7 @@ The meaning of attributes which displayed by the B. The word 'node' =over 4 -=item B +=item B The unique numeric identifier for a complex installed in the chassis. From 75bac26970914c58a69bcf2a251d547e1c90f26d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0849/1681] Remove trailing spaces in file xCAT-client/pods/man1/lshwconn.1.pod --- xCAT-client/pods/man1/lshwconn.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/lshwconn.1.pod b/xCAT-client/pods/man1/lshwconn.1.pod index 6e958831e..e45d3631e 100644 --- a/xCAT-client/pods/man1/lshwconn.1.pod +++ b/xCAT-client/pods/man1/lshwconn.1.pod @@ -18,7 +18,7 @@ B I B<-T> I =head1 DESCRIPTION -This command is used to display the connection status for CEC and Frame node. +This command is used to display the connection status for CEC and Frame node. =head1 OPTIONS From 49b659c75e7f211b85a29c98442f92efb78af1cb Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0850/1681] Remove trailing spaces in file xCAT-client/pods/man1/lskit.1.pod --- xCAT-client/pods/man1/lskit.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/lskit.1.pod b/xCAT-client/pods/man1/lskit.1.pod index 01adde594..fe450efc4 100644 --- a/xCAT-client/pods/man1/lskit.1.pod +++ b/xCAT-client/pods/man1/lskit.1.pod @@ -94,7 +94,7 @@ The data inside is returned as: =item B<-V|--verbose> -Display additional progress and error messages. +Display additional progress and error messages. =item B<-v|--version> @@ -146,7 +146,7 @@ To list the framework value of a Kit tarfile. Output is similar to: Extracting the kit.conf file from /myhome/mykits/pperte-1.3.0.2-0-x86_64.tar.bz2. Please wait. - + kitframework=2 compatible_kitframeworks=0,1,2 From 9da2f99c6a163a6535d262eedb5bd80399520080 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0851/1681] Remove trailing spaces in file xCAT-client/pods/man1/lskitcomp.1.pod --- xCAT-client/pods/man1/lskitcomp.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/lskitcomp.1.pod b/xCAT-client/pods/man1/lskitcomp.1.pod index dfd6e307c..46a90fa3d 100644 --- a/xCAT-client/pods/man1/lskitcomp.1.pod +++ b/xCAT-client/pods/man1/lskitcomp.1.pod @@ -78,7 +78,7 @@ The data inside is returned as: =item B<-V|--verbose> -Display additional progress and error messages. +Display additional progress and error messages. =item B<-v|--version> @@ -140,7 +140,7 @@ To list kit components compatible with "rhels-6.2-x86_64" osdistro and "computen =item 6. To list the kit component "testkit-compute-1.0-1-ubuntu-14.04-ppc64el" with XML tags, enter: - + XCATXMLTRACE=1 lskitcomp -x testkit-compute-1.0-1-ubuntu-14.04-ppc64el =back From b899aef58206cb9188d471a6670631dd7c2731fc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0852/1681] Remove trailing spaces in file xCAT-client/pods/man1/lskitdeployparam.1.pod --- xCAT-client/pods/man1/lskitdeployparam.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/lskitdeployparam.1.pod b/xCAT-client/pods/man1/lskitdeployparam.1.pod index 576204a5d..1ce466a5c 100644 --- a/xCAT-client/pods/man1/lskitdeployparam.1.pod +++ b/xCAT-client/pods/man1/lskitdeployparam.1.pod @@ -52,7 +52,7 @@ Return the output with XML tags. The data is returned as: =item B<-V|--verbose> -Display additional progress and error messages. +Display additional progress and error messages. =item B<-v|--version> From abfa779afea91c07c965cb9f4b8a1348b700cd6e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0853/1681] Remove trailing spaces in file xCAT-client/pods/man1/lskmodules.1.pod --- xCAT-client/pods/man1/lskmodules.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/lskmodules.1.pod b/xCAT-client/pods/man1/lskmodules.1.pod index b6f3b78a2..35c5c62bf 100644 --- a/xCAT-client/pods/man1/lskmodules.1.pod +++ b/xCAT-client/pods/man1/lskmodules.1.pod @@ -12,7 +12,7 @@ B [B<-?> | B<-h> | B<--help> | B<-v> | B<--version>] =head1 DESCRIPTION -The B command finds the kernel driver module files (*.ko) in the specified input locations, runs the modinfo command against each file, and returns the driver name and description. If -x is specified, the output is returned with XML tags. +The B command finds the kernel driver module files (*.ko) in the specified input locations, runs the modinfo command against each file, and returns the driver name and description. If -x is specified, the output is returned with XML tags. Input to the command can specify any number or combination of the input options. @@ -54,7 +54,7 @@ This option is intended for use by other programs. The XML will not be displaye =item B<-V|--verbose> -Display additional progress and error messages. +Display additional progress and error messages. =item B<-v|--version> From af5bd322aef53ab13fa5a2b4efb1fc8ff24ba8b6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0854/1681] Remove trailing spaces in file xCAT-client/pods/man1/lsslp.1.pod --- xCAT-client/pods/man1/lsslp.1.pod | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xCAT-client/pods/man1/lsslp.1.pod b/xCAT-client/pods/man1/lsslp.1.pod index fe1e04cac..d68df623b 100755 --- a/xCAT-client/pods/man1/lsslp.1.pod +++ b/xCAT-client/pods/man1/lsslp.1.pod @@ -29,13 +29,13 @@ B<-n> Only display and write the newly discovered hardware. B<-u> Do unicast to a specified IP range. Must be used with B<-s> and B<--range>. The B<-u> flag is not supported on AIX. -B<--range> Specify one or more IP ranges. Must be use in unicast mode. It accepts multiple formats. For example, 192.168.1.1/24, 40-41.1-2.3-4.1-100. If the range is huge, for example, 192.168.1.1/8, lsslp may take a very long time for node scan. So the range should be exactly specified. +B<--range> Specify one or more IP ranges. Must be use in unicast mode. It accepts multiple formats. For example, 192.168.1.1/24, 40-41.1-2.3-4.1-100. If the range is huge, for example, 192.168.1.1/8, lsslp may take a very long time for node scan. So the range should be exactly specified. B<-r> Display Raw SLP response. B<-C> The number of the expected responses specified by the user. When using this flag, lsslp will not return until the it has found all the nodes or time out. The default max time is 3 seconds. The user can use -T flag the specify the time they want to use. A short time will limit the time costing, while a long time will help to find all the nodes. - -B<-T> The number in seconds to limit the time of lsslp. + +B<-T> The number in seconds to limit the time of lsslp. B<-s> Service type interested in discovering. @@ -121,7 +121,7 @@ Output is similar to: ip=192.168.200.125 groups=hmc,all mgt=hmc - mac=00:1a:64:fb:7d:50 + mac=00:1a:64:fb:7d:50 hidden=0 192.168.200.244: objtype=node @@ -175,7 +175,7 @@ Output is similar to: 5. To list all discovered service types in stanza format and display the IP address, enter: - lsslp -w + lsslp -w Output is similar to: @@ -206,17 +206,17 @@ Output is similar to: 6. To list all the CECs, enter: - lsslp -s CEC - + lsslp -s CEC + device type-model serial-number side ip-addresses hostname FSP 9117-MMB 105EBEP A-1 20.0.0.138 20.0.0.138 FSP 9117-MMB 105EBEP B-1 20.0.0.139 20.0.0.139 CEC 9117-MMB 105EBEP Server-9117-MMB-SN105EBEP - + 7. To list all the nodes defined in database which have no SLP response. - lsslp -I + lsslp -I Output is similar to: @@ -247,11 +247,11 @@ or lsslp CEC1,CEC2,CEC3 FSP 8205-E6B 1000ECP B-0 192.168.200.39 192.168.200.39 FSP 8205-E6B 1000ECP A-1 50.0.0.31 50.0.0.27 FSP 8205-E6B 1000ECP B-1 50.0.0.32 50.0.0.28 - CEC 8205-E6B 1000ECP CEC3 + CEC 8205-E6B 1000ECP CEC3 9. To list all discovered CMM in stanza format, enter: - lsslp -s CMM -m -z + lsslp -s CMM -m -z e114ngmm1: objtype=node From 15dd46b276b46a9eb85fd4fa5c87f09e6de32719 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0855/1681] Remove trailing spaces in file xCAT-client/pods/man1/lstree.1.pod --- xCAT-client/pods/man1/lstree.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/lstree.1.pod b/xCAT-client/pods/man1/lstree.1.pod index 618151539..99ecb1907 100644 --- a/xCAT-client/pods/man1/lstree.1.pod +++ b/xCAT-client/pods/man1/lstree.1.pod @@ -65,7 +65,7 @@ Output is similar to: |__mycn12 |__mycn13 ...... - + =item 2. To display the tree of service node hierarchy for service node "mysn01". From 50962f7025ebc89a5e870361d15a2ef6d1d064f7 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0856/1681] Remove trailing spaces in file xCAT-client/pods/man1/lsve.1.pod --- xCAT-client/pods/man1/lsve.1.pod | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-client/pods/man1/lsve.1.pod b/xCAT-client/pods/man1/lsve.1.pod index a2da16334..813006339 100644 --- a/xCAT-client/pods/man1/lsve.1.pod +++ b/xCAT-client/pods/man1/lsve.1.pod @@ -8,17 +8,17 @@ B [B<-t> I] [B<-m> I] [B<-o> I] =head1 DESCRIPTION -The B command can be used to list a virtual environment for +The B command can be used to list a virtual environment for 'Data Center', 'Cluster', 'Storage Domain', 'Network' and 'Template' objects. -The mandatory parameter B<-m> I is used to specify the address of the +The mandatory parameter B<-m> I is used to specify the address of the manager of virtual environment. xCAT needs it to access the RHEV manager. -The mandatory parameter B<-t> I is used to specify the type of the target +The mandatory parameter B<-t> I is used to specify the type of the target object. -Basically, B command supports three types of object: B, B, B, B -and B. +Basically, B command supports three types of object: B, B, B, B +and B. The parameter B<-o object> is used to specify which object to list. If no B<-o> is specified, all the objects with the B<-t> type will be displayed. @@ -31,7 +31,7 @@ all the objects with the B<-t> type will be displayed. Display usage message. =item B<-m> -Specify the manager of the virtual environment. +Specify the manager of the virtual environment. For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have to be specified. From 7dbed6c21765ce7cd8435ce3aadea9479f4d00f9 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0857/1681] Remove trailing spaces in file xCAT-client/pods/man1/lsvm.1.pod --- xCAT-client/pods/man1/lsvm.1.pod | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xCAT-client/pods/man1/lsvm.1.pod b/xCAT-client/pods/man1/lsvm.1.pod index ac802ed7a..9e4b272db 100644 --- a/xCAT-client/pods/man1/lsvm.1.pod +++ b/xCAT-client/pods/man1/lsvm.1.pod @@ -40,12 +40,12 @@ The pump mode value has the valid options: 1 - Node Pump Mode 2 - Chip Pump Mode -The Memory Interleaving Mode has 3 valid options: +The Memory Interleaving Mode has 3 valid options: 0 - not Applicable 1 - interleaved 2 - non-interleaved -More information about this part, refer to the section Using the *vm commands to define partitions in xCAT DFM in the doc below. +More information about this part, refer to the section Using the *vm commands to define partitions in xCAT DFM in the doc below. XCAT_Power_775_Hardware_Management =head2 For KVM and VMware @@ -53,7 +53,7 @@ More information about this part, refer to the section Using the *vm commands to If I is a hypervisor, virtual machines defined on that hypervisor will be displayed. If I is a VM, details for that VM will be displayed. Note: Only the virtual machine which is in power on state can be listed by B command. - + =head2 For zVM: Show the directory entry for a given virtual machine. @@ -61,19 +61,19 @@ Show the directory entry for a given virtual machine. =head1 OPTIONS -B<-h> +B<-h> Display usage message. -B<-v> +B<-v> Command version. -B<-V> +B<-V> Verbose output. -B<-a> +B<-a> List all the profiles for one partition @@ -81,7 +81,7 @@ B<--p775> Specify the operation is for Power 775 machines. -B<-l> +B<-l> Show lparnames for lpars. It shall work with option B<--p775>. @@ -112,7 +112,7 @@ Output is similar to: name=lp3,lpar_name=lp3,lpar_id=3,os_type=aixlinux,all_resources=0,min_mem=128,desired_mem=128,max_mem=128,proc_mode=shared,min_proc_units=0.10,desired_proc_units=0.10,max_proc_units=4.00,min_procs=1,desired_procs=1,max_procs=4,sharing_mode=uncap,uncap_weight=128,io_slots=none,lpar_io_pool_ids=none,max_virtual_slots=6, "virtual_serial_adapters=0/server/1/any//any/1,1/server/1/any//any/1",virtual_scsi_adapters=2/client/1/10-B7D1G/13/1,virtual_eth_adapters=4/0/1//0/0,boot_mode=of,conn_monitoring=0,auto_start=1, power_ctrl_lpar_ids=none 3. For Power 775, to list the I/O slot information of lpar1, enter: - + lsvm lpar1 --p775 Output is similar to: @@ -167,7 +167,7 @@ Output is similar to: 6. To list the lparname of lpars, enter: lsvm cec1 -l --p775 - + Output is similar to: lpar1: 1: 514/U78A9.001.0123456-P1-C17/0x21010202/2/1: 32: 0/3/3 @@ -221,7 +221,7 @@ Output is similar to: 8. For DFM-managed normal power machine, list out the detailed resource information: - lsvm cec + lsvm cec Output is similar to: @@ -248,12 +248,12 @@ Output is similar to: Bytes per BSR array: 4096 Available BSR array: 256 -Note: The lines listed in "All Physical I/O info" section represent all the physical I/O resource information. The format is like "owner_lparid,slot_id,physical resource name,drc_index,slot_class_code(class description)". The 'drc index' is short for Dynamic Resource Configuration Index, it uniquely indicates a physical I/O resource in a normal power machine. +Note: The lines listed in "All Physical I/O info" section represent all the physical I/O resource information. The format is like "owner_lparid,slot_id,physical resource name,drc_index,slot_class_code(class description)". The 'drc index' is short for Dynamic Resource Configuration Index, it uniquely indicates a physical I/O resource in a normal power machine. 9. For DFM-managed partition on normal power machine, list out the detailed information: - lsvm lpar1 - + lsvm lpar1 + Output is similar to: lpar1: Lpar Processor Info: From d5d69dc37a65f1b0dd0a8e2447e7cb155b7bc6dc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0858/1681] Remove trailing spaces in file xCAT-client/pods/man1/lsxcatd.1.pod --- xCAT-client/pods/man1/lsxcatd.1.pod | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-client/pods/man1/lsxcatd.1.pod b/xCAT-client/pods/man1/lsxcatd.1.pod index ce9c2ec1f..266c0752d 100644 --- a/xCAT-client/pods/man1/lsxcatd.1.pod +++ b/xCAT-client/pods/man1/lsxcatd.1.pod @@ -24,15 +24,15 @@ Display usage message. =item B<-d|--database> -Displays information about the current database being used by xCAT. +Displays information about the current database being used by xCAT. =item B<-t|--nodetype> -Displays whether the node is a Management Node or a Service Node. +Displays whether the node is a Management Node or a Service Node. =item B<-a|--all> -Displays all information about the daemon supported by the command. +Displays all information about the daemon supported by the command. =back @@ -50,7 +50,7 @@ Displays all information about the daemon supported by the command. To display information about the current database: - lsxcatd -d + lsxcatd -d Output is similar to: @@ -64,9 +64,9 @@ Output is similar to: To display all information: - lsxcatd -a + lsxcatd -a -Output is similar to: +Output is similar to: Version 2.8.5 (git commit 0d4888af5a7a96ed521cb0e32e2c918a9d13d7cc, built Tue Jul 29 02:22:47 EDT 2014) This is a Management Node From 52974dfb94642460592f4e26f5fbd88b5f5e853c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0859/1681] Remove trailing spaces in file xCAT-client/pods/man1/makentp.1.pod --- xCAT-client/pods/man1/makentp.1.pod | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-client/pods/man1/makentp.1.pod b/xCAT-client/pods/man1/makentp.1.pod index 28ef68f0b..34c915613 100755 --- a/xCAT-client/pods/man1/makentp.1.pod +++ b/xCAT-client/pods/man1/makentp.1.pod @@ -28,7 +28,7 @@ I -- the NTP servers for the service node and compute node to s =back -To setup NTP on the compute node, add B postscript to the I table and run I command. +To setup NTP on the compute node, add B postscript to the I table and run I command. =head1 OPTIONS @@ -36,21 +36,21 @@ To setup NTP on the compute node, add B postscript to the I +=item B<-a|--all> Setup NTP servers for both management node and the service node. If management node has SLES installed and used as I, it is recommanded to use the B postscript to set up NTP server for service nodes. -=item B<-h|--help> +=item B<-h|--help> Display usage message. -=item B<-v|--version> +=item B<-v|--version> Command Version. -=item B<-V|--verbose> +=item B<-V|--verbose> Verbose output. From e772ad65bd39cd3f33fb29fafeb8e6535be0cc85 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0860/1681] Remove trailing spaces in file xCAT-client/pods/man1/mkdef.1.pod --- xCAT-client/pods/man1/mkdef.1.pod | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-client/pods/man1/mkdef.1.pod b/xCAT-client/pods/man1/mkdef.1.pod index af59220b2..e712674f1 100644 --- a/xCAT-client/pods/man1/mkdef.1.pod +++ b/xCAT-client/pods/man1/mkdef.1.pod @@ -11,7 +11,7 @@ B [B<-V>|B<--verbose>] [B<-t> I] [B<--template> I I B<-w> I ... +=item B<-w> I B<-w> I ... Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. For mkdef command, the -w flag only makes sense for creating dynamic node group. Use the help option to get a list of valid attributes for each object type. @@ -151,15 +151,15 @@ To create a dynamic node group definition called SLESNodes containing all the SL =item 10. -To create a entry (7.0) in the policy table for user admin1 +To create a entry (7.0) in the policy table for user admin1 - mkdef -t policy -o 7.0 name=admin1 rule=allow + mkdef -t policy -o 7.0 name=admin1 rule=allow =item 11. To create a node definition with nic attributes - mkdef -t node cn1 groups=all nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet" + mkdef -t node cn1 groups=all nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet" =item 12. From 75ba5d6bf61359f2882f01229559953c7677d437 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0861/1681] Remove trailing spaces in file xCAT-client/pods/man1/mkdocker.1.pod --- xCAT-client/pods/man1/mkdocker.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/mkdocker.1.pod b/xCAT-client/pods/man1/mkdocker.1.pod index dcb4eb0e4..0ac21f038 100644 --- a/xCAT-client/pods/man1/mkdocker.1.pod +++ b/xCAT-client/pods/man1/mkdocker.1.pod @@ -57,13 +57,13 @@ Attach standard streams to a tty, including stdin if it is not closed. =item B -An object mapping ports to an empty object in the form of: +An object mapping ports to an empty object in the form of: "ExposedPorts": { "/\: {}" } =item B -A list of volume bindings for this docker instance, the form will be: +A list of volume bindings for this docker instance, the form will be: "HostConfig": {"Binds":[":"]} From d927c36c18c50a475385912a8c5db99b8ba55a1b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0862/1681] Remove trailing spaces in file xCAT-client/pods/man1/mkdsklsnode.1.pod --- xCAT-client/pods/man1/mkdsklsnode.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/mkdsklsnode.1.pod b/xCAT-client/pods/man1/mkdsklsnode.1.pod index 3b51f160f..a56d670ce 100644 --- a/xCAT-client/pods/man1/mkdsklsnode.1.pod +++ b/xCAT-client/pods/man1/mkdsklsnode.1.pod @@ -18,7 +18,7 @@ This command will also create a NIM resolv_conf resource to be used when install The "domain" and "nameservers" attributes can be set in either the xCAT "network" definition used by the nodes or in the xCAT cluster "site" definition. The setting in the "network" definition will take priority. -The "search" field of the resolv.conf file will contain a list all the domains +The "search" field of the resolv.conf file will contain a list all the domains listed in the xCAT network definitions and the xCAT site definition. The "nameservers" value can either be set to a specific IP address or the "" key word. The "" key word means that the value of the "xcatmaster" attribute of the node definition will be used in the /etc/resolv.conf file. (I.e. The name of the install server as known by the node.) @@ -39,7 +39,7 @@ When creating a new NIM machine definition the default is to use the same name a You can use the "-n" option of the mkdsklsnode command to create and initialize an alternate NIM machine definition for the same physical nodes. This option allows you to set up a new image to use when a node is next rebooted while the node is currently running. This is possible because the NIM name for a machine definition does not have to be the hostname of the node. This allows you to have multiple NIM machine definitions for the same physical node. The naming convention for the new NIM machine name is "_", (Ex. "node01_61spot"). Since all the NIM initialization can be done while the node is running the downtime for for the node is reduced to the time it takes to reboot. -B When using the "-n" option make sure that the new osimage you specify and all the NIM resources that are used are different than what are currently being used on the nodes. The NIM resources should not be shared between the old osimage and the new osimage. +B When using the "-n" option make sure that the new osimage you specify and all the NIM resources that are used are different than what are currently being used on the nodes. The NIM resources should not be shared between the old osimage and the new osimage. You can use the force option to reinitialize a node if it already has resources allocated or it is in the wrong NIM state. This option will reset the NIM node and deallocate resources before reinitializing. Use this option with caution since reinitializing a node will stop the node if it is currently running. From c3864128356393cce0d75fd7a1e9a5e58109169b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0863/1681] Remove trailing spaces in file xCAT-client/pods/man1/mkflexnode.1.pod --- xCAT-client/pods/man1/mkflexnode.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/mkflexnode.1.pod b/xCAT-client/pods/man1/mkflexnode.1.pod index ed8d47f57..1f906e078 100644 --- a/xCAT-client/pods/man1/mkflexnode.1.pod +++ b/xCAT-client/pods/man1/mkflexnode.1.pod @@ -17,7 +17,7 @@ B I A flexible node is a B in a complex. Creating a flexible node is to create a partition which including all the slots defined in the xCAT blade node. Before creating a flexible node, a general xCAT blade node should be defined. The I attribute of this node should be a node range like 'a-b', it means the blades installed in slots 'a-b' need to be assigned to the partition. 'a' is the start slot, 'b' is the end slot. If this partition only have one slot, the slot range can be 'a'. - + The action of creating flexible node will impact the hardware status. Before creating it, the blades in the slot range should be in B state. After the creating, use the B to check the status of the node. From 36ebd807373ad56cfa9f05845319544b730c950e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0864/1681] Remove trailing spaces in file xCAT-client/pods/man1/mkhwconn.1.pod --- xCAT-client/pods/man1/mkhwconn.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/mkhwconn.1.pod b/xCAT-client/pods/man1/mkhwconn.1.pod index 0f47b3668..763ced7d2 100644 --- a/xCAT-client/pods/man1/mkhwconn.1.pod +++ b/xCAT-client/pods/man1/mkhwconn.1.pod @@ -29,7 +29,7 @@ This command is useful when you have multiple HMCs, each of which will manage a each HMC which CECs/Frames it should manage. When using this, you should turn off the self-discovery on each HMC. You also need to put all the HMCs and all the Frames on a single flat service network. -When B<-t> is specified, this command reads the connection information from the xCAT ppc table (e.g. the parent attribute), and read the user/password from the ppcdirect table. Then this command will assign CEC nodes and Frame nodes to HMC nodes. +When B<-t> is specified, this command reads the connection information from the xCAT ppc table (e.g. the parent attribute), and read the user/password from the ppcdirect table. Then this command will assign CEC nodes and Frame nodes to HMC nodes. When B<-p> is specified, this command gets the connection information from command line arguments. If B<-P> is not specified, the default password for CEC and Frame nodes is used. @@ -116,7 +116,7 @@ To setup the connections for all CEC nodes in node group cec to hardware server, To setup the connections for all cecs nodes in node group cec to hardware server, and the tooltype value is lpar, and the port value is 1: - mkhwconn cec -t -T lpar --port 1 + mkhwconn cec -t -T lpar --port 1 =item 5. From 738dfaea5f7c82eda3d6b39904c7aa416392b258 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0865/1681] Remove trailing spaces in file xCAT-client/pods/man1/mknimimage.1.pod --- xCAT-client/pods/man1/mknimimage.1.pod | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/xCAT-client/pods/man1/mknimimage.1.pod b/xCAT-client/pods/man1/mknimimage.1.pod index 700ccdc43..31e185d1a 100644 --- a/xCAT-client/pods/man1/mknimimage.1.pod +++ b/xCAT-client/pods/man1/mknimimage.1.pod @@ -22,17 +22,17 @@ When creating a mksysb image definition you must specify either the "-n" or the B -When creating a diskless osimage definition you also have the option of automatically updating the NIM SPOT resource. You can have additional software installed or you can have configuration files added or updated. To have software installed you must provide either the names of NIM installp_bundle resources or fileset names on the command line using the "attr=val" option. You may also supply the installp flags, RPM flags, emgr flags to use when installing the software. +When creating a diskless osimage definition you also have the option of automatically updating the NIM SPOT resource. You can have additional software installed or you can have configuration files added or updated. To have software installed you must provide either the names of NIM installp_bundle resources or fileset names on the command line using the "attr=val" option. You may also supply the installp flags, RPM flags, emgr flags to use when installing the software. To have configuration files updated you must provide the full path name of a "synclists" file which contains the list of actual files to update. The xCAT osimage definition that is created will contain the installp_bundle, otherpkgs, and synclists files that are provided on the command line. B -If you wish to update an existing diskless image after it has already been created you can use the "-u" (update) option. In this case the xCAT osimage definition will not be updated. +If you wish to update an existing diskless image after it has already been created you can use the "-u" (update) option. In this case the xCAT osimage definition will not be updated. -There are two ways to use the update feature. +There are two ways to use the update feature. -You can update the osimage definition and run the B command with no "installp_bundle", "otherpkgs", or "synclists" command line values. The information for updating the SPOT will come from the osimage definition only. This has the advantage of keeping a record of any changes that were made to the SPOT. +You can update the osimage definition and run the B command with no "installp_bundle", "otherpkgs", or "synclists" command line values. The information for updating the SPOT will come from the osimage definition only. This has the advantage of keeping a record of any changes that were made to the SPOT. Or, you could do a more ad hoc update by providing one or more of the "installp_bundle", "otherpkgs", or "synclists" values on the command line. If any of these values are provided the B command will use those values only. The osimage definition will not be used or updated. @@ -75,7 +75,7 @@ To remove specific NIM resource definitions use the AIX B command. ("nim -o =item I -Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. +Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. Currently supported attributes: @@ -114,11 +114,11 @@ The name of a NIM mksysb resource. One or more comma separated installp, emgr, or rpm packages. The packages must have prefixes of 'I:', 'E:', or 'R:', respectively. (ex. R:foo.rpm) -=item B +=item B The name of the NIM paging resource. -=item B +=item B The name of the NIM resolv_conf resource. @@ -157,7 +157,7 @@ The alternate flags to be passed along to the AIX installp command. (The default =item B The alternate flags to be passed along to the AIX rpm command. (The default for -rpm_flags is "-Uvh ".) The mknimimage command will check each rpm to see if +rpm_flags is "-Uvh ".) The mknimimage command will check each rpm to see if it is installed. It will not be reinstalled unless you specify the appropriate rpm option, such as '--replacepkgs'. @@ -167,11 +167,11 @@ The alternate flags to be passed along to the AIX emgr command. (There is no def =item B -The maximum size for a single dump image the dump resource will accept. Space is not allocated until a client starts to dump. The default size is 50GB. The dump resource should be large enough to hold the expected AIX dump and snap data. +The maximum size for a single dump image the dump resource will accept. Space is not allocated until a client starts to dump. The default size is 50GB. The dump resource should be large enough to hold the expected AIX dump and snap data. =item B -The maximum number of archived dumps for an individual client. The default is one. +The maximum number of archived dumps for an individual client. The default is one. =item B @@ -239,7 +239,7 @@ Use this option to specify that a NIM "shared_root" resource be created for the =item B<-s> I -The source of software to use when creating the new NIM lpp_source resource. This could be a source directory or a previously defined NIM lpp_source resource name. +The source of software to use when creating the new NIM lpp_source resource. This could be a source directory or a previously defined NIM lpp_source resource name. =item B<-t nimtype> @@ -319,13 +319,13 @@ Note: If you also wish to have the original lpp_source copied and defined use t mknimimage -t diskless -s 61cosi_lpp_source 611cosi tmp=mytmp home=myhome -10) Create a diskless image and update it with additional software using rpm flags and configuration files. +10) Create a diskless image and update it with additional software using rpm flags and configuration files. mknimimage -t diskless -s 61cosi_lpp_source 61dskls otherpkgs=I:fset1,R:foo.rpm,E:IZ38930TL0.120304.epkg.Z synclists=/install/mysyncfile rpm_flags="-i --nodeps" The xCAT osimage definition created by this command will include the "otherpkgs" and "synclists" values. The NIM SPOT resource associated with this osimage will be updated with the additional software using rpm flags "-i --nodeps" and configuration files. -11) Update an existing diskless image (AIX/NIM SPOT) using the information saved in the xCAT "61dskls" osimage definition. Also specify verbose messages. +11) Update an existing diskless image (AIX/NIM SPOT) using the information saved in the xCAT "61dskls" osimage definition. Also specify verbose messages. mknimimage -V -u 61dskls @@ -335,7 +335,7 @@ The xCAT osimage definition created by this command will include the "otherpkgs" Note that when "installp_bundle", "otherpkgs", or "synclists" values are specified with the "-u" option then the xCAT osimage definition is not used or updated. -13) Update an existing image to support NFSv4. Also specify verbose messages. +13) Update an existing image to support NFSv4. Also specify verbose messages. mknimimage -V -u 61dskls nfs_vers=4 From 65ddb00a485d83940702804a15bf8a285de84af8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0866/1681] Remove trailing spaces in file xCAT-client/pods/man1/mkvm.1.pod --- xCAT-client/pods/man1/mkvm.1.pod | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/xCAT-client/pods/man1/mkvm.1.pod b/xCAT-client/pods/man1/mkvm.1.pod index fd98f4525..aeda27df6 100644 --- a/xCAT-client/pods/man1/mkvm.1.pod +++ b/xCAT-client/pods/man1/mkvm.1.pod @@ -42,7 +42,7 @@ B I [I] [B I] =head2 For PPC (with HMC) specific: -The first form of B command creates new partition(s) with the same profile/resources as the partition specified by I. The -i and I specify the starting numeric partition number and the I for the newly created partitions, respectively. The LHEA port numbers and the HCA index numbers will be automatically increased if they are defined in the source partition. +The first form of B command creates new partition(s) with the same profile/resources as the partition specified by I. The -i and I specify the starting numeric partition number and the I for the newly created partitions, respectively. The LHEA port numbers and the HCA index numbers will be automatically increased if they are defined in the source partition. The second form of this command duplicates all the partitions from the source specified by I to the destination specified by I. The source and destination CECs can be managed by different HMCs. @@ -58,7 +58,7 @@ If no option is specified, a partition using the parameters specified with attri =head2 For KVM and VMware: -The B command creates new virtual machine(s) with the I size of hard disk, I size of memory and I number of cpu. +The B command creates new virtual machine(s) with the I size of hard disk, I size of memory and I number of cpu. =head2 For zVM: @@ -70,11 +70,11 @@ The second form of this creates a new virtual machine with the same profile/reso =over 10 -=item B<-h|--help> +=item B<-h|--help> Display usage message. -=item B<-c> +=item B<-c> The cec (fsp) name for the destination. @@ -82,13 +82,13 @@ The cec (fsp) name for the destination. The cpu count which will be created for the kvm/vmware virtual machine. -=item B<--full> +=item B<--full> Request to create a new full system partition for each CEC. =item B I B I B I B I B I B I [B<--vios>] -To specify the parameters which are used to create a partition. The I, I are necessary, and the value specified with this command have a more high priority. If the value of any of the three options is not specified, the corresponding value specified for the node object will be used. If any of the three attributes is neither specified with this command nor specified with the node object, error information will be returned. To reference to L for more information about 'drc_index' for I. +To specify the parameters which are used to create a partition. The I, I are necessary, and the value specified with this command have a more high priority. If the value of any of the three options is not specified, the corresponding value specified for the node object will be used. If any of the three attributes is neither specified with this command nor specified with the node object, error information will be returned. To reference to L for more information about 'drc_index' for I. The option I is used to specify the partition that will be created is a VIOS partition. If specified, the value for I shall be number which indicate the number of vSCSI server adapter will be created, and if no value specified for I, all the physical slot of the power machine will be asigned to VIOS partition. If not specified, it shall be in form of I to specify the vios and the virtual slot id of the vSCSI server adapter that will be connected from the Logical partition. @@ -96,11 +96,11 @@ The option I is used to specify the partition that will be created is a VI If the storage already exists, remove it before creating a new virtual machine. -=item B<-i> +=item B<-i> -Starting numeric id of the newly created partitions. +Starting numeric id of the newly created partitions. -=item B<-l> +=item B<-l> The partition name of the source. @@ -108,7 +108,7 @@ The partition name of the source. The memory size which will be used for the new created kvm/vmware virtual machine. Unit is Megabyte. -=item B<-p> +=item B<-p> The file that contains the profiles for the source partitions. @@ -116,11 +116,11 @@ The file that contains the profiles for the source partitions. The size of storage which will be created for the kvm/vmware virtual machine. -=item B<-v|--version> +=item B<-v|--version> Command Version. -=item B<-V|--verbose> +=item B<-V|--verbose> Verbose output. @@ -198,7 +198,7 @@ Output is similar to: 5. To create a new zVM virtual machine (gpok3) based on a directory entry: mkvm gpok3 /tmp/dirEntry.txt - + Output is similar to: gpok3: Creating user directory entry for LNX3... Done @@ -242,11 +242,11 @@ First, define a node object: mkdef -t node -o lpar1 mgt=fsp cons=fsp nodetype=ppc,osi id=1 hcp=cec parent=cec hwtype=lpar groups=lpar,all Then, create the partition on the specified cec. - + mkvm lpar1 --full The output is similar to: - + lpar1: Done To query the resources allocated to node 'lpar1' @@ -274,7 +274,7 @@ The output is similar to: lpar1: 256. -Note: The 'parent' attribute for node 'lpar1' is the object name of physical power machine that the full partition will be created on. +Note: The 'parent' attribute for node 'lpar1' is the object name of physical power machine that the full partition will be created on. 9. To create a partition using some of the resources on normal power machine. @@ -285,7 +285,7 @@ After a node object is defined, the resources that will be used for the partitio chdef lpar1 vmcpus=1/4/16 vmmemory=1G/4G/32G vmphyslots=0x21010201,0x21010200 vmothersetting=bsr:128,hugepage:2 Then, create the partion on the specified cec. - + mkvm lpar1 Option 2: @@ -295,7 +295,7 @@ Option 2: The outout is similar to: lpar1: Done - + Note: The 'vmplyslots' specify the drc index of the physical slot device. Every drc index shall be delimited with ','. The 'vmothersetting' specify two kinds of resource, bsr(Barrier Synchronization Register) specified the num of BSR arrays, hugepage(Huge Page Memory) specified the num of huge pages. To query the resources allocated to node 'lpar1' From 0a9977ad548c67d2d847f7e3978253777d779f3f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0867/1681] Remove trailing spaces in file xCAT-client/pods/man1/mkzone.1.pod --- xCAT-client/pods/man1/mkzone.1.pod | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/xCAT-client/pods/man1/mkzone.1.pod b/xCAT-client/pods/man1/mkzone.1.pod index 78cbad0f1..9480b92b5 100644 --- a/xCAT-client/pods/man1/mkzone.1.pod +++ b/xCAT-client/pods/man1/mkzone.1.pod @@ -1,10 +1,10 @@ =head1 B -B - Defines a new zone in the cluster. +B - Defines a new zone in the cluster. =head1 B -B I [B<--defaultzone>] [B<-k> I] [B<-a> I] [B<-g>] [B<-f>] [B<-s> I<{yes|no}>] [B<-V>] +B I [B<--defaultzone>] [B<-k> I] [B<-a> I] [B<-g>] [B<-f>] [B<-s> I<{yes|no}>] [B<-V>] B [B<-h> | B<-v>] @@ -12,20 +12,20 @@ B [B<-h> | B<-v>] The B command is designed to divide the xCAT cluster into multiple zones. The nodes in each zone will share common root ssh keys. This allows the nodes in a zone to be able to as root ssh to each other without password, but cannot do the same to any node in another zone. All zones share a common xCAT Management Node and database including the site table, which defines the attributes of the entire cluster. The mkzone command is only supported on Linux ( No AIX support). -The nodes are not updated with the new root ssh keys by mkzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. +The nodes are not updated with the new root ssh keys by mkzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. =head1 B =over 5 -=item B<-h>|B<--help> +=item B<-h>|B<--help> -Displays usage information. +Displays usage information. -=item B<-v>|B<--version> +=item B<-v>|B<--version> -Displays command version and build date. +Displays command version and build date. =item B<-k | --sshkeypath> I @@ -37,7 +37,7 @@ If -f is not used, then it will generate a set of root ssh keys for the zone an if --defaultzone is input, then it will set the zone defaultzone attribute to yes; otherwise it will set to no. if --defaultzone is input and another zone is currently the default, then the -f flag must be used to force a change to the new defaultzone. -If -f flag is not use an error will be returned and no change made. +If -f flag is not use an error will be returned and no change made. Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. =item B<-a | --addnoderange> I @@ -49,13 +49,13 @@ it will add the group name "zonename" to each node in the noderange. =item B<-s| --sshbetweennodes> B If -s entered, the zone sshbetweennodes attribute will be set to yes or no. It defaults to yes. When this is set to yes, then ssh will be setup -to allow passwordless root access between nodes. If no, then root will be prompted for a password when running ssh between the nodes in the zone. +to allow passwordless root access between nodes. If no, then root will be prompted for a password when running ssh between the nodes in the zone. -=item B<-f | --force> +=item B<-f | --force> Used with the (--defaultzone) flag to override the current default zone. -=item B<-g | --assigngroup> +=item B<-g | --assigngroup> Used with the (-a) flag to create the group zonename for all nodes in the input noderange. @@ -74,7 +74,7 @@ To make a new zone1 using defaults, enter: mkzone zone1 -Note: with the first B, you will automatically get the xcatdefault zone created as the default zone. This zone uses ssh keys from /.ssh directory. +Note: with the first B, you will automatically get the xcatdefault zone created as the default zone. This zone uses ssh keys from /.ssh directory. =item 2. To make a new zone2 using defaults and make it the default zone enter: @@ -85,7 +85,7 @@ To make a new zone2 using defaults and make it the default zone enter: To make a new zone2A using the ssh id_rsa private key in /root/.ssh: - mkzone zone2A -k /root/.ssh + mkzone zone2A -k /root/.ssh =item 4. From ef483f2127f21da5de2e1744ec3c39a9f1788eda Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0868/1681] Remove trailing spaces in file xCAT-client/pods/man1/moncfg.1.pod --- xCAT-client/pods/man1/moncfg.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/moncfg.1.pod b/xCAT-client/pods/man1/moncfg.1.pod index 47a3bba3a..6cf105231 100644 --- a/xCAT-client/pods/man1/moncfg.1.pod +++ b/xCAT-client/pods/man1/moncfg.1.pod @@ -15,7 +15,7 @@ B I I<[noderange]> B<[-r|--remote]> =head1 DESCRIPTION -This command is used to configure a 3rd party monitoring software to monitor the xCAT cluster. For example, it modifies the configuration file for the monitoring software so that the nodes can be included in the monitoring domain. The operation is performed on the management node and the service nodes of the given nodes. The operation will also be performed on the nodes if the I<-r> option is specified, though the configuration of the nodes is usually performed during the node deployment stage. +This command is used to configure a 3rd party monitoring software to monitor the xCAT cluster. For example, it modifies the configuration file for the monitoring software so that the nodes can be included in the monitoring domain. The operation is performed on the management node and the service nodes of the given nodes. The operation will also be performed on the nodes if the I<-r> option is specified, though the configuration of the nodes is usually performed during the node deployment stage. =head1 Parameters From dccf145d4b22e3ebb99ac6a8c74c17fe8396dc54 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0869/1681] Remove trailing spaces in file xCAT-client/pods/man1/mondecfg.1.pod --- xCAT-client/pods/man1/mondecfg.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/mondecfg.1.pod b/xCAT-client/pods/man1/mondecfg.1.pod index 6f7ccc753..0a0b4b095 100644 --- a/xCAT-client/pods/man1/mondecfg.1.pod +++ b/xCAT-client/pods/man1/mondecfg.1.pod @@ -15,7 +15,7 @@ B I I<[noderange]> B<[-r|--remote]> =head1 DESCRIPTION -This command is used to deconfigure a 3rd party monitoring software from monitoring the xCAT cluster. The operation is performed on the management node and the service nodes of the given nodes. The operation will also be performed on the nodes if the I<-r> option is specified. The deconfiguration operation will remove the nodes from the 3rd party software's monitoring domain. +This command is used to deconfigure a 3rd party monitoring software from monitoring the xCAT cluster. The operation is performed on the management node and the service nodes of the given nodes. The operation will also be performed on the nodes if the I<-r> option is specified. The deconfiguration operation will remove the nodes from the 3rd party software's monitoring domain. =head1 PARAMETERS From 87cbef1a868b9420a6c34d461b34a8e40ab91621 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0870/1681] Remove trailing spaces in file xCAT-client/pods/man1/monrm.1.pod --- xCAT-client/pods/man1/monrm.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/monrm.1.pod b/xCAT-client/pods/man1/monrm.1.pod index d535317b9..21029500c 100644 --- a/xCAT-client/pods/man1/monrm.1.pod +++ b/xCAT-client/pods/man1/monrm.1.pod @@ -17,7 +17,7 @@ This command is used to unregister a monitoring plug-in module from the I is the name of the monitoring plug-in module in the I table. Use I command to list all the monitoring plug-in modules that can be used. +I is the name of the monitoring plug-in module in the I table. Use I command to list all the monitoring plug-in modules that can be used. =head1 OPTIONS From 65d92681fc2df225dbdfd4b3abc7178f3bdfa191 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0871/1681] Remove trailing spaces in file xCAT-client/pods/man1/monshow.1.pod --- xCAT-client/pods/man1/monshow.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/monshow.1.pod b/xCAT-client/pods/man1/monshow.1.pod index c3aa85385..454f32d50 100755 --- a/xCAT-client/pods/man1/monshow.1.pod +++ b/xCAT-client/pods/man1/monshow.1.pod @@ -19,7 +19,7 @@ This command displays the events that happened on the given nodes or the monitor =head1 PARAMETERS -I is the name of the monitoring plug-in module to be invoked. +I is the name of the monitoring plug-in module to be invoked. I is a list of nodes to be showed for. If omitted, the data for all the nodes will be displayed. @@ -30,15 +30,15 @@ B<-h | --help> Display usage message. B<-v | --version> Command Version. -B<-s> shows the summary data. +B<-s> shows the summary data. B<-t> specifies a range of time for the data, The default is last 60 minutes. For example -t 6-4, it will display the data from last 6 minutes to 4 minutes; If it is -t 6, it will display the data from last 6 minutes until now. -B<-a> specifies a comma-separated list of attributes or metrics names. The default is all. +B<-a> specifies a comma-separated list of attributes or metrics names. The default is all. B<-w> specify one or multiple selection string that can be used to select events. The operators ==, !=, =,!,>,<,>=,<= are available. Wildcards % and _ are supported in the pattern string. % allows you to match any string of any length(including zero length) and _ allows you to match on a single character. The valid attributes are eventtype, monitor, monnode, application, component, id, severity, message, rawdata, comments. Valid severity are: Informational, Warning, Critical. -Operator descriptions: +Operator descriptions: =over 10 From f74e7b7b11c42b2583de54558352855f190bfa90 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0872/1681] Remove trailing spaces in file xCAT-client/pods/man1/mysqlsetup.1.pod --- xCAT-client/pods/man1/mysqlsetup.1.pod | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/xCAT-client/pods/man1/mysqlsetup.1.pod b/xCAT-client/pods/man1/mysqlsetup.1.pod index ba0984a2b..021a972a9 100644 --- a/xCAT-client/pods/man1/mysqlsetup.1.pod +++ b/xCAT-client/pods/man1/mysqlsetup.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Sets up the MySQL or MariaDB database for xCAT to use. +B - Sets up the MySQL or MariaDB database for xCAT to use. =head1 SYNOPSIS @@ -13,17 +13,17 @@ B {B<-i>|B<--init>} [B<-f>|B<--hostfile>] [B<-o>|B<--odbc>] [B<-L>|B B {B<-u>|B<--update>} [B<-f>|B<--hostfile>] [B<-o>|B<--odbc>] [B<-L>|B<--LL>] [B<-V>|B<--verbose>] -B {B<-o>|B<--odbc>} [B<-V>|B<--verbose>] +B {B<-o>|B<--odbc>} [B<-V>|B<--verbose>] -B {B<-L>|B<--LL>} [B<-V>|B<--verbose>] +B {B<-L>|B<--LL>} [B<-V>|B<--verbose>] =head1 DESCRIPTION -B - Sets up the MySQL or MariaDB database (linux only for MariaDB) for xCAT to use. The mysqlsetup script is run on the Management Node as root after the MySQL code or MariaDB code has been installed. Before running the init option, the MySQL server should be stopped, if it is running. The xCAT daemon, xcatd, must be running, do not stop it. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to MySQL or MariaDB and restarting the xcatd daemon as well as the MySQL daemon. For full information on all the steps that will be done, read the "Configure MySQL and Migrate xCAT Data to MySQL" sections in +B - Sets up the MySQL or MariaDB database (linux only for MariaDB) for xCAT to use. The mysqlsetup script is run on the Management Node as root after the MySQL code or MariaDB code has been installed. Before running the init option, the MySQL server should be stopped, if it is running. The xCAT daemon, xcatd, must be running, do not stop it. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to MySQL or MariaDB and restarting the xcatd daemon as well as the MySQL daemon. For full information on all the steps that will be done, read the "Configure MySQL and Migrate xCAT Data to MySQL" sections in B -Two passwords must be supplied for the setup, a password for the xcatadmin id and a password for the root id in the MySQL database. These will be prompted for interactively, unless the environment variables XCATMYSQLADMIN_PW and XCATMYSQLROOT_PW are set to the passwords for the xcatadmin id and root id in the database,resp. +Two passwords must be supplied for the setup, a password for the xcatadmin id and a password for the root id in the MySQL database. These will be prompted for interactively, unless the environment variables XCATMYSQLADMIN_PW and XCATMYSQLROOT_PW are set to the passwords for the xcatadmin id and root id in the database,resp. Note below we refer to MySQL but it works the same for MariaDB. @@ -45,16 +45,16 @@ Displays verbose messages. =item B<-i|--init> -The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed. This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server. It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database. -On AIX, it additionally setup the mysql id and group and corrects the permissions in the MySQL install directories. For AIX, you should be using the MySQL rpms available from the xCAT website. For Linux, you should use the MySQL or MariaDB rpms shipped with the OS. You can chose the -f and/or the -o option, to run after the init. +The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed. This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server. It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database. +On AIX, it additionally setup the mysql id and group and corrects the permissions in the MySQL install directories. For AIX, you should be using the MySQL rpms available from the xCAT website. For Linux, you should use the MySQL or MariaDB rpms shipped with the OS. You can chose the -f and/or the -o option, to run after the init. =item B<-u|--update> -To run the update option, you must first have run the -i option and have xcat successfully running on the MySQL database. You can chose the -f and/or the -o option, to update. +To run the update option, you must first have run the -i option and have xcat successfully running on the MySQL database. You can chose the -f and/or the -o option, to update. =item B<-f|--hostfile> -This option runs during update, it will take all the host from the input file (provide a full path) and give them database access to the xcatdb in MySQL for the xcatadmin id. Wildcards and ipaddresses may be used. xCAT must have been previously successfully setup to use MySQL. xcatadmin and MySQL root password are required. +This option runs during update, it will take all the host from the input file (provide a full path) and give them database access to the xcatdb in MySQL for the xcatadmin id. Wildcards and ipaddresses may be used. xCAT must have been previously successfully setup to use MySQL. xcatadmin and MySQL root password are required. =item B<-o|--odbc> @@ -64,7 +64,7 @@ Setting_Up_MySQL_as_the_xCAT_DB =item B<-L|--LL> -Additional database configuration specifically for the LoadLeveler product. +Additional database configuration specifically for the LoadLeveler product. See "Add ODBC Support" in Setting_Up_MySQL_as_the_xCAT_DB @@ -78,7 +78,7 @@ Setting_Up_MySQL_as_the_xCAT_DB B - the password for the xcatadmin id that will be assigned in the MySQL database. =item * -B - the password for the root id that will be assigned to the MySQL root id, if the script creates it. The password to use to run MySQL command to the database as the MySQL root id. This password may be different than the unix root password on the Management Node. +B - the password for the root id that will be assigned to the MySQL root id, if the script creates it. The password to use to run MySQL command to the database as the MySQL root id. This password may be different than the unix root password on the Management Node. =back @@ -105,13 +105,13 @@ Where the file contains a host per line, for example: 10.%.%.% nodex.cluster.net -=item 3. +=item 3. To setup the ODBC for MySQL xcatdb database access : mysqlsetup -o -=item 4. +=item 4. To setup MySQL for xCAT and add hosts from /tmp/xcat/hostlist and setup the ODBC in Verbose mode: From 6a48984aa4366e91eb65d808bb47c9acd6a8b771 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0873/1681] Remove trailing spaces in file xCAT-client/pods/man1/nimnodecust.1.pod --- xCAT-client/pods/man1/nimnodecust.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/nimnodecust.1.pod b/xCAT-client/pods/man1/nimnodecust.1.pod index 93cba2a36..63147672b 100644 --- a/xCAT-client/pods/man1/nimnodecust.1.pod +++ b/xCAT-client/pods/man1/nimnodecust.1.pod @@ -10,7 +10,7 @@ B I [B<-p> I] [B<-b> I") @@ -26,7 +26,7 @@ A bundle file contains a list of package names. The RPMs must have a prefix of I:openssh.base I:openssh.license -To create a NIM installp_bundle definition you can use the "nim -o define" operation. For example, to create a definition called "mypackages" for a bundle file located at "/install/nim/mypkgs.bnd" you could issue the following command. +To create a NIM installp_bundle definition you can use the "nim -o define" operation. For example, to create a definition called "mypackages" for a bundle file located at "/install/nim/mypkgs.bnd" you could issue the following command. nim -o define -t installp_bundle -a server=master -a location=/install/nim/mypkgs.bnd mypackages @@ -41,7 +41,7 @@ The xCAT nimnodecust command will automatically handle the distribution of the p =item I Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. These are used to specify -additional values that can be passed to the underlying NIM commands, ("nim -o cust..."). See the NIM documentation for valid "nim" command line options. +additional values that can be passed to the underlying NIM commands, ("nim -o cust..."). See the NIM documentation for valid "nim" command line options. =item B<-b> I @@ -79,7 +79,7 @@ An error has occurred. =head1 EXAMPLES -1) Install the installp package "openssh.base.server" on an xCAT node named "node01". Assume that the package has been copied to the NIM lpp_source resource called "61lppsource". +1) Install the installp package "openssh.base.server" on an xCAT node named "node01". Assume that the package has been copied to the NIM lpp_source resource called "61lppsource". nimnodecust -s 61lppsource -p openssh.base.server node01 From dacb5ea40e335915cd50dc618a7d237a1fa502b0 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0874/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodech.1.pod --- xCAT-client/pods/man1/nodech.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/nodech.1.pod b/xCAT-client/pods/man1/nodech.1.pod index 468e20c63..c98b3cc57 100644 --- a/xCAT-client/pods/man1/nodech.1.pod +++ b/xCAT-client/pods/man1/nodech.1.pod @@ -23,7 +23,7 @@ there. If "^=" is used, the specified value will be removed from the attribute' if it is there. You can also use "^=" and ",=" in the same command to essentially replace one item in the list with another. (See the Examples section.) -Additionally, as in nodels, boolean expressions can be used to further limit the scope of nodech from +Additionally, as in nodels, boolean expressions can be used to further limit the scope of nodech from the given noderange. The operators supported are the same as nodels (=~, !~, ==, and !=). With these operators in mind, the unambiguous assignment operator is '=@'. If you need, for example, to set From 86bd99bc2911469c51ab7c3fbe25daa1deacc3d1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0875/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodechprofile.1.pod --- xCAT-client/pods/man1/nodechprofile.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/nodechprofile.1.pod b/xCAT-client/pods/man1/nodechprofile.1.pod index 39e741220..76ac04a7e 100644 --- a/xCAT-client/pods/man1/nodechprofile.1.pod +++ b/xCAT-client/pods/man1/nodechprofile.1.pod @@ -38,11 +38,11 @@ The nodes to be removed. B I -Sets the new image profile name used by the node, where is the new image profile. An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name. +Sets the new image profile name used by the node, where is the new image profile. An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name. B I -Sets the new network profile name used by the node, where is the new network profile. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name. +Sets the new network profile name used by the node, where is the new network profile. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name. B I @@ -56,7 +56,7 @@ Sets the new hardware profile name used by the node, where is =head1 EXAMPLES -=over 2 +=over 2 =item 1. To change the image profile to rhels6.3_packaged for compute nodes compute-000 and compute-001, use the following command: @@ -68,7 +68,7 @@ To change all of the profiles for compute node compute-000, enter the following nodechprofile compute-000 imageprofile=rhels6.3_packaged networkprofile=default_cn hardwareprofile=default_ipmi -=back +=back =head1 SEE ALSO From 668b6f212b784ed1535e728e0dadcb42893e9961 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0876/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodediscoverdef.1.pod --- xCAT-client/pods/man1/nodediscoverdef.1.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-client/pods/man1/nodediscoverdef.1.pod b/xCAT-client/pods/man1/nodediscoverdef.1.pod index 162484dce..e004c391c 100644 --- a/xCAT-client/pods/man1/nodediscoverdef.1.pod +++ b/xCAT-client/pods/man1/nodediscoverdef.1.pod @@ -1,7 +1,7 @@ =head1 NAME -B - Define the undefined discovery request to a predefined xCAT node, -or clean up the discovery entries from the discoverydata table +B - Define the undefined discovery request to a predefined xCAT node, +or clean up the discovery entries from the discoverydata table (which can be displayed by nodediscoverls command) =head1 SYNOPSIS @@ -21,7 +21,7 @@ xCAT node. The discovery entry can be displayed by B command. The options B<-u> and B<-n> have to be used together to define a discovery request to a node. -The B command also can be used to clean up the discovery entries from the +The B command also can be used to clean up the discovery entries from the discoverydata table. The option B<-r> is used to remove discovery entries. If working with B<-u>, the specific entry From 48689d5cb150396fa16cb3994d2b2eaf85b48cbd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0877/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodediscoverls.1.pod --- xCAT-client/pods/man1/nodediscoverls.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/nodediscoverls.1.pod b/xCAT-client/pods/man1/nodediscoverls.1.pod index bde7b37e0..7dedbab91 100644 --- a/xCAT-client/pods/man1/nodediscoverls.1.pod +++ b/xCAT-client/pods/man1/nodediscoverls.1.pod @@ -4,7 +4,7 @@ B - List the discovered nodes =head1 SYNOPSIS -B [B<-t seq>|B|B|B|B|B|B] [B<-l>] +B [B<-t seq>|B|B|B|B|B|B] [B<-l>] B [B<-u> I] [B<-l>] From 4d2bc2857a7b68dd28dcb625b3403ec4fedeca60 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0878/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodediscoverstart.1.pod --- xCAT-client/pods/man1/nodediscoverstart.1.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-client/pods/man1/nodediscoverstart.1.pod b/xCAT-client/pods/man1/nodediscoverstart.1.pod index 4e3b98d37..ab1bde74b 100755 --- a/xCAT-client/pods/man1/nodediscoverstart.1.pod +++ b/xCAT-client/pods/man1/nodediscoverstart.1.pod @@ -98,7 +98,7 @@ Sets the node groups that the discovered nodes should be put in for either the S =item BI> Sets the rack name where the node is located for either the Sequential Discovery or Profile Discovery methods. - + =item BI Sets the chassis name that the Blade server or PureFlex blade is located in, for either the Sequential Discovery or Profile Discovery methods. This option is used for the Blade server and PureFlex system only. You cannot specify this option with the rack option. @@ -121,11 +121,11 @@ Specifies the osimage name that will be associated with the new discovered node, =item B<-n|--dns> -Specifies to run makedns for any new discovered node. This is useful mainly for non-predefined configuration, before running the "nodediscoverstart -n", the user needs to run makedns -n to initialize the named setup on the management node. +Specifies to run makedns for any new discovered node. This is useful mainly for non-predefined configuration, before running the "nodediscoverstart -n", the user needs to run makedns -n to initialize the named setup on the management node. =item B<-s|--skipbmcsetup> -Specifies to skip the bmcsetup during the sequential discovery process, if the bmciprange is specified with nodediscoverstart command, the BMC will be setup automatically during the discovery process, if the user does not want to run bmcsetup, could specify the "-s|--skipbmcsetup" with nodediscoverstart command to skip the bmcsetup. +Specifies to skip the bmcsetup during the sequential discovery process, if the bmciprange is specified with nodediscoverstart command, the BMC will be setup automatically during the discovery process, if the user does not want to run bmcsetup, could specify the "-s|--skipbmcsetup" with nodediscoverstart command to skip the bmcsetup. =item B<-V|--verbose> From aae1aad2db33b3c82d15b69958513e4109a5c692 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0879/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodediscoverstatus.1.pod --- xCAT-client/pods/man1/nodediscoverstatus.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/nodediscoverstatus.1.pod b/xCAT-client/pods/man1/nodediscoverstatus.1.pod index f65597e40..ad198860a 100644 --- a/xCAT-client/pods/man1/nodediscoverstatus.1.pod +++ b/xCAT-client/pods/man1/nodediscoverstatus.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - gets the node discovery process status +B - gets the node discovery process status =head1 SYNOPSIS @@ -31,7 +31,7 @@ Command Version. To determine if there are some nodes discovered and the discovered nodes' status, enter the following command: - nodediscoverstatus + nodediscoverstatus =head1 SEE ALSO From 32fec089306167483ea4e0a91f8be21d608f812f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0880/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodediscoverstop.1.pod --- xCAT-client/pods/man1/nodediscoverstop.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/nodediscoverstop.1.pod b/xCAT-client/pods/man1/nodediscoverstop.1.pod index b8ce5b563..e0e6fdae3 100644 --- a/xCAT-client/pods/man1/nodediscoverstop.1.pod +++ b/xCAT-client/pods/man1/nodediscoverstop.1.pod @@ -30,7 +30,7 @@ Command Version. =head1 EXAMPLES - nodediscoverstop + nodediscoverstop =head1 SEE ALSO From 82251b778343a4386e33a0756569fcb27d3c0011 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0881/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodegrpch.1.pod --- xCAT-client/pods/man1/nodegrpch.1.pod | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-client/pods/man1/nodegrpch.1.pod b/xCAT-client/pods/man1/nodegrpch.1.pod index 0f65922a9..8475b0565 100644 --- a/xCAT-client/pods/man1/nodegrpch.1.pod +++ b/xCAT-client/pods/man1/nodegrpch.1.pod @@ -15,11 +15,11 @@ B [B<-?> | B<-h> | B<--help>] =head1 DESCRIPTION The nodegrpch command is similar to the nodech command, but ensures that the parameters are -declared at the group level rather than the node specific level, and clears conflicting node -specific overrides of the specified groups. Using table.column=value will do a -verbatim assignment. If ",=" is used instead of "=", the specified value will be prepended to the -attribute's comma separated list, if it is not already there. If "^=" is used, the specified -value will be removed from the attribute's comma separated list, if it is there. You can also +declared at the group level rather than the node specific level, and clears conflicting node +specific overrides of the specified groups. Using table.column=value will do a +verbatim assignment. If ",=" is used instead of "=", the specified value will be prepended to the +attribute's comma separated list, if it is not already there. If "^=" is used, the specified +value will be removed from the attribute's comma separated list, if it is there. You can also use "^=" and ",=" in the same command to essentially replace one item in the list with another. (See the Examples section.) From 568016956e8f6ce5bd0ce84cfb6fb812c8a28ee4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0882/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodeimport.1.pod --- xCAT-client/pods/man1/nodeimport.1.pod | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xCAT-client/pods/man1/nodeimport.1.pod b/xCAT-client/pods/man1/nodeimport.1.pod index 2c3b670f7..b471eb436 100644 --- a/xCAT-client/pods/man1/nodeimport.1.pod +++ b/xCAT-client/pods/man1/nodeimport.1.pod @@ -74,7 +74,7 @@ To import nodes using a profile, follow the following steps: "__NetworkProfile_default_mn","static","static",,,, "__NetworkProfile_default_cn","static",,,,, "__ImageProfile_rhels6.2-x86_64-install-compute","static","static",,,, - + # lsdef -t group __NetworkProfile_default_cn Object name: __NetworkProfile_default_cn grouptype=static @@ -86,9 +86,9 @@ To import nodes using a profile, follow the following steps: nictypes=eth0:Ethernet primarynic=eth0 -2. Prepare a node information file. +2. Prepare a node information file. - Example of a node information file, a blade and a rack server defined: + Example of a node information file, a blade and a rack server defined: # hostinfo begin # This entry defines a blade. __hostname__: @@ -116,7 +116,7 @@ To import nodes using a profile, follow the following steps: slotid=1 # hostinfo end. - Example of a node information file, a switch auto discovery node defined: + Example of a node information file, a switch auto discovery node defined: # hostinfo begin # This entry defines a blade. __hostname__: @@ -128,15 +128,15 @@ To import nodes using a profile, follow the following steps: __hostname__: mac=b8:ac:6f:37:59:28 cec=mycec - + __hostname__: mac=b8:ac:6f:37:59:28 cec=mycec lparid=2 # Node information file ends. - + Example of a node information file that specifies a PowerKVM Guest node that uses KVM management: - + # Node information file begins # This entry defines a PowerKVM Guest node. # Make sure the node 'vm01' is already created on Hypervisor @@ -179,7 +179,7 @@ B> This is an optional item. Description: Lists the IP address for each network interface configuration (NIC) used by the node, excluding the provisioning network, where is in the form !,!,.... For example, if you have 2 network interfaces configured, the nicips attribute should list both network interfaces: nicips=eth1!10.10.10.11,bmc!192.168.10.3. If the nicips attribute is not specified, the IP addresses are generated automatically according to the network profile. -B> This is an optional item. +B> This is an optional item. Description: node location info. Specify the rack name which this node will be placed into. If not specify this item, there will be no node location info set for this node. this item must be specified together with height + unit. @@ -197,7 +197,7 @@ Description: node location info, for rack server only. Specify the node's start B> This is a mandatory option for defining PowerKVM Guest nodes. -Description: Specifies the vmhost of a Power KVM Guest node, where is the host name of PowerKVM Hypervisior. +Description: Specifies the vmhost of a Power KVM Guest node, where is the host name of PowerKVM Hypervisior. 3. Import the nodes, by using the following commands. Note: If we want to import PureFlex X/P nodes, hardware profile must be set to a PureFlex hardware type. From 0e9d35c75d5d072575a3ad6cb5b6b533dc53a128 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0883/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodels.1.pod --- xCAT-client/pods/man1/nodels.1.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-client/pods/man1/nodels.1.pod b/xCAT-client/pods/man1/nodels.1.pod index e3e76cd58..ca6d61a70 100644 --- a/xCAT-client/pods/man1/nodels.1.pod +++ b/xCAT-client/pods/man1/nodels.1.pod @@ -4,7 +4,7 @@ B - lists the nodes, and their attributes, from the xCAT database. =head1 SYNOPSIS -B [I] [B<-b> | B<--blame>] [B<-H> | B<--with-fieldname>] [B<-S>] [I | I] [I<...>] +B [I] [B<-b> | B<--blame>] [B<-H> | B<--with-fieldname>] [B<-S>] [I | I] [I<...>] B [I] [B<-H> | B<--with-fieldname>] [I] @@ -34,7 +34,7 @@ nodehm.mgt =back -nodels can also select based on table value criteria. The following operators are available: +nodels can also select based on table value criteria. The following operators are available: =over 15 @@ -77,7 +77,7 @@ Force display of table name and column name context for each result For values inherited from groups, display which groups provided the inheritance -=item B<-S> +=item B<-S> List all the hidden nodes (FSP/BPA nodes) with other ones. From 37ee1dbc7e154ae880bc25f0ab7f163684200ad5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0884/1681] Remove trailing spaces in file xCAT-client/pods/man1/nodestat.1.pod --- xCAT-client/pods/man1/nodestat.1.pod | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xCAT-client/pods/man1/nodestat.1.pod b/xCAT-client/pods/man1/nodestat.1.pod index e7a82a232..d2b4ecdbe 100644 --- a/xCAT-client/pods/man1/nodestat.1.pod +++ b/xCAT-client/pods/man1/nodestat.1.pod @@ -24,9 +24,9 @@ By default, it works as following: When -m is specified and there are settings in the monsetting table, it displays the status of the applications specified in the monsetting table. When -p is specified it shows the power status for the nodes that are not pingable. When -u is specified it saves the status info into the xCAT database. Node's pingable status and deployment status is saved in the nodelist.status column. Node's application status is saved in the nodelist.appstatus column. -To specify settings in the B table, use 'xcatmon' as the name, 'apps' as the key and the value will be a list of comma separated list of application names. For each application, you can specify the port number that can be queried on the nodes to get the running status. Or you can specify a command that can be called to get the node status from. The command can be a command that can be run locally at the management node or the service node for hierarchical cluster, or a command that can be run remotely on the nodes. +To specify settings in the B table, use 'xcatmon' as the name, 'apps' as the key and the value will be a list of comma separated list of application names. For each application, you can specify the port number that can be queried on the nodes to get the running status. Or you can specify a command that can be called to get the node status from. The command can be a command that can be run locally at the management node or the service node for hierarchical cluster, or a command that can be run remotely on the nodes. -The following is an example of the settings in the B table: +The following is an example of the settings in the B table: name key value xcatmon apps ssh,ll,gpfs,someapp @@ -38,10 +38,10 @@ The following is an example of the settings in the B table: Keywords to use: apps -- a list of comma separated application names whose status will be queried. For how to get the status of each app, look for app name in the key field in a different row. - port -- the application daemon port number, if not specified, use internal list, then /etc/services. + port -- the application daemon port number, if not specified, use internal list, then /etc/services. group -- the name of a node group that needs to get the application status from. If not specified, assume all the nodes in the nodelist table. To specify more than one groups, use group=a,group=b format. cmd -- the command that will be run locally on mn or sn. - lcmd -- the command that will be run the mn only. + lcmd -- the command that will be run the mn only. dcmd -- the command that will be run distributed on the nodes using xdsh .... For commands specified by 'cmd' and 'lcmd', the input of is a list of comma separated node names, the output must be in the following format: @@ -50,7 +50,7 @@ For commands specified by 'cmd' and 'lcmd', the input of is a list of comma sepa node2:string2 ... -For the command specified by 'dcmd', no input is needed, the output can be a string. +For the command specified by 'dcmd', no input is needed, the output can be a string. =head1 B @@ -63,7 +63,7 @@ Uses fping instead of nmap even if nmap is available. If you seem to be having =item B<-m>|B<--usemon> -Uses the settings from the B table to determine a list of applications that need to get status for. +Uses the settings from the B table to determine a list of applications that need to get status for. =item B<-p>|B<--powerstat> @@ -71,7 +71,7 @@ Gets the power status for the nodes that are 'noping'. =item B<-u>|B<--updatedb> -Updates the status and appstatus columns of the nodelist table with the returned running status from the given nodes. +Updates the status and appstatus columns of the nodelist table with the returned running status from the given nodes. =item B<-v>|B<--version> @@ -88,7 +88,7 @@ Print help. =over 2 -=item 1. +=item 1. nodestat compute @@ -100,7 +100,7 @@ Output is similar to: node4 pbs node5 noping -=item 2. +=item 2. nodestat compute -p @@ -113,12 +113,12 @@ Output is similar to: node5 noping(Shutting down) -=item 3. +=item 3. nodestat compute -u Output is similar to: - + node1 sshd node2 sshd node3 ping @@ -126,7 +126,7 @@ Output is similar to: node5 noping -=item 4. +=item 4. nodestat compute -m From edccf72cc515361a1ba62875ac340e9ed8bc4734 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0885/1681] Remove trailing spaces in file xCAT-client/pods/man1/packimage.1.pod --- xCAT-client/pods/man1/packimage.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/packimage.1.pod b/xCAT-client/pods/man1/packimage.1.pod index 05f2cdeff..dbca7c266 100644 --- a/xCAT-client/pods/man1/packimage.1.pod +++ b/xCAT-client/pods/man1/packimage.1.pod @@ -12,9 +12,9 @@ B [B<-m>|B<--method> I] [B<-c>|B<--compress> I Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0886/1681] Remove trailing spaces in file xCAT-client/pods/man1/pasu.1.pod --- xCAT-client/pods/man1/pasu.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/pasu.1.pod b/xCAT-client/pods/man1/pasu.1.pod index cb60c5c54..3497d8ffd 100644 --- a/xCAT-client/pods/man1/pasu.1.pod +++ b/xCAT-client/pods/man1/pasu.1.pod @@ -57,7 +57,7 @@ If you want this output to be displayed, use this flag. =item B<-i|--interface> I -The hostname suffix to be appended to the node names. +The hostname suffix to be appended to the node names. =item B<-V|--verbose> From e0f707ee27f4f35121035455673cede50268c91d Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0887/1681] Remove trailing spaces in file xCAT-client/pods/man1/pgsqlsetup.1.pod --- xCAT-client/pods/man1/pgsqlsetup.1.pod | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xCAT-client/pods/man1/pgsqlsetup.1.pod b/xCAT-client/pods/man1/pgsqlsetup.1.pod index 45c736d91..20a607912 100644 --- a/xCAT-client/pods/man1/pgsqlsetup.1.pod +++ b/xCAT-client/pods/man1/pgsqlsetup.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Sets up the PostgreSQL database for xCAT to use. +B - Sets up the PostgreSQL database for xCAT to use. =head1 SYNOPSIS @@ -11,12 +11,12 @@ B {B<-v> | B<--version>} B {B<-i> | B<--init>} [B<-N> | B<--nostart>] [B<--listen> | B<-l> I
] [B<--access> | B<-a> I
] [B<-P> | B<--PCM>] [B<-o> | B<--odbc>] [B<-V> | B<--verbose>] -B {B<-o> | B<--setupODBC>} [B<-V> | B<--verbose>] +B {B<-o> | B<--setupODBC>} [B<-V> | B<--verbose>] =head1 DESCRIPTION -B - Sets up the PostgreSQL database for xCAT to use. The pgsqlsetup script is run on the Management Node as root after the PostgreSQL code has been installed. The xcatd daemon will be stopped during migration. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to PostgreSQL and restarting the xcatd daemon as well as the PostgreSQL daemon. For full information on all the steps that will be done reference -One password must be supplied for the setup, a password for the xcatadm unix id and the same password for the xcatadm database id. The password will be prompted for interactively or you can set the XCATPGPW environment variable to the password and then there will be no prompt. +B - Sets up the PostgreSQL database for xCAT to use. The pgsqlsetup script is run on the Management Node as root after the PostgreSQL code has been installed. The xcatd daemon will be stopped during migration. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to PostgreSQL and restarting the xcatd daemon as well as the PostgreSQL daemon. For full information on all the steps that will be done reference +One password must be supplied for the setup, a password for the xcatadm unix id and the same password for the xcatadm database id. The password will be prompted for interactively or you can set the XCATPGPW environment variable to the password and then there will be no prompt. =head1 OPTIONS @@ -36,9 +36,9 @@ Displays verbose messages. =item B<-i|--init> -The init option is used to setup an installed PostgreSQL database so that xCAT can use the database. This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server. It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database. +The init option is used to setup an installed PostgreSQL database so that xCAT can use the database. This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server. It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database. It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database. On AIX, it additionally setup the xcatadm unix id and the postgres id and group. For AIX, you should be using the PostgreSQL rpms available from the xCAT website. For Linux, you should use the PostgreSQL rpms shipped with the OS. You can chose the -o option, to run after the init. -To add additional nodes to access the PostgreSQL server, setup on the Management Node, use the -a option. +To add additional nodes to access the PostgreSQL server, setup on the Management Node, use the -a option. For more documentation see:Setting_Up_PostgreSQL_as_the_xCAT_DB @@ -84,7 +84,7 @@ To setup PostgreSQL for xCAT to run on the PostgreSQL xcatdb database : pgsqlsetup -i -=item 2. +=item 2. To setup the ODBC for PostgreSQL xcatdb database access : pgsqlsetup -o From 04370c91ac2eb83b92846dbc425054e0797dd9a8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0888/1681] Remove trailing spaces in file xCAT-client/pods/man1/piflash.1.pod --- xCAT-client/pods/man1/piflash.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/piflash.1.pod b/xCAT-client/pods/man1/piflash.1.pod index 2d83fbe3a..9d4752f5f 100644 --- a/xCAT-client/pods/man1/piflash.1.pod +++ b/xCAT-client/pods/man1/piflash.1.pod @@ -10,4 +10,4 @@ B --package =head1 DESCRIPTION -B Remotely applies firmware updates to servers. \ No newline at end of file +B Remotely applies firmware updates to servers. From cc467c2571d932ca9613ae19276259d3cf830a1b Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0889/1681] Remove trailing spaces in file xCAT-client/pods/man1/psh.1.pod --- xCAT-client/pods/man1/psh.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/psh.1.pod b/xCAT-client/pods/man1/psh.1.pod index 876929d88..6805a1702 100644 --- a/xCAT-client/pods/man1/psh.1.pod +++ b/xCAT-client/pods/man1/psh.1.pod @@ -19,7 +19,7 @@ Note: This command does not run through xcatd like most xCAT commands do. This means you must either run it on the management node, or have a network connection between your machine and the nodes. It does not support hierarchy, use xdsh to run remote command from the -management node to the compute node via a service node. +management node to the compute node via a service node. B arguments need to precede noderange, otherwise, you will get unexpected errors. @@ -36,7 +36,7 @@ assumes those host names have been set up to resolve to the IP address of each o =item B<-f> I Specifies a fanout value for the maximum number of concur- -rently executing remote shell processes. +rently executing remote shell processes. =item B<-l> I From f5b5f81aec5291b55b8d400899900fc7d04caee8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0890/1681] Remove trailing spaces in file xCAT-client/pods/man1/rbootseq.1.pod --- xCAT-client/pods/man1/rbootseq.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/rbootseq.1.pod b/xCAT-client/pods/man1/rbootseq.1.pod index a81eee0f0..60af1df71 100644 --- a/xCAT-client/pods/man1/rbootseq.1.pod +++ b/xCAT-client/pods/man1/rbootseq.1.pod @@ -30,7 +30,7 @@ in effect for these blades until set differently. For PPC (using Direct FSP Management) specific: B sets the ethernet (net) or hfi device as the first boot device for the specified PPC LPARs. -The B command requires that the ethernet or hfi mac address is stored in the mac table, and that the network information is correct in the networks table. +The B command requires that the ethernet or hfi mac address is stored in the mac table, and that the network information is correct in the networks table. =head1 OPTIONS From d1a3081c89b484bcf5a2ff78cd727a3201ae1799 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0891/1681] Remove trailing spaces in file xCAT-client/pods/man1/rcons.1.pod --- xCAT-client/pods/man1/rcons.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/rcons.1.pod b/xCAT-client/pods/man1/rcons.1.pod index 2cce5735b..8219b0684 100644 --- a/xCAT-client/pods/man1/rcons.1.pod +++ b/xCAT-client/pods/man1/rcons.1.pod @@ -30,8 +30,8 @@ is already open in read-write mode. The -f flag can not be used with the -s flag =item B<-s> -Open the console in read-only (spy) mode, in this mode all the escape sequences work, but all other keyboard input is -discarded. The -s flag can not be used with the -f flag. +Open the console in read-only (spy) mode, in this mode all the escape sequences work, but all other keyboard input is +discarded. The -s flag can not be used with the -f flag. =item B<-h>|B<--help> From dbb006336e8963c25ef4a3936b8796a89d59b297 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0892/1681] Remove trailing spaces in file xCAT-client/pods/man1/renergy.1.pod --- xCAT-client/pods/man1/renergy.1.pod | 198 ++++++++++++++-------------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/xCAT-client/pods/man1/renergy.1.pod b/xCAT-client/pods/man1/renergy.1.pod index 4f6db4017..18580e603 100644 --- a/xCAT-client/pods/man1/renergy.1.pod +++ b/xCAT-client/pods/man1/renergy.1.pod @@ -4,9 +4,9 @@ B - remote energy management tool =head1 B -B [B<-h> | B<--help>] +B [B<-h> | B<--help>] -B [B<-v> | B<--version>] +B [B<-v> | B<--version>] B @@ -14,7 +14,7 @@ B B I [B<-V>] {B} -B I [B<-V>] {B} +B I [B<-V>] {B} =back @@ -36,8 +36,8 @@ B I [B<-V>] {B I B<[-V] {savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ }> -I The setting operation for B server is only supported -for the server which is running in PowerVM mode. Do NOT run the setting +I The setting operation for B server is only supported +for the server which is running in PowerVM mode. Do NOT run the setting for the server which is running in OPAL mode. =back @@ -50,7 +50,7 @@ B =over 4 -B I [B<-V>] {B} +B I [B<-V>] {B} =back @@ -60,7 +60,7 @@ B B I [B<-V>] {B} -B I [B<-V>] {B} +B I [B<-V>] {B} =back @@ -112,28 +112,28 @@ B I {B} =head1 B This B command can be used to manage the energy consumption of -IBM servers which support IBM EnergyScale technology. Through this command, -user can query and set the power saving and power capping status, and also can -query the average consumed energy, the ambient and exhaust temperature, +IBM servers which support IBM EnergyScale technology. Through this command, +user can query and set the power saving and power capping status, and also can +query the average consumed energy, the ambient and exhaust temperature, the processor frequency for a server. B command supports IBM POWER6, POWER7 and POWER8 rack-mounted servers, -BladeCenter management modules, blade servers, and iDataPlex servers. +BladeCenter management modules, blade servers, and iDataPlex servers. For I and I rack-mounted servers, the following specific hardware types are supported: I<8203-E4A>, I<8204-E8A>, I<9125-F2A>, I<8233-E8B>, I<8236-E8C>. For I server, there's no hardware type restriction. -The parameter I needs to be specified for the B command to -get the target servers. The I should be a list of CEC node names, blade +The parameter I needs to be specified for the B command to +get the target servers. The I should be a list of CEC node names, blade management module node names or blade server node names. Lpar name is not acceptable here. -B command can accept multiple of energy attributes to query or one of energy -attribute to set. If only the attribute name is specified, without the '=', B -gets and displays the current value. Otherwise, if specifying the attribute with '=' like -'savingstatus=on', B will set the attribute savingstatus to value 'on'. +B command can accept multiple of energy attributes to query or one of energy +attribute to set. If only the attribute name is specified, without the '=', B +gets and displays the current value. Otherwise, if specifying the attribute with '=' like +'savingstatus=on', B will set the attribute savingstatus to value 'on'. -The attributes listed in the B section are which ones can be handled by +The attributes listed in the B section are which ones can be handled by B command. But for each specific type of server, there are some attributes that are not supported. If user specifies an attribute which is not supported by a specific server, the return value of this attribute will be 'na'. @@ -144,11 +144,11 @@ The supported attributes for each specific system p hardware type is listed as f =over 2 -B<8203-E4A>, B<8204-E8A> +B<8203-E4A>, B<8204-E8A> =over 4 -Supported attributes: +Supported attributes: B: savingstatus,cappingstatus,cappingmin,cappingmax, cappingvalue,cappingsoftmin,averageAC,averageDC,ambienttemp, @@ -158,14 +158,14 @@ B: savingstatus,cappingstatus,cappingwatt,cappingperc =back -B<9125-F2A> +B<9125-F2A> =over 4 -Supported attributes: +Supported attributes: B: savingstatus,averageAC,ambienttemp,exhausttemp, -CPUspeed +CPUspeed B: savingstatus @@ -206,7 +206,7 @@ B =over 4 -For the machine type which is not in the above list, the following +For the machine type which is not in the above list, the following attributes can be tried but not guaranteed: B: savingstatus,dsavingstatus,cappingstatus,cappingmin, @@ -214,28 +214,28 @@ cappingmax,,cappingvalue,cappingsoftmin,averageAC,averageDC, ambienttemp,exhausttemp,CPUspeed,syssbpower,sysIPLtime B: savingstatus,dsavingstatus,cappingstatus,cappingwatt, -cappingperc +cappingperc =back =back Note: -For system P CEC nodes, each query operation for attribute CPUspeed, averageAC +For system P CEC nodes, each query operation for attribute CPUspeed, averageAC or averageDC needs about 30 seconds to complete. The query for others attributes will get response immediately. =head1 B -For the I and I nodes, the B command depends -on the Energy Management Plugin B to -communicate with server. B can be downloaded from the IBM web site: +For the I and I nodes, the B command depends +on the Energy Management Plugin B to +communicate with server. B can be downloaded from the IBM web site: http://www.ibm.com/support/fixcentral/. (Other Software -> EM) NOTE: I nodes don't need this specific energy management package. -For iDataPlex nodes, the B command depends -on the Energy Management Plugin B to +For iDataPlex nodes, the B command depends +on the Energy Management Plugin B to communicate with server. This plugin must be requested from IBM. (The support for BladeCenter energy management is built into base xCAT, @@ -259,7 +259,7 @@ Verbose output. =item B -Query all energy attributes which supported by the specific +Query all energy attributes which supported by the specific type of hardware. For I machines, will not display the attributes @@ -291,12 +291,12 @@ Query the total DC power available for the entire blade center chassis. Query the average power consumed (Input). (Unit is watt) -Note: For 9125-F2A,9125-F2C server, the value of attribute +Note: For 9125-F2A,9125-F2C server, the value of attribute averageAC is the aggregate for all of the servers in a rack. -Note: For Blade Center, the value of attribute +Note: For Blade Center, the value of attribute averageAC is the total AC power being consumed by all modules -in the chassis. It also includes power consumed by the Chassis +in the chassis. It also includes power consumed by the Chassis Cooling Devices for BCH chassis. =item B @@ -317,19 +317,19 @@ Query the Power Capabilities of the blade server. staticPowerManagement: the module with the static worst case power values. -fixedPowermanagement: the module with the static power values but ability +fixedPowermanagement: the module with the static power values but ability to throttle. -dynamicPowerManagement: the module with power meter capability, measurement +dynamicPowerManagement: the module with power meter capability, measurement enabled, but capping disabled. -dynamicPowerMeasurement1: the module with power meter capability, measurement +dynamicPowerMeasurement1: the module with power meter capability, measurement enabled, phase 1 only -dynamicPowerMeasurement2: the module with power meter capability, measurement +dynamicPowerMeasurement2: the module with power meter capability, measurement enabled, phase 2 or higher -dynamicPowerMeasurementWithPowerCapping: the module with power meter capability, +dynamicPowerMeasurementWithPowerCapping: the module with power meter capability, both measurement and capping enabled, phase 2 or higher =item B @@ -350,25 +350,25 @@ Query the Minimum of power capping value in watts. =item B=B -Set the power capping value base on the percentage of -the max-min of capping value which getting from -I attribute. The valid value must be +Set the power capping value base on the percentage of +the max-min of capping value which getting from +I attribute. The valid value must be from 0 to 100. =item B -Query the minimum value that can be assigned to power +Query the minimum value that can be assigned to power capping without guaranteed enforceability. (Unit is watt) =item B -Query the power capping status. The result should be 'on' +Query the power capping status. The result should be 'on' or 'off'. =item B={B | B} -Set the power capping status. The value must be 'on' -or 'off'. This is the switch to turn on or turn off the +Set the power capping status. The value must be 'on' +or 'off'. This is the switch to turn on or turn off the power capping function. =item B @@ -379,10 +379,10 @@ Query the current power capping value. (Unit is watt) Set the power capping value base on the watt unit. -If the 'watt' > maximum of I or 'watt' -< I, the setting operation -will be failed. If the 'watt' > I and -'watt' < minimum of I, the value can NOT be +If the 'watt' > maximum of I or 'watt' +< I, the setting operation +will be failed. If the 'watt' > I and +'watt' < minimum of I, the value can NOT be guaranteed. =item B @@ -395,28 +395,28 @@ Query the historical records which were generated in last one hour for B -Query the dynamic power saving status. The result should -be 'on-norm', 'on-maxp' or 'off'. +Query the dynamic power saving status. The result should +be 'on-norm', 'on-maxp' or 'off'. -If turning on the dynamic power saving, the processor -frequency and voltage will be dropped dynamically based on -the core utilization. It supports two modes for turn on state: +If turning on the dynamic power saving, the processor +frequency and voltage will be dropped dynamically based on +the core utilization. It supports two modes for turn on state: -I - means normal, the processor frequency cannot -exceed the nominal value; +I - means normal, the processor frequency cannot +exceed the nominal value; -I - means maximum performance, the processor +I - means maximum performance, the processor frequency can exceed the nominal value. =item B={B | B | B} -Set the dynamic power saving. The value must be 'on-norm', +Set the dynamic power saving. The value must be 'on-norm', 'on-maxp' or 'off'. -The dsavingstatus setting operation needs about 2 minutes +The dsavingstatus setting operation needs about 2 minutes to take effect. (The used time depends on the hardware type) -The B only can be turned on when the +The B only can be turned on when the B is in turn off status. =item B @@ -431,7 +431,7 @@ Query the historical records which were generated in last one hour for B attribute name. =item B @@ -440,22 +440,22 @@ Query the historical records which were generated in last one hour for B -Query the minimum cpu frequency which can be set for FFO. (Fixed +Query the minimum cpu frequency which can be set for FFO. (Fixed Frequency Override) =item B -Query the maximum cpu frequency which can be set for FFO. +Query the maximum cpu frequency which can be set for FFO. =item B -Query the advertised maximum cpu frequency (selling point). +Query the advertised maximum cpu frequency (selling point). =item B -Query the minimum cpu frequency which can be set for dropping down -the voltage to save power. That means when you drop the cpu -frequency from the ffoVmin to ffoVmin, the voltage won't change, +Query the minimum cpu frequency which can be set for dropping down +the voltage to save power. That means when you drop the cpu +frequency from the ffoVmin to ffoVmin, the voltage won't change, then there's no obvious power to be saved. =item B @@ -464,30 +464,30 @@ Query the current value of FFO. =item B=B -Set the current value of FFO. The valid value of ffovalue should +Set the current value of FFO. The valid value of ffovalue should be between the ffoMin and ffoNorm. -Note1: Due to the limitation of firmware, the frequency in the range -3501 MHz - 3807 MHz can NOT be set to ffovalue. This range may be +Note1: Due to the limitation of firmware, the frequency in the range +3501 MHz - 3807 MHz can NOT be set to ffovalue. This range may be changed in future. -Note2: The setting will take effect only when the fsavingstatus is in -'on' status. But you need to set the ffovalue to a valid value before -enabling the fsavingstatus. (It's a limitation of the initial firmware -and will be fixed in future.) +Note2: The setting will take effect only when the fsavingstatus is in +'on' status. But you need to set the ffovalue to a valid value before +enabling the fsavingstatus. (It's a limitation of the initial firmware +and will be fixed in future.) The ffovalue setting operation needs about 1 minute to take effect. =item B -Query the status of FFO. The result should be 'on' or 'off'. +Query the status of FFO. The result should be 'on' or 'off'. 'on' - enable; 'off' - disable. =item B={B | B} Set the status of FFO. The value must be 'on' or 'off'. -'on' - enable. It will take effect only when the B +'on' - enable. It will take effect only when the B has been set to a valid value. 'off' -disable. It will take effect immediately. @@ -500,20 +500,20 @@ Query the maximum processor frequency. (Unit is MHz) =item B -Query the current temperature of management module. +Query the current temperature of management module. (Unit is centigrade) =item B -Query the status of power domain 1 for blade management +Query the status of power domain 1 for blade management module node. -Note: for the attribute without the leading 'pd1' which +Note: for the attribute without the leading 'pd1' which means there's only one power doamin in the chassis. =item B -Query the power management policy of power domain 1. +Query the power management policy of power domain 1. =item B @@ -541,7 +541,7 @@ Query the total power being used in power domain 1. =item B -Query the status of power domain 2 for blade management +Query the status of power domain 2 for blade management module node. =item B @@ -578,35 +578,35 @@ Query histogram data for wattage information =item B -Query the static power saving status. The result should be +Query the static power saving status. The result should be 'on' or 'off'. 'on' - enable; 'off' - disable. =item B={B | B} -Set the static power saving. The value must be 'on' or 'off'. +Set the static power saving. The value must be 'on' or 'off'. -If turning on the static power saving, the processor frequency +If turning on the static power saving, the processor frequency and voltage will be dropped to a fixed value to save energy. -The savingstatus setting operation needs about 2 minutes to +The savingstatus setting operation needs about 2 minutes to take effect. (The used time depends on the hardware type) -The B only can be turned on when the +The B only can be turned on when the B is in turn off status. =item B -Query the time used from FSP standby to OS standby. +Query the time used from FSP standby to OS standby. (Unit is Second) =item B -Query the system power consumed prior to power on. +Query the system power consumed prior to power on. (Unit is Watt) =item B -Query the thermal output (load) in BTUs per hour for the blade +Query the thermal output (load) in BTUs per hour for the blade center chassis. =item B @@ -615,7 +615,7 @@ Query System Power Statistics with DCMI (Data Center Manageability Interface). =item B -Query the temperature from DCMI (Data Center Manageability Interface) Temperature sensor. +Query the temperature from DCMI (Data Center Manageability Interface) Temperature sensor. Currently, only CPU temperature and baseboard temperature sensor available for OpenPOWER servers. =back @@ -744,7 +744,7 @@ The output of the query operation: blade1: savingstatus: off =item 6. -Query the attributes savingstatus, cappingstatus +Query the attributes savingstatus, cappingstatus and CPUspeed for server CEC1. renergy CEC1 savingstatus cappingstatus CPUspeed @@ -762,23 +762,23 @@ Turn on the power saving function of CEC1. The output of the setting operation: - CEC1: Set savingstatus succeeded. - CEC1: This setting may need some minutes to take effect. + CEC1: Set savingstatus succeeded. + CEC1: This setting may need some minutes to take effect. =item 8. -Set the power capping value base on the percentage of the +Set the power capping value base on the percentage of the max-min capping value. Here, set it to 50%. renergy CEC1 cappingperc=50 -If the maximum capping value of the CEC1 is 850w, and the -minimum capping value of the CEC1 is 782w, the Power Capping +If the maximum capping value of the CEC1 is 850w, and the +minimum capping value of the CEC1 is 782w, the Power Capping value will be set as ((850-782)*50% + 782) = 816w. The output of the setting operation: CEC1: Set cappingperc succeeded. - CEC1: cappingvalue: 816 + CEC1: cappingvalue: 816 =item 9. Query powerusage and temperature for OpenPOWER servers. From 3849e8f63ce7563015f2f9544da658a4eb05c6c4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0893/1681] Remove trailing spaces in file xCAT-client/pods/man1/restartxcatd.1.pod --- xCAT-client/pods/man1/restartxcatd.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/restartxcatd.1.pod b/xCAT-client/pods/man1/restartxcatd.1.pod index 98047fcf9..a85a93ac4 100644 --- a/xCAT-client/pods/man1/restartxcatd.1.pod +++ b/xCAT-client/pods/man1/restartxcatd.1.pod @@ -9,7 +9,7 @@ B [[B<-h>|B<--help>] | [B<-v>|B<--version>] | [B<-r>|B<--reload>]] =head1 DESCRIPTION -The B command restarts the xCAT daemon (xcatd). +The B command restarts the xCAT daemon (xcatd). B @@ -34,7 +34,7 @@ It runs 'stopsrc -s xcatd' to stop xcatd first if xcatd is active, then runs 'st If the xcatd subsystem was not created, B will create it automatically. =back - + =head1 OPTIONS From ccf879d6e5960746642a968d349acb5bf72b1c40 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0894/1681] Remove trailing spaces in file xCAT-client/pods/man1/restorexCATdb.1.pod --- xCAT-client/pods/man1/restorexCATdb.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/restorexCATdb.1.pod b/xCAT-client/pods/man1/restorexCATdb.1.pod index ad7681f7a..72202e08c 100644 --- a/xCAT-client/pods/man1/restorexCATdb.1.pod +++ b/xCAT-client/pods/man1/restorexCATdb.1.pod @@ -31,10 +31,10 @@ B<-V|--verbose> Verbose. B<-a> All,without this flag the eventlog and auditlog will be skipped. These tables are skipped by default because restoring will generate new indexes -B<-b> Restore from the binary image. - -B<-p|--path> Path to the directory containing the database restore files. If restoring from the binary image (-b) and using postgeSQL, then this is the complete path to the restore file that was created with dumpxCATdb -b. - +B<-b> Restore from the binary image. + +B<-p|--path> Path to the directory containing the database restore files. If restoring from the binary image (-b) and using postgeSQL, then this is the complete path to the restore file that was created with dumpxCATdb -b. + B<-t|--timestamp> Use with the -b flag to designate the timestamp of the binary image to use to restore for DB2. =head1 RETURN VALUE From 5662bcd6068990a5f7534cab2402e6aff8e6cd78 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0895/1681] Remove trailing spaces in file xCAT-client/pods/man1/reventlog.1.pod --- xCAT-client/pods/man1/reventlog.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/reventlog.1.pod b/xCAT-client/pods/man1/reventlog.1.pod index 2877a7b32..406f62bb5 100644 --- a/xCAT-client/pods/man1/reventlog.1.pod +++ b/xCAT-client/pods/man1/reventlog.1.pod @@ -98,7 +98,7 @@ Output is similar to: node4: Resolved 52. node4: Resolved 58. -=back +=back =head1 SEE ALSO From c5ab29e87233e3d100b34bd5deb973bf6eec61a3 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0896/1681] Remove trailing spaces in file xCAT-client/pods/man1/rflash.1.pod --- xCAT-client/pods/man1/rflash.1.pod | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod index 80347d82e..744f9bf20 100644 --- a/xCAT-client/pods/man1/rflash.1.pod +++ b/xCAT-client/pods/man1/rflash.1.pod @@ -44,11 +44,11 @@ The B command initiates Firmware updates on supported xCAT nodes. Licen The command scans the specified directory structure for Firmware update package files applicable to the given nodes and components. And then it will B select the B version for the upgrade. The firmware update files include the Microcode update package and associated XML file. They can be downloaded from the IBM Web site: I. -The POWER5 and POWER6 systems contain several components that use Licensed Internal Code. The B command supports two of these components: the managed system (also known as the Central Electronics Complex, or CEC) and the power subsystem (also known as the Bulk Power Assembly (BPA) or Bulk Power Controller (BPC)). Some POWER5 managed systems can be attached to a power subsystem. These power subsystems can support multiple managed systems. When the B command is invoked, xCAT will determine the managed system or power subsystem associated with that CEC and perform the update. +The POWER5 and POWER6 systems contain several components that use Licensed Internal Code. The B command supports two of these components: the managed system (also known as the Central Electronics Complex, or CEC) and the power subsystem (also known as the Bulk Power Assembly (BPA) or Bulk Power Controller (BPC)). Some POWER5 managed systems can be attached to a power subsystem. These power subsystems can support multiple managed systems. When the B command is invoked, xCAT will determine the managed system or power subsystem associated with that CEC and perform the update. -The I can be an CEC or CEC list, a Lpar or Lpar list and a Frame or Frame list. But CEC (or Lpar) and Frame B be used at the same time. When the I is an CEC or CEC list, B will upgrade the firmware of the CEC or CECs in the cec list. If I is a Lpar or Lpar list, B will update Licensed Internal Code (LIC) on HMC-attached POWER5 and POWER6 pSeries nodes, and POWER7 systems using Direct FSP management. If I is a Frame or Frame list, B will update Licensed Internal Code (LIC) of the power subsystem on HMC-attached POWER5 and POWER6 pSeries nodes. The I can also be the specified node groups. You can specify a comma or space-separated list of node group ranges. See the I man page for detailed usage information. +The I can be an CEC or CEC list, a Lpar or Lpar list and a Frame or Frame list. But CEC (or Lpar) and Frame B be used at the same time. When the I is an CEC or CEC list, B will upgrade the firmware of the CEC or CECs in the cec list. If I is a Lpar or Lpar list, B will update Licensed Internal Code (LIC) on HMC-attached POWER5 and POWER6 pSeries nodes, and POWER7 systems using Direct FSP management. If I is a Frame or Frame list, B will update Licensed Internal Code (LIC) of the power subsystem on HMC-attached POWER5 and POWER6 pSeries nodes. The I can also be the specified node groups. You can specify a comma or space-separated list of node group ranges. See the I man page for detailed usage information. -The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. +The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. =head2 PPC (with HMC) specific: @@ -67,29 +67,29 @@ BWhen the B<--commit> or B<--recover> two flags is used, the noderange B< xCAT recommends that you shutdown your Operating System images and power off your managed systems before applying disruptive updates to managed systems or power subsystems. -Any previously activated code on the affected systems will be automatically accepted into permanent flash by this procedure. +Any previously activated code on the affected systems will be automatically accepted into permanent flash by this procedure. -B If the power subsystem is recycled, all of its attached managed systems will be recycled. +B If the power subsystem is recycled, all of its attached managed systems will be recycled. If it outputs B<"Timeout waiting for prompt"> during the upgrade, set the B<"ppctimeout"> larger in the B table. After the upgrade, remeber to change it back. If run the B<"rflash"> command on an AIX management node, need to make sure the value of B<"useSSHonAIX"> is B<"yes"> in the site table. =head2 PPC (using Direct FSP Management) specific: -In currently Direct FSP/BPA Management, our B doesn't support B value of B<--activate> flag, and supports B and B. The B option will cause any affected systems that are powered on to be powered down before installing and activating the update. So we require that the systems should be powered off before do the firmware update. +In currently Direct FSP/BPA Management, our B doesn't support B value of B<--activate> flag, and supports B and B. The B option will cause any affected systems that are powered on to be powered down before installing and activating the update. So we require that the systems should be powered off before do the firmware update. The B option will load the new firmware into the T (temp) side, but will not activate it like the disruptive firmware. The customer will continue to run the Frames and CECs working with the P (perm) side and can wait for a maintenance window where they can activate and boot the Frame/CECs with new firmware levels. Refer to the doc to get more details: XCAT_Power_775_Hardware_Management -In Direct FSP/BPA Management, there is B<-d> I option. The default value is /tmp. When doing firmware update, B will put some related data from rpm packages in directory, so the execution of B will require available disk space in for the command to properly execute: +In Direct FSP/BPA Management, there is B<-d> I option. The default value is /tmp. When doing firmware update, B will put some related data from rpm packages in directory, so the execution of B will require available disk space in for the command to properly execute: For one GFW rpm package and one power code rpm package, if the GFW rpm package size is gfw_rpmsize, and the Power code rpm package size is power_rpmsize, it requires that the available disk space should be more than: 1.5*gfw_rpmsize + 1.5*power_rpmsize -For Power 775, the B command takes effect on the primary and secondary FSPs or BPAs almost in parallel. +For Power 775, the B command takes effect on the primary and secondary FSPs or BPAs almost in parallel. For more details about the Firmware Update using Direct FSP/BPA Management, refer to: XCAT_Power_775_Hardware_Management#Updating_the_BPA_and_FSP_firmware_using_xCAT_DFM =head2 NeXtScale FPC specific: -The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http information required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http. Refer to the doc to get more details: XCAT_NeXtScale_Clusters +The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http information required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http. Refer to the doc to get more details: XCAT_NeXtScale_Clusters =head2 OpenPOWER specific (using IPMI): @@ -103,29 +103,29 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node B<-l|--list>: -The list option will list out available firmware on the BMC. It provides an interface to display the ID of the various firmware levels. +The list option will list out available firmware on the BMC. It provides an interface to display the ID of the various firmware levels. -The (*) symbol indicates the active running firmware on the server. +The (*) symbol indicates the active running firmware on the server. -The (+) symbol indicates the firmware that is pending and a reboot is required to set it to be the active running firmware level. +The (+) symbol indicates the firmware that is pending and a reboot is required to set it to be the active running firmware level. B<-u|--upload>: -The upload option expects a .tar file as the input and will upload the file to the BMC. Use the list option to view the result. +The upload option expects a .tar file as the input and will upload the file to the BMC. Use the list option to view the result. -B<-a|--activate>: +B<-a|--activate>: -The activate option expects either a .tar file or an ID as the input. If a .tar file is provided, it will upload and activate the firmware in a single step +The activate option expects either a .tar file or an ID as the input. If a .tar file is provided, it will upload and activate the firmware in a single step -To apply the firmware level, a reboot is required to BMC and HOST. +To apply the firmware level, a reboot is required to BMC and HOST. B When using B in hierarchical environment, the .tar file must be accessible from Service Nodes. B<-d>: -This option steamlines the update, activate, reboot BMC and reboot HOST procedure. It expects a directory containing both BMC and Host .tar files. When BMC and Host tar files are provided, the command will upload and activate firmware. After BMC becomes activate, it will reboot BMC. If BMC state is Ready, the command will reboot the HOST. If BMC state is NotReady, the command will exit. +This option steamlines the update, activate, reboot BMC and reboot HOST procedure. It expects a directory containing both BMC and Host .tar files. When BMC and Host tar files are provided, the command will upload and activate firmware. After BMC becomes activate, it will reboot BMC. If BMC state is Ready, the command will reboot the HOST. If BMC state is NotReady, the command will exit. -B When using B<--no-host-reboot>, it will not reboot the host after BMC is reboot. +B When using B<--no-host-reboot>, it will not reboot the host after BMC is reboot. B<--delete>: @@ -151,11 +151,11 @@ Specifies the directory where the packages are located. PPC (without HMC, using Direct FSP Management) specific: -Specifies the directory where the raw data from rpm packages for each CEC/Frame are located. The default directory is /tmp. The option is only used in Direct FSP/BPA Management. +Specifies the directory where the raw data from rpm packages for each CEC/Frame are located. The default directory is /tmp. The option is only used in Direct FSP/BPA Management. OpenPOWER BMC specific (using IPMI): -Used for IBM Power S822LC for Big Data systems only. Specifies the directory where the B utility and at least one of BMC or Host update files are located. The utility and update files can be downloaded from FixCentral. +Used for IBM Power S822LC for Big Data systems only. Specifies the directory where the B utility and at least one of BMC or Host update files are located. The utility and update files can be downloaded from FixCentral. =item B<--activate> {B | B} @@ -250,7 +250,7 @@ To update the firmware on IBM Power S822LC for Big Data machine specify the node rflash briggs01 -d /root/supermicro/OP825 =item 7. -To update the firmware on the OpenBMC machine, specify the firmare update file to upload and activate: +To update the firmware on the OpenBMC machine, specify the firmare update file to upload and activate: rflash p9euh02 -a /tmp/witherspoon.pnor.squashfs.tar From cfa30462bf364aab9237d0fa60469e6f4b9e38d1 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0897/1681] Remove trailing spaces in file xCAT-client/pods/man1/rinv.1.pod --- xCAT-client/pods/man1/rinv.1.pod | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod index 661f067f5..f7aed5981 100644 --- a/xCAT-client/pods/man1/rinv.1.pod +++ b/xCAT-client/pods/man1/rinv.1.pod @@ -11,8 +11,8 @@ B [B<-h>|B<--help>|B<-v>|B<--version>] B I [B|B|B|B|B|B|B|B|B|B] =head2 OpenPOWER (IPMI) server specific: - -B I [B|B|B|B|B|B|B|B|B] + +B I [B|B|B|B|B|B|B|B|B] =head2 OpenPOWER (OpenBMC) server specific: @@ -38,7 +38,7 @@ B I [B<-t>] =head2 pdu specific: -B I +B I =head2 zVM specific: @@ -127,7 +127,7 @@ Retrieves dual in-line memory module information. =item B -Retrieves device identification. Usually device, manufacturing and product IDs. +Retrieves device identification. Usually device, manufacturing and product IDs. =item B @@ -165,7 +165,7 @@ B =item B<--diskpoolspace> -Calculates the total size of every known storage pool. +Calculates the total size of every known storage pool. =item B<--diskpool> I I @@ -177,7 +177,7 @@ Lists the FCP device channels that are active, free, or offline. State can be: a =item B<--diskpoolnames> -Lists the known disk pool names. +Lists the known disk pool names. =item B<--networknames> @@ -286,7 +286,7 @@ Output is similar to: B -=item 5. +=item 5. To list the defined network names available for a given node: @@ -303,14 +303,14 @@ Output is similar to: pokdev61: VSWITCH SYSTEM VSW2 pokdev61: VSWITCH SYSTEM VSW3 -=item 6. +=item 6. To list the configuration for a given network: rinv pokdev61 --getnetwork GLAN1 Output is similar to: - + pokdev61: LAN SYSTEM GLAN1 Type: QDIO Connected: 1 Maxconn: INFINITE pokdev61: PERSISTENT UNRESTRICTED IP Accounting: OFF pokdev61: IPTimeout: 5 MAC Protection: Unspecified @@ -321,7 +321,7 @@ Output is similar to: To list the disk pool names available: rinv pokdev61 --diskpoolnames - + Output is similar to: pokdev61: POOL1 @@ -335,7 +335,7 @@ List the configuration for a given disk pool: rinv pokdev61 --diskpool POOL1 free Output is similar to: - + pokdev61: #VolID DevType StartAddr Size pokdev61: EMC2C4 3390-09 0001 10016 pokdev61: EMC2C5 3390-09 0001 10016 @@ -346,7 +346,7 @@ Output is similar to: List the known zFCP pool names. rinv pokdev61 --zfcppoolnames - + Output is similar to: pokdev61: zfcp1 @@ -358,7 +358,7 @@ Output is similar to: List the SCSI/FCP devices contained in a given zFCP pool: rinv pokdev61 --zfcppool zfcp1 - + Output is similar to: pokdev61: #status,wwpn,lun,size,range,owner,channel,tag From 6858a764fb7c9ac5cbcfc3ee54ebf0c6506b7ccd Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0898/1681] Remove trailing spaces in file xCAT-client/pods/man1/rmdef.1.pod --- xCAT-client/pods/man1/rmdef.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/rmdef.1.pod b/xCAT-client/pods/man1/rmdef.1.pod index 347cf18a1..9eb6cc984 100644 --- a/xCAT-client/pods/man1/rmdef.1.pod +++ b/xCAT-client/pods/man1/rmdef.1.pod @@ -24,15 +24,15 @@ This command is used to remove xCAT object definitions that are stored in the xC Clear the whole xCAT database. A backup of the xCAT definitions should be saved before using this option as the xCAT daemons will no longer work once cleared. -To restore: +To restore: =over 5 -=item 1. B and run the B command. +=item 1. B and run the B command. -or +or -=item 2. Run B which initializes the database the same as when xCAT was installed. +=item 2. Run B which initializes the database the same as when xCAT was installed. =back From 7f09481879f507b0713e27ffe1732abf575ba907 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0899/1681] Remove trailing spaces in file xCAT-client/pods/man1/rmhwconn.1.pod --- xCAT-client/pods/man1/rmhwconn.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/rmhwconn.1.pod b/xCAT-client/pods/man1/rmhwconn.1.pod index d0dd7cad9..74da29858 100644 --- a/xCAT-client/pods/man1/rmhwconn.1.pod +++ b/xCAT-client/pods/man1/rmhwconn.1.pod @@ -24,7 +24,7 @@ B B<-s> For PPC (with HMC) specific: -This command is used to disconnect CEC and Frame nodes from HMC nodes, according to the connection information defined in ppc table in xCAT DB. +This command is used to disconnect CEC and Frame nodes from HMC nodes, according to the connection information defined in ppc table in xCAT DB. Note: If a CEC belongs to a frame with a BPA installed, this CEC cannot be disconnected individually. Instead, the whole frame should be disconnected. @@ -80,7 +80,7 @@ To remove the connection for Frame node frame1: =item 3. To disconnect all CEC nodes in node group cec from their related hardware serveri, using lpar tooltype: - + rmhwconn cec -T lpar =back From 21ebeb0f2bc0fb9d253f3b985b7037e75881fd94 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0900/1681] Remove trailing spaces in file xCAT-client/pods/man1/rmigrate.1.pod --- xCAT-client/pods/man1/rmigrate.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/rmigrate.1.pod b/xCAT-client/pods/man1/rmigrate.1.pod index 2be54a94f..3cb693fbd 100644 --- a/xCAT-client/pods/man1/rmigrate.1.pod +++ b/xCAT-client/pods/man1/rmigrate.1.pod @@ -12,7 +12,7 @@ B I [BI] [BI] [ =head1 B -B requests that a guest VM to be moved from the current hypervisor to another. It will request a live migration if possible. The vmstorage directory should be shared between the source and destination hypervisors. +B requests that a guest VM to be moved from the current hypervisor to another. It will request a live migration if possible. The vmstorage directory should be shared between the source and destination hypervisors. Note: Make sure SELINUX is disabled and firewall is turned off on source and destination hypervisors. From 6b1ba6a7e32ba878011687ac8bc3c251a0f5a391 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0901/1681] Remove trailing spaces in file xCAT-client/pods/man1/rmimage.1.pod --- xCAT-client/pods/man1/rmimage.1.pod | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-client/pods/man1/rmimage.1.pod b/xCAT-client/pods/man1/rmimage.1.pod index 792b96a0d..5b6fc139d 100644 --- a/xCAT-client/pods/man1/rmimage.1.pod +++ b/xCAT-client/pods/man1/rmimage.1.pod @@ -7,7 +7,7 @@ B - Removes the Linux stateless or statelite image from the file system B -B I B<[--xcatdef]> +B I B<[--xcatdef]> =head1 DESCRIPTION @@ -16,16 +16,16 @@ The install dir is setup by using "installdir" attribute set in the site table. If I is specified, this command uses the information in the I to calculate the image root directory; otherwise, this command uses the operating system name, -architecture and profile name to calculate the image root directory. +architecture and profile name to calculate the image root directory. The osimage definition will not be removed from the xCAT tables by default, specifying the flag B<--xcatdef> will remove the osimage definition, -or you can use rmdef -t osimage to remove the osimage definition. +or you can use rmdef -t osimage to remove the osimage definition. The statelite image files on the diskful service nodes will not be removed, -remove the image files on the service nodes manually if necessary, +remove the image files on the service nodes manually if necessary, for example, use command "rsync -az --delete /install :/" to remove the image files on the service nodes, -where the is the hostname of the service node. +where the is the hostname of the service node. =head1 Parameters From 5f13e537fb86dab8b2a6c3ec66195cf8c22effdc Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0902/1681] Remove trailing spaces in file xCAT-client/pods/man1/rmnimimage.1.pod --- xCAT-client/pods/man1/rmnimimage.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/rmnimimage.1.pod b/xCAT-client/pods/man1/rmnimimage.1.pod index 530af9fb8..342cee061 100644 --- a/xCAT-client/pods/man1/rmnimimage.1.pod +++ b/xCAT-client/pods/man1/rmnimimage.1.pod @@ -52,9 +52,9 @@ Override the check for shared resources when removing an xCAT osimage. Remove NIM resources from the xCAT management node only. -=item B<-s> I +=item B<-s> I -Remove the NIM resources on these xCAT service nodes only. Do not remove the NIM resources from the xCAT management node. +Remove the NIM resources on these xCAT service nodes only. Do not remove the NIM resources from the xCAT management node. =item I @@ -64,7 +64,7 @@ The name of the xCAT osimage definition. Verbose mode. This option will display the underlying NIM commands that are being called. -=item B<-x|--xcatdef> +=item B<-x|--xcatdef> Remove the xCAT osimage definition. @@ -88,7 +88,7 @@ An error has occurred. rmnimimage 61image -The "nim -o remove" operation will be used to remove the NIM resource definitions on the management node as well as any service nodes where the resource has been replicated. This NIM operation does not completely remove all files and directories associated with the NIM resources. +The "nim -o remove" operation will be used to remove the NIM resource definitions on the management node as well as any service nodes where the resource has been replicated. This NIM operation does not completely remove all files and directories associated with the NIM resources. 2) Remove all the NIM resources specified by the xCAT "61rte" osimage definition. Delete ALL files and directories associated with the NIM resources. This will also remove the lpp_source resource. From db7cb78c29fb41129c3c198d0e2f445d944e74b5 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0903/1681] Remove trailing spaces in file xCAT-client/pods/man1/rmvm.1.pod --- xCAT-client/pods/man1/rmvm.1.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-client/pods/man1/rmvm.1.pod b/xCAT-client/pods/man1/rmvm.1.pod index 2dcf8cc67..139cf2d56 100644 --- a/xCAT-client/pods/man1/rmvm.1.pod +++ b/xCAT-client/pods/man1/rmvm.1.pod @@ -39,7 +39,7 @@ B<--service> Remove the service partitions of the specified CECs. B<-p> KVM: Purge the existence of the VM from persistent storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. PPC: Remove the specified partition on normal power machine. -B<-f> Force remove the VM, even if the VM appears to be online. This will bring down a live VM if requested. +B<-f> Force remove the VM, even if the VM appears to be online. This will bring down a live VM if requested. =head1 RETURN VALUE From 00137523f617e5cb311c8358bcbeefd3ca782d4c Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0904/1681] Remove trailing spaces in file xCAT-client/pods/man1/rmzone.1.pod --- xCAT-client/pods/man1/rmzone.1.pod | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/xCAT-client/pods/man1/rmzone.1.pod b/xCAT-client/pods/man1/rmzone.1.pod index bae05aada..1e3755ff4 100644 --- a/xCAT-client/pods/man1/rmzone.1.pod +++ b/xCAT-client/pods/man1/rmzone.1.pod @@ -1,10 +1,10 @@ =head1 B -B - Removes a zone from the cluster. +B - Removes a zone from the cluster. =head1 B -B I [B<-g>] [B<-f>] +B I [B<-g>] [B<-f>] B [B<-h> | B<-v>] @@ -12,33 +12,33 @@ B [B<-h> | B<-v>] =head1 B The B command is designed to remove a previously defined zone from the cluster. -It will remove the zone entry in the zone table. It will remove the zone from the zonename attributes on the nodes that were assigned to the zone. Optionally, it will remove the zonename group from the nodes that were assigned to the zone. -It will also remove the root ssh keys that were created for that zone on the Management Node. +It will remove the zone entry in the zone table. It will remove the zone from the zonename attributes on the nodes that were assigned to the zone. Optionally, it will remove the zonename group from the nodes that were assigned to the zone. +It will also remove the root ssh keys that were created for that zone on the Management Node. The rmzone command is only supported on Linux ( No AIX support). -The nodes are not automatically updated with new root ssh keys by rmzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys. The nodes new ssh key will be assigned from the defaultzone in the zone table, or if no entries in the zone table, the keys will come from /root/.ssh. -Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. +The nodes are not automatically updated with new root ssh keys by rmzone. You must run updatenode -k or xdsh -K to the nodes to update the root ssh keys. The nodes new ssh key will be assigned from the defaultzone in the zone table, or if no entries in the zone table, the keys will come from /root/.ssh. +Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur. =head1 B =over 5 -=item B<-h>|B<--help> +=item B<-h>|B<--help> -Displays usage information. +Displays usage information. -=item B<-v>|B<--version> +=item B<-v>|B<--version> -Displays command version and build date. +Displays command version and build date. -=item B<-f | --force> +=item B<-f | --force> Used to remove a zone that is defined as current default zone. This should only be done if you are removing all zones, or you will -adding a new zone or changing an existing zone to be the default zone. +adding a new zone or changing an existing zone to be the default zone. -=item B<-g | --assigngroup> +=item B<-g | --assigngroup> -Remove the assigned group named B from all nodes assigned to the zone being removed. +Remove the assigned group named B from all nodes assigned to the zone being removed. =item B<-V>|B<--Verbose> @@ -61,7 +61,7 @@ To remove zone1 from the zone table and the zonename attribute on all it's assig To remove zone2 from the zone table, the zone2 zonename attribute, and the zone2 group assigned to all nodes that were in zone2, enter: - rmzone zone2 -g + rmzone zone2 -g =item 3. From 5ac037b213f9a40b24726dfef91b8b928e9dba5e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0905/1681] Remove trailing spaces in file xCAT-client/pods/man1/rnetboot.1.pod --- xCAT-client/pods/man1/rnetboot.1.pod | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xCAT-client/pods/man1/rnetboot.1.pod b/xCAT-client/pods/man1/rnetboot.1.pod index e968e9f2d..19d26630a 100644 --- a/xCAT-client/pods/man1/rnetboot.1.pod +++ b/xCAT-client/pods/man1/rnetboot.1.pod @@ -21,41 +21,41 @@ system p nodes. =head1 OPTIONS -B<-s> +B<-s> Set the boot device order. Accepted boot devices are hd and net. -B<-F> +B<-F> Force reboot the system no matter what state the node is. By default, rnetboot will not reboot the node if node is in 'boot' state. -B<-f> +B<-f> Force immediate shutdown of the partition. -B<-m> +B<-m> Use one or multiple -m flags to specify the node attributes and the expected status for the node installation monitoring and automatic retry mechanism. The operators ==, !=, =~ and !~ are valid. This flag must be used with -t flag. Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attrval" needs to be quoted. If the operator is "!~", the "attrval" needs to be quoted using single quote. -B<-r> +B<-r> specify the number of retries that the monitoring process will perform before declaring the failure. The default value is 3. Setting the retrycount to 0 means only monitoring the os installation progress and will not re-initiate the installation if the node status has not been changed to the expected value after timeout. This flag must be used with -m flag. -B<-t> +B<-t> Specify the timeout, in minutes, to wait for the expectedstatus specified by -m flag. This is a required flag if the -m flag is specified. -B<-V|--verbose> +B<-V|--verbose> Verbose output. -B<-h|--help> +B<-h|--help> Display usage message. -B<-v|--version> +B<-v|--version> Command Version. @@ -80,7 +80,7 @@ Command Version. rnetboot all -s hd,net rnetboot all ipl=00c - + =head1 SEE ALSO From 4e9aca603b6743c13d1aa7859f0722fbc0e2c329 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0906/1681] Remove trailing spaces in file xCAT-client/pods/man1/rollupdate.1.pod --- xCAT-client/pods/man1/rollupdate.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/rollupdate.1.pod b/xCAT-client/pods/man1/rollupdate.1.pod index 50f2dc67d..4ceb5eac5 100644 --- a/xCAT-client/pods/man1/rollupdate.1.pod +++ b/xCAT-client/pods/man1/rollupdate.1.pod @@ -14,10 +14,10 @@ B [B<-?> | B<-h> | B<--help> | B<-v> | B<--version>] The B command creates and submits scheduler reservation jobs that will notify xCAT to shutdown a group of nodes, run optional out-of-band commands from the xCAT management node, and reboot the nodes. Currently, only LoadLeveler is supported as a job scheduler with B. -Input to the B command is passed in as stanza data through STDIN. Information such as the sets of nodes that will be updated, the name of the job scheduler, a template for generating job command files, and other control data are required. See -/opt/xcat/share/xcat/rollupdate/rollupdate.input.sample +Input to the B command is passed in as stanza data through STDIN. Information such as the sets of nodes that will be updated, the name of the job scheduler, a template for generating job command files, and other control data are required. See +/opt/xcat/share/xcat/rollupdate/rollupdate.input.sample and -/opt/xcat/share/xcat/rollupdate/rollupdate_all.input.sample +/opt/xcat/share/xcat/rollupdate/rollupdate_all.input.sample for stanza keywords, usage, and examples. The B command will use the input data to determine each set of nodes that will be managed together as an update group. For each update group, a job scheduler command file is created and a reservation request is submitted. When the group of nodes becomes available and the scheduler activates the reservation, the xcatd daemon on the management node will be notified to begin the update process for all the nodes in the update group. If specified, prescripts will be run, an operating system shutdown command will be sent to each node, out-of-band operations can be run on the management node, and the nodes are powered back on. @@ -67,7 +67,7 @@ An error has occurred. =item 1. -To run a cluster rolling update based on the information you have created in the file +To run a cluster rolling update based on the information you have created in the file /u/admin/rolling_updates/update_all.stanza enter: From 2ac249a4e680d17625a22aa91c4baa5c9a8cc54e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0907/1681] Remove trailing spaces in file xCAT-client/pods/man1/rpower.1.pod --- xCAT-client/pods/man1/rpower.1.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-client/pods/man1/rpower.1.pod b/xCAT-client/pods/man1/rpower.1.pod index 6d7a0933c..cadf6cf85 100644 --- a/xCAT-client/pods/man1/rpower.1.pod +++ b/xCAT-client/pods/man1/rpower.1.pod @@ -10,7 +10,7 @@ B [B<-h>|B<--help>|B<-v>|B<--version>] =head2 BMC (using IPMI): -B I [B|B|B|B|B|B|B|B|B|B|B [B<-w> I] [B<-o>] [B<-r>]] +B I [B|B|B|B|B|B|B|B|B|B|B [B<-w> I] [B<-o>] [B<-r>]] B I [B|B|B|B] @@ -60,7 +60,7 @@ B I [B|B] =head2 Lenovo High-Density Server specific: -B I [B|B|B|B|B] +B I [B|B|B|B|B] =head2 zVM specific: From 54edf6b5a7c0b79eb9003e87c1709741b75fe63f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0908/1681] Remove trailing spaces in file xCAT-client/pods/man1/rscan.1.pod --- xCAT-client/pods/man1/rscan.1.pod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/pods/man1/rscan.1.pod b/xCAT-client/pods/man1/rscan.1.pod index 2dd6a677b..e8f47cc47 100644 --- a/xCAT-client/pods/man1/rscan.1.pod +++ b/xCAT-client/pods/man1/rscan.1.pod @@ -19,7 +19,7 @@ For the management module of blade, if the blade server is a Flex system P node, For the KVM host, all the KVM guests on the specified KVM host will be scanned. -Note: The first line of the output always contains information about the hardware control point. When using the rscan command to generate output for HMC or IVM hardware control points, it provides the FSPs and BPAs as part of the output. The only exception is the rscan -u flag which provides updates made hardware control point in the xCAT database. +Note: The first line of the output always contains information about the hardware control point. When using the rscan command to generate output for HMC or IVM hardware control points, it provides the FSPs and BPAs as part of the output. The only exception is the rscan -u flag which provides updates made hardware control point in the xCAT database. =head1 OPTIONS @@ -31,11 +31,11 @@ B<-v|--version> Command Version. B<-V|--verbose> Verbose output. -B<-u> Updates and then prints out node definitions in the xCAT database for CEC/BPA. It updates the existing nodes that contain the same mtms and serial number for nodes managed by the specified hardware control point. This primarily works with CEC/FSP and frame/BPA nodes when the node name is not the same as the managed system name on hardware control point (HMC), This flag will update the BPA/FSP node name definitions to be listed as the managed system name in the xCAT database. +B<-u> Updates and then prints out node definitions in the xCAT database for CEC/BPA. It updates the existing nodes that contain the same mtms and serial number for nodes managed by the specified hardware control point. This primarily works with CEC/FSP and frame/BPA nodes when the node name is not the same as the managed system name on hardware control point (HMC), This flag will update the BPA/FSP node name definitions to be listed as the managed system name in the xCAT database. For the Flex system manager, both the blade server and fsp object of xCAT will be updated if the mpa and slot id are matched to the object which has been defined in the xCAT database. -For KVM host, the information of the KVM guests which have been defined in xCAT database will be updated. +For KVM host, the information of the KVM guests which have been defined in xCAT database will be updated. Note: only the matched object will be updated. @@ -43,7 +43,7 @@ B<-n> For KVM host, the information of the KVM guests, which are not de B<-w> Writes output to xCAT database. -For KVM host, updates the information of the KVM guests which have been defined in xCAT database with the same node name and KVM host, creates the definition of the KVM guests which do not exist in xCAT database , and notifies user about the conflicting KVM guests that the name exist in xCAT database but the kvm host is different. +For KVM host, updates the information of the KVM guests which have been defined in xCAT database with the same node name and KVM host, creates the definition of the KVM guests which do not exist in xCAT database , and notifies user about the conflicting KVM guests that the name exist in xCAT database but the kvm host is different. B<-x> XML format. From 491eb897eff5a0928ac67e3800520103681e5f74 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH 0909/1681] Remove trailing spaces in file xCAT-client/pods/man1/rspconfig.1.pod --- xCAT-client/pods/man1/rspconfig.1.pod | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod index e05e4ae9c..10df8ed4b 100644 --- a/xCAT-client/pods/man1/rspconfig.1.pod +++ b/xCAT-client/pods/man1/rspconfig.1.pod @@ -280,7 +280,7 @@ Set or get frame number. If no framenumber and * specified, framenumber for the =item B={B|B} -Set or get cec off policy after lpars are powered off. If no cec_off_policy value specified, the cec_off_policy for the nodes will be displayed. the cec_off_policy has two values: B and B. B means Power off when last partition powers off. B means Stay running after last partition powers off. If cec_off_policy value is specified, the cec off policy will be set for that cec. +Set or get cec off policy after lpars are powered off. If no cec_off_policy value specified, the cec_off_policy for the nodes will be displayed. the cec_off_policy has two values: B and B. B means Power off when last partition powers off. B means Stay running after last partition powers off. If cec_off_policy value is specified, the cec off policy will be set for that cec. =item B={I} @@ -320,7 +320,7 @@ Display the CEC/BPA system names. =item B -Get Barrier Synchronization Register (BSR) allocation for a CEC. +Get Barrier Synchronization Register (BSR) allocation for a CEC. =item B @@ -328,7 +328,7 @@ Query huge page information or request NUM of huge pages for CEC. If no value sp =item B={B | B} -Enable or disable the service processor failover function of a CEC or display status of this function. +Enable or disable the service processor failover function of a CEC or display status of this function. =item B @@ -344,7 +344,7 @@ Select the policy for I/O Adapter Enlarged Capacity. This option controls the si =item B -Get or set hostname on the service processor. +Get or set hostname on the service processor. =item B @@ -388,14 +388,14 @@ Generate/Manage BMC system dumps. If no sub-option is provided, will generate, w =over 4 -=item +=item B<-c> will clear a single specified dump, or use 'all' to clear all dumps on the BMC. -=item -B<-l> will list all the generated dumps on the BMC. +=item +B<-l> will list all the generated dumps on the BMC. -=item -B<-g> will generate a new dump on the BMC. Dump generation can take a few minutes. +=item +B<-g> will generate a new dump on the BMC. Dump generation can take a few minutes. =item B<-d> will download a single dump or all generated dumps from the BMC to /var/log/xcat/dump on management or service node. @@ -418,7 +418,7 @@ For MPA only. Connecting to the IP of MPA from the hosts.otherinterfaces to set =item B={I,{[I],[I],[I],[I]}|*} -Not only for FSP/BPA but also for IMM. Get or set the FSP/BPA/IMM network parameters. If '*' is specified, all parameters are read from the xCAT database. +Not only for FSP/BPA but also for IMM. Get or set the FSP/BPA/IMM network parameters. If '*' is specified, all parameters are read from the xCAT database. If the value of I is '0.0.0.0', this I will be configured as a DHCP client. Otherwise this I will be configured with a static IP. Note that IPs of FSP/BPAs will be updated with this option, user needs to put the new IPs to /etc/hosts manually or with xCAT command makehosts. For more details, see the man page of makehosts. @@ -501,7 +501,7 @@ Query or set sysname for CEC or Frame. If no value specified, means to query sys =item B={B} -List or set pending power on side for CEC or Frame. If no pending_power_on_side value specified, the pending power on side for the CECs or frames will be displayed. If specified, the pending_power_on_side value will be set to CEC's FSPs or Frame's BPAs. The value 'temp' means T-side or temporary side. The value 'perm' means P-side or permanent side. +List or set pending power on side for CEC or Frame. If no pending_power_on_side value specified, the pending power on side for the CECs or frames will be displayed. If specified, the pending_power_on_side value will be set to CEC's FSPs or Frame's BPAs. The value 'temp' means T-side or temporary side. The value 'perm' means P-side or permanent side. =item B