From 8a39aa8aa5b4976c0b2a9098acabb1fde1523562 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Tue, 27 Oct 2015 16:54:21 -0400 Subject: [PATCH 1/3] Remove references to sourceforge in these files --- build-ubunturepo | 13 +- buildcore.sh | 25 -- .../confluent/server/confluent_server.rst | 8 +- docs/source/advanced/kit/hpckit.rst | 8 +- .../basic_concepts/global_cfg/index.rst | 2 +- .../common/deployment/generate_img.rst | 3 +- .../references/man1/getxcatdocs.1.rst | 123 ------ .../references/man1/xpbsnodes.1.rst | 7 +- .../admin-guides/references/man5/site.5.rst | 4 +- .../admin-guides/references/man5/xcatdb.5.rst | 2 +- .../admin-guides/references/man8/xcatd.8.rst | 2 +- docs/source/overview/xcat2_release.rst | 332 +++++++-------- perl-xCAT/README | 2 +- perl-xCAT/db2man | 2 +- perl-xCAT/xCAT/Schema.pm | 3 +- xCAT-OpenStack-baremetal/debian/control | 2 +- .../ironic_baremetal/setup.cfg | 2 +- xCAT-UI/xCAT-UI.spec | 2 +- .../xcat/kits/kit_template/docs/index.html | 4 +- .../plugins/sample/imageprofile.pm | 2 +- .../kit_template/plugins/sample/nodemgmt.pm | 4 +- xCAT-client/bin/getxcatdocs | 400 +----------------- xCAT-client/debian/copyright | 2 +- xCAT-client/pods/man1/getxcatdocs.1.pod | 77 ---- xCAT-client/pods/man1/xpbsnodes.1.pod | 1 + xCAT-client/pods/man8/xcatd.8.pod | 2 +- xCAT-client/xpod2man | 2 +- .../ib/scripts/Mellanox/mlnxofed_ib_install | 51 ++- .../share/xcat/install/rh/kvm.rhels5.tmpl | 3 +- xCAT-server/share/xcat/install/rh/kvm.tmpl | 3 +- .../sles/service.sles11.ppc64.repolist | 4 +- xCAT-server/xCAT-wsapi/genrestapidoc.pm | 8 +- xCAT-test/autotest/confsamples/xCATreg.conf | 6 +- xCAT-test/autotest/linux.conf.template | 2 +- 34 files changed, 246 insertions(+), 867 deletions(-) delete mode 100644 docs/source/guides/admin-guides/references/man1/getxcatdocs.1.rst delete mode 100644 xCAT-client/pods/man1/getxcatdocs.1.pod diff --git a/build-ubunturepo b/build-ubunturepo index 61d2398dc..dd8a36f23 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -6,20 +6,15 @@ # # # Getting Started: -# - Check out the xcat-core svn repository (either the trunk or a branch) into -# a dir called /src/xcat-core, where is the same as the release dir it will be -# uploaded to in sourceforge (e.g. devel, or 2.3). -# - You probably also want to put root's pub key from the build machine onto sourceforge for -# the upload user listed below, so you don't have to keep entering pw's. You can do this -# at https://xcat.org/setting/ssh +# - Clone the xcat-core git repository int a directory called /src/xcat-core, where +# is the same name as the release dir it is uploaded to xcat.org (e.g devel, 2.9, 2.10) # - make sure reprepro is installed on the build machine -# - Run this script from the local svn repository you just created. It will create the other directories that are needed. +# - Run this script from the local git repository you just created. It will create the other directories that are needed. # Usage: attr=value attr=value ... ./build-ubunturepo { -c | -d } # PROMOTE=1 - if the attribute "PROMOTE" is specified, means an official dot release. This does not # actually build xcat, just uploads the most recent snap build to http://xcat.org/files/xcat/ . -# If not specified, a snap build is assumed, which uploads to https://xcat.org/files/yum/ -# or https://xcat.org/files/aix/. +# If not specified, a snap build is assumed, which uploads to https://xcat.org/files/xcat/ # PREGA=1 - use this option with PROMOTE=1 on a branch that already has a released dot release, but this # build is a GA candidate build, not to be released yet. This will result in the tarball # being uploaded to http://xcat.org/files/xcat/repos/apt diff --git a/buildcore.sh b/buildcore.sh index a936c8185..0fbcf0ec6 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -566,28 +566,3 @@ else while [ $((i+=1)) -le 5 ] && ! rsync -v --force $TARNAME $USER@$SERVER:$YUMDIR/$YUM/$REL$EMBEDDIR/ do : ; done fi - -# Extract and upload the man pages in html format -#if [ "$OSNAME" != "AIX" -a "$REL" = "devel" -a "$PROMOTE" != 1 -a -z "$EMBED" ]; then -# echo "Extracting and uploading man pages to htdocs/ ..." -# mkdir -p man -# cd man -# rm -rf opt -# rpm2cpio ../$XCATCORE/xCAT-client-*.$NOARCH.rpm | cpio -id '*.html' -# rpm2cpio ../$XCATCORE/perl-xCAT-*.$NOARCH.rpm | cpio -id '*.html' -# rpm2cpio ../$XCATCORE/xCAT-test-*.$NOARCH.rpm | cpio -id '*.html' -# rpm2cpio ../$XCATCORE/xCAT-buildkit-*.$NOARCH.rpm | cpio -id '*.html' -# #rpm2cpio ../$XCATCORE/xCAT-OpenStack-*.x86_64.rpm | cpio -id '*.html' -# rpm2cpio ../$XCATCORE/xCAT-SoftLayer-*.$NOARCH.rpm | cpio -id '*.html' -# rpm2cpio ../$XCATCORE/xCAT-vlan-*.$NOARCH.rpm | cpio -id '*.html' -# i=0 -# while [ $((i+=1)) -le 5 ] && ! rsync $verboseflag -r opt/xcat/share/doc/man1 opt/xcat/share/doc/man3 opt/xcat/share/doc/man5 opt/xcat/share/doc/man7 opt/xcat/share/doc/man8 $UPLOADUSER,xcat@web.sourceforge.net:htdocs/ -# do : ; done -# -# # extract and upload the tools readme -# rpm2cpio ../$XCATCORE/xCAT-server-*.$NOARCH.rpm | cpio -id ./opt/xcat/share/xcat/tools/README.html -# i=0 -# while [ $((i+=1)) -le 5 ] && ! rsync $verboseflag opt/xcat/share/xcat/tools/README.html $UPLOADUSER,xcat@web.sourceforge.net:htdocs/tools/ -# do : ; done -# cd .. -#fi diff --git a/docs/source/advanced/confluent/server/confluent_server.rst b/docs/source/advanced/confluent/server/confluent_server.rst index abda9882f..31a42d727 100644 --- a/docs/source/advanced/confluent/server/confluent_server.rst +++ b/docs/source/advanced/confluent/server/confluent_server.rst @@ -14,7 +14,7 @@ confluent rpms ~~~~ -The latest confluent rpms are built and provided for your convenience: `confluent rpms `_. However, the rpms are not built on a regular release schedule. To use the latest code base, consider building the rpms from :ref:`label_confluent_source`. +The latest confluent rpms are built and provided for your convenience: `confluent rpms `_. However, the rpms are not built on a regular release schedule. To use the latest code base, consider building the rpms from :ref:`label_confluent_source`. The following example downloads the confluent tar package and creates a local repository on your management node:: @@ -45,7 +45,7 @@ To build from source, ensure your machine has the correct development packages t confluent-dep ------------- -The latest confluent dependency packages are provided for your convenience: `confluent-deps `_ +The latest confluent dependency packages are provided for your convenience: `confluent-deps `_ The following example describes the steps for **rhels7.1** on **ppc64le**:: @@ -57,7 +57,7 @@ The following example describes the steps for **rhels7.1** on **ppc64le**:: ./mklocalrepo.sh **Note:** If the OS/architecture you are looking for is not provided under confluent-dep, -please send an email to the xcat-users mailing list: xcat-users@lists.sourceforge.net +please send an email to the xcat-user mailing list: xcat-user@lists.sourceforge.net Install @@ -157,7 +157,7 @@ Now point your browser to: ``http://:`` and log in with the non Confluent consoles ================== -confluent-web is provided in a subdirectory under the confluent project `confluent_web `_ +confluent-web is provided in a subdirectory under the confluent project `confluent_web `_ Download the content of that directory to ``/var/www/html/confluent`` and point your browser to:: diff --git a/docs/source/advanced/kit/hpckit.rst b/docs/source/advanced/kit/hpckit.rst index b5728adfd..095ddbadb 100644 --- a/docs/source/advanced/kit/hpckit.rst +++ b/docs/source/advanced/kit/hpckit.rst @@ -179,13 +179,13 @@ IBM Compilers XLC and XLF software kits are available for Linux XLC 12.1.0.3 and XLF 14.1.0.3, and newer releases on System P. -For XLC 13.1.1.0 and XLF 15.1.1.0, xCAT ships partial software kits for Ubuntu on sourceforge: +For XLC 13.1.1.0 and XLF 15.1.1.0, xCAT ships partial software kits for Ubuntu at: - https://sourceforge.net/projects/xcat/files/kits/hpckits/2.9/Ubuntu/ppc64_Little_Endian/ + http://xcat.org/files/xcat/kits/hpckits/2.9/Ubuntu/ppc64_Little_Endian/ -For XLC 13.1.2.0 and XLF 15.1.2.0, xCAT ships partial software kits for rhels7.2 on github +For XLC 13.1.2.0 and XLF 15.1.2.0, xCAT ships partial software kits for RHEL 7.2 at: - http://xcat.org/files/kits/hpckits/2.11/rhels7.2/ppc64le/ + http://xcat.org/files/xcat/kits/hpckits/2.11/rhels7.2/ppc64le/ For older Linux releases on System P, and for AIX, use the xCAT HPC Integration Support 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 8a119fd6a..5757ae999 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 @@ -10,7 +10,7 @@ Database Attributes ------------------- * 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 [TODO noderange] manpage for details on supported formats. + 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 :doc:`noderange ` 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. 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 05e60d137..38869ebaf 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 @@ -38,7 +38,8 @@ Note: There is a current restriction that exported 2.7 xCAT images cannot be imp We want to create a system of making xCAT images more portable so that they can be shared and prevent people from reinventing the wheel. While every install is unique there are some things that can be shared among different sites to make images more portable. In addition, creating a method like this allows us to create snap shots of images we may find useful to revert to in different situations. -Image exporting and importing are supported for statefull (diskfull), stateless (diskless) clusters. In the following chapters we'll show you how to use imgexport and imgimport commands to export and import images. The man pages for the commands can be found at ``_ and ``_ +Image exporting and importing are supported for statefull (diskfull) and stateless (diskless) clusters. The following documentation will show how to use :doc:`imgexport ` to export images and :doc:`imgimport ` to import images. + Exporting an image ------------------ diff --git a/docs/source/guides/admin-guides/references/man1/getxcatdocs.1.rst b/docs/source/guides/admin-guides/references/man1/getxcatdocs.1.rst deleted file mode 100644 index 5f507c50d..000000000 --- a/docs/source/guides/admin-guides/references/man1/getxcatdocs.1.rst +++ /dev/null @@ -1,123 +0,0 @@ - -############# -getxcatdocs.1 -############# - -.. highlight:: perl - - -**** -NAME -**** - - -\ **getxcatdocs**\ - downloads the xCAT documentation and converts to HTML and PDF - - -******** -SYNOPSIS -******** - - -\ **getxcatdocs**\ [\ **-?**\ | \ **-h**\ | \ **--help**\ ] -\ **getxcatdocs**\ [\ **-v**\ | \ **--verbose**\ ] [\ *destination-dir*\ ] -\ **getxcatdocs**\ [\ **-v**\ | \ **--verbose**\ ] [\ **-c**\ | \ **--continue**\ ] [\ **-d**\ | \ **--doc**\ \ *single_doc*\ ] [\ *destination-dir*\ ] - - -*********** -DESCRIPTION -*********** - - -The \ **getxcatdocs**\ command downloads the xCAT documentation from the wiki and converts it to both HTML and PDF. -This enables reading the documentation when you do not have internet access. Note that this command does not -download/convert the entire xCAT wiki - only the "official" xCAT documentation linked from http://sourceforge.net/p/xcat/wiki/XCAT_Documentation. - -If \ *destination-dir*\ is specified, \ **getxcatdocs**\ will put the converted documentation in that directory, in 3 sub-directories: html, pdf, images. -Otherwise, it will put it in the current directory (in the same three sub-directories). - -If \ **--doc**\ \ *single_doc*\ is specified, only that one wiki page will be downloaded and converted. - -\ **getxcatdocs**\ uses curl to run the Allura wiki API to download the document markdown text, and Pandoc with LaTex them to PDF. You must have all of these functions installed to run \ **getxcatdocs**\ . See: -http://sourceforge.net/p/xcat/wiki/Editing_and_Downloading_xCAT_Documentation/#converting-wiki-pages-to-html-and-pdfs - -Limitations: -============ - - - -\* - - This command does not run on AIX or Windows. - - - - - -******* -OPTIONS -******* - - - -\ **-?|-h|--help**\ - - Display usage message. - - - -\ **-v|--verbose**\ - - Run the command in verbose mode. - - - -\ **-c|--continue**\ - - If a previous run of this command failed (which often happens if you lose your network connection), continue processing using files already downloaded to your markdown directory. - - - -\ **-d|--doc**\ \ *single_doc*\ - - Run this command for a single document only. If you get errors about Official-xcat-doc.png not found, either download this image directly from http://sourceforge.net/p/xcat/wiki/XCAT_Documentation/attachment/Official-xcat-doc.png or run \ **getxcatdocs -d XCAT_Documentation**\ first. - - - - -************ -RETURN VALUE -************ - - -0 The command completed successfully. - -1 An error has occurred. - - -******** -EXAMPLES -******** - - - -1. - - To download/convert the documentation and put it in ~/tmp: - - - .. code-block:: perl - - getxcatdocs ~/tmp - - - - - -***** -FILES -***** - - -/opt/xcat/bin/getxcatdocs - diff --git a/docs/source/guides/admin-guides/references/man1/xpbsnodes.1.rst b/docs/source/guides/admin-guides/references/man1/xpbsnodes.1.rst index 92b45a942..6f3e6ba4d 100644 --- a/docs/source/guides/admin-guides/references/man1/xpbsnodes.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xpbsnodes.1.rst @@ -24,12 +24,13 @@ SYNOPSIS \ **xpbsnodes**\ [\ **-h**\ |\ **--help**\ ] [\ **-v**\ |\ **--version**\ ] -******************************************************************************************************* +*********** DESCRIPTION -\ **xpbsnodes**\ is a front-end to PBS pbsnode but uses xCAT's noderange to specify nodes. -******************************************************************************************************* +*********** +\ **xpbsnodes**\ is a front-end to PBS pbsnode but uses xCAT's noderange to specify nodes. + ******* OPTIONS 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 ddd8555d2..fee21830f 100644 --- a/docs/source/guides/admin-guides/references/man5/site.5.rst +++ b/docs/source/guides/admin-guides/references/man5/site.5.rst @@ -370,9 +370,7 @@ site Attributes: VIRTUALIZATION ATTRIBUTES ----------------------- usexhrm: Have xCAT run its xHRM script when booting up KVM guests to set the - virtual network bridge up correctly. See - https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Virtualization_with_KVM#Setting_up_a_network_bridge - + virtual network bridge up correctly. 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 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 fc2c98561..785c909e0 100644 --- a/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst +++ b/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst @@ -163,7 +163,7 @@ 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 -https://sourceforge.net/p/xcat/wiki/Listing_and_Modifying_the_Database/#easy-regular-expressions +http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/basic_concepts/xcat_db/regexp_db.html#easy-regular-expressions 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 89aae4c6d..fe627ee31 100644 --- a/docs/source/guides/admin-guides/references/man8/xcatd.8.rst +++ b/docs/source/guides/admin-guides/references/man8/xcatd.8.rst @@ -31,7 +31,7 @@ The heart of the xCAT architecture is the xCAT daemon \ **xcatd**\ on the manag Errors and information are reported through syslog to the /var/log/messages file. You can search for xCAT in those messages. -For further information: See https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_2_Architecture. +See http://xcat-docs.readthedocs.org/en/latest/overview/index.html#xcat-architecture for more information. ******** diff --git a/docs/source/overview/xcat2_release.rst b/docs/source/overview/xcat2_release.rst index 3d49d5bc9..1d9b5288e 100644 --- a/docs/source/overview/xcat2_release.rst +++ b/docs/source/overview/xcat2_release.rst @@ -10,181 +10,181 @@ For a complete list of new functions, bug fixes, restrictions, and known problem xCAT 2.10.x ----------- -+------------------------------+---------------+-------------+----------------------------------+ -|xCAT |New OS |New |New Feature | -|Version | |Hardware | | -+==============================+===============+=============+==================================+ -|| xCAT 2.10 |- RHEL 7.1 LE |- Power 8 LE |- Ubuntu LE -> RH 7.1 Mix | -|| 2015/07/31 |- UBT 15.4 LE | |- Cuda install for Ubuntu 14.4.2 | -|| |- SLES 12 LE | |- additional kernel parameters | -| `2.10 Release Notes `_ |- SLES 11 SP4 | |- New command: switchdiscover | -| | | |- New command: makentp | -| | | |- New command: bmcdiscovery | -| | | |- Support getmacs --noping | -| | | |- site.xcatdebugmode | -| | | |- validate netboot attribute | -| | | |- buildcore on local server | -| | | |- copycds genereates less osimage | -| | | |- nodeset only accecpt osimage= | -+------------------------------+---------------+-------------+----------------------------------+ ++---------------------------------+---------------+-------------+----------------------------------+ +|xCAT |New OS |New |New Feature | +|Version | |Hardware | | ++=================================+===============+=============+==================================+ +|| xCAT 2.10 |- RHEL 7.1 LE |- Power 8 LE |- Ubuntu LE -> RH 7.1 Mix | +|| 2015/07/31 |- UBT 15.4 LE | |- Cuda install for Ubuntu 14.4.2 | +|| |- SLES 12 LE | |- additional kernel parameters | +| `2.10 Release Notes `_ |- SLES 11 SP4 | |- New command: switchdiscover | +| | | |- New command: makentp | +| | | |- New command: bmcdiscovery | +| | | |- Support getmacs --noping | +| | | |- site.xcatdebugmode | +| | | |- validate netboot attribute | +| | | |- buildcore on local server | +| | | |- copycds genereates less osimage | +| | | |- nodeset only accecpt osimage= | ++---------------------------------+---------------+-------------+----------------------------------+ xCAT 2.9.x ---------- -+------------------------------+---------------+-------------+----------------------------------+ -|xCAT |New OS |New |New Feature | -|Version | |Hardware | | -+==============================+===============+=============+==================================+ -|| xCAT 2.9.1 |- RHEL 7.1 | |- Nvidia GPU | -|| 2015/03/20 |- UBT 14.4.2 | |- Ubuntu Local Mirror | -|| | | |- Sles12 diskless | -| `2.9.1 Release Notes BE mix cluster | -| XCAT_2.9.1_Release_Notes/>`_ | | |- nics.nicextraparams | -| | | |- xCAT in Docker Image | -| | | |- Confluent replaces conserver | -| | | |- TLSv1 in xcatd | -| | | |- New GPG key for xCAT packages | -| | | |- fast restart xcatd (systemd) | -| | | |- netboot method: grub2-tftp | -| | | |- netboot method: grub2-http | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.9 |- UBT 14.4 LE |- Power 8 LE |- sysclone enhancements | -|| 2014/12/12 |- UBT 14.4.1 LE| |- site.auditnosyslog | -|| |- UBT 14.10 | |- site.nmapoptions | -| `2.9 Release Notes `_ |- AIX 7.1.3.15 | |- IB support for P8 LE | -| |- PowerKVM | | | -| | | | | -+------------------------------+---------------+-------------+----------------------------------+ ++---------------------------------+---------------+-------------+----------------------------------+ +|xCAT |New OS |New |New Feature | +|Version | |Hardware | | ++=================================+===============+=============+==================================+ +|| xCAT 2.9.1 |- RHEL 7.1 | |- Nvidia GPU | +|| 2015/03/20 |- UBT 14.4.2 | |- Ubuntu Local Mirror | +|| | | |- Sles12 diskless | +| `2.9.1 Release Notes BE mix cluster | +| XCAT_2.9.1_Release_Notes/>`_ | | |- nics.nicextraparams | +| | | |- xCAT in Docker Image | +| | | |- Confluent replaces conserver | +| | | |- TLSv1 in xcatd | +| | | |- New GPG key for xCAT packages | +| | | |- fast restart xcatd (systemd) | +| | | |- netboot method: grub2-tftp | +| | | |- netboot method: grub2-http | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.9 |- UBT 14.4 LE |- Power 8 LE |- sysclone enhancements | +|| 2014/12/12 |- UBT 14.4.1 LE| |- site.auditnosyslog | +|| |- UBT 14.10 | |- site.nmapoptions | +| `2.9 Release Notes `_ |- AIX 7.1.3.15 | |- IB support for P8 LE | +| |- PowerKVM | | | +| | | | | ++---------------------------------+---------------+-------------+----------------------------------+ xCAT 2.8.x ---------- -+------------------------------+---------------+-------------+----------------------------------+ -|xCAT |New OS |New |New Feature | -|Version | |Hardware | | -+==============================+===============+=============+==================================+ -|| xCAT 2.8.4 |- RHEL 6.5 | |- RHEL 7 experimental, | -|| 2014/03/23 |- RHEL 5.10 | |- support xCAT clusterzones | -|| | | |- commands enhancements | -| `2.8.4 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.8.3 |- AIX 7.3.1.1 |- Xeon Phi |- xcatd flow control | -|| 2013/11/15 |- AIX 7.3.1.0 | (P2) |- sysclone x86_64 image | -|| |- AIX 7.1.2 |- NS nx360M4 |- enhance genitird and nodeset | -| `2.8.3 Release Notes `_ | | |- deploy OpenStack on Ubuntu | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.8.2 |- SLES 11 SP3 |- Xeon Phi |- HPC KIT for ppc64 | -|| 2013/06/26 | | (P1) |- sysclone x86_64 image (P1) | -|| | | |- enhance xdsh, updatenode | -| `2.8.2 Release Notes `_ | | |- deploy OpenStack on Ubuntu | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.8.1 |- RHEL 6.4 | |- energy management for flex | -|| 2013/06/26 |- RHEL 5.9 | |- sequential discovery | -|| | | |- KIT enhancements | -| `2.8.1 Release Notes `_ | | |- def/xdsh/xdcp enhancements | -| | | |- updatenode enhancements | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.8 |- UBT 12.04 | |- Flex IMM setup | -|| 2013/02/28 |- WIN S 2012 | |- Multiple Hostname | -|| |- WIN 8 Hv | |- KIT support | -| `2.8 Release Notes `_ | | |- Localdisk for statelite | -| | | |- Manage MN itslef | -| | | |- site auditskipcmds | -| | | |- precreate postscripts | -| | | |- mypostscript templates | -| | | |- pasu command | -| | | |- postscripts on stateful boot | -| | | |- node update status attrs | -| | | |- updatenode enhancements | -+------------------------------+---------------+-------------+----------------------------------+ ++---------------------------------+---------------+-------------+----------------------------------+ +|xCAT |New OS |New |New Feature | +|Version | |Hardware | | ++=================================+===============+=============+==================================+ +|| xCAT 2.8.4 |- RHEL 6.5 | |- RHEL 7 experimental, | +|| 2014/03/23 |- RHEL 5.10 | |- support xCAT clusterzones | +|| | | |- commands enhancements | +| `2.8.4 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.8.3 |- AIX 7.3.1.1 |- Xeon Phi |- xcatd flow control | +|| 2013/11/15 |- AIX 7.3.1.0 | (P2) |- sysclone x86_64 image | +|| |- AIX 7.1.2 |- NS nx360M4 |- enhance genitird and nodeset | +| `2.8.3 Release Notes `_ | | |- deploy OpenStack on Ubuntu | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.8.2 |- SLES 11 SP3 |- Xeon Phi |- HPC KIT for ppc64 | +|| 2013/06/26 | | (P1) |- sysclone x86_64 image (P1) | +|| | | |- enhance xdsh, updatenode | +| `2.8.2 Release Notes `_ | | |- deploy OpenStack on Ubuntu | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.8.1 |- RHEL 6.4 | |- energy management for flex | +|| 2013/06/26 |- RHEL 5.9 | |- sequential discovery | +|| | | |- KIT enhancements | +| `2.8.1 Release Notes `_ | | |- def/xdsh/xdcp enhancements | +| | | |- updatenode enhancements | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.8 |- UBT 12.04 | |- Flex IMM setup | +|| 2013/02/28 |- WIN S 2012 | |- Multiple Hostname | +|| |- WIN 8 Hv | |- KIT support | +| `2.8 Release Notes `_ | | |- Localdisk for statelite | +| | | |- Manage MN itslef | +| | | |- site auditskipcmds | +| | | |- precreate postscripts | +| | | |- mypostscript templates | +| | | |- pasu command | +| | | |- postscripts on stateful boot | +| | | |- node update status attrs | +| | | |- updatenode enhancements | ++---------------------------------+---------------+-------------+----------------------------------+ xCAT 2.7.x ---------- -+------------------------------+---------------+-------------+----------------------------------+ -|xCAT |New OS |New |New Feature | -|Version | |Hardware | | -+==============================+===============+=============+==================================+ -|| xCAT 2.7.8 |- AIX 7.1.3.1 | | | -|| 2014/01/24 |- AIX 7.1.3.0 | | | -|| |- AIX 6.1.9.1 | | | -| `2.7.8 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.7.7 |- RHEL 6.4 | |- sinv for devices | -|| 2013/03/17 | | |- Flex energy mgt and rbeacon | -|| | | | | -| `2.7.7 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.7.6 |- SLES 10 SP4 | |- HPC Integration updates | -|| 2012/11/30 |- AIX 6.1.8 | | | -|| |- AIX 7.1.2 | | | -| `2.7.6 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.7.5 |- RHEL 6.3 | |- virtualization with RHEV | -|| 2012/10/29 | | |- hardware discovery for x Flex | -|| | | |- enhanced AIX HASN | -| `2.7.5 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.7.4 |- SLES11 SP2 |- Flex |- improved IPMI for large systems | -|| 2012/08/27 | | | | -|| | | | | -| `2.7.4 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.7.3 |- SLES11 SP2 |- Flex |- HPC Integration updates | -|| 2012/06/22 |- RHEL 6.2 | | | -|| | | | | -| `2.7.3 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.7.2 |- AIX 7.1.1.3 |- Power 775 |- SLES 11 kdump | -|| 2012/05/25 | |- Flex for P |- HPC Integration updates | -|| | | | | -| `2.7.2 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.7.1 |- RHEL 6.3 | |- minor enhancements | -|| 2012/04/20 | | |- bug fixes | -|| | | | | -| `2.7.1 Release Notes `_ | | | | -+------------------------------+---------------+-------------+----------------------------------+ -|| xCAT 2.7 |- RHEL 6.2 | |- xcatd memory usage reduced | -|| 2012/03/19 | | |- xcatdebug for xcatd and plugins | -|| | | |- lstree command | -| `2.7 Release Notes `_ | | |- rpower suspend select IBM hw | -| | | |- stateful ESXi5 | -| | | |- xnba UEFI boot | -| | | |- httpd for postscripts | -| | | |- rolling updates | -| | | |- Nagios monitoring plugin | -+------------------------------+---------------+-------------+----------------------------------+ ++---------------------------------+---------------+-------------+----------------------------------+ +|xCAT |New OS |New |New Feature | +|Version | |Hardware | | ++=================================+===============+=============+==================================+ +|| xCAT 2.7.8 |- AIX 7.1.3.1 | | | +|| 2014/01/24 |- AIX 7.1.3.0 | | | +|| |- AIX 6.1.9.1 | | | +| `2.7.8 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.7.7 |- RHEL 6.4 | |- sinv for devices | +|| 2013/03/17 | | |- Flex energy mgt and rbeacon | +|| | | | | +| `2.7.7 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.7.6 |- SLES 10 SP4 | |- HPC Integration updates | +|| 2012/11/30 |- AIX 6.1.8 | | | +|| |- AIX 7.1.2 | | | +| `2.7.6 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.7.5 |- RHEL 6.3 | |- virtualization with RHEV | +|| 2012/10/29 | | |- hardware discovery for x Flex | +|| | | |- enhanced AIX HASN | +| `2.7.5 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.7.4 |- SLES11 SP2 |- Flex |- improved IPMI for large systems | +|| 2012/08/27 | | | | +|| | | | | +| `2.7.4 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.7.3 |- SLES11 SP2 |- Flex |- HPC Integration updates | +|| 2012/06/22 |- RHEL 6.2 | | | +|| | | | | +| `2.7.3 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.7.2 |- AIX 7.1.1.3 |- Power 775 |- SLES 11 kdump | +|| 2012/05/25 | |- Flex for P |- HPC Integration updates | +|| | | | | +| `2.7.2 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.7.1 |- RHEL 6.3 | |- minor enhancements | +|| 2012/04/20 | | |- bug fixes | +|| | | | | +| `2.7.1 Release Notes `_ | | | | ++---------------------------------+---------------+-------------+----------------------------------+ +|| xCAT 2.7 |- RHEL 6.2 | |- xcatd memory usage reduced | +|| 2012/03/19 | | |- xcatdebug for xcatd and plugins | +|| | | |- lstree command | +| `2.7 Release Notes `_ | | |- rpower suspend select IBM hw | +| | | |- stateful ESXi5 | +| | | |- xnba UEFI boot | +| | | |- httpd for postscripts | +| | | |- rolling updates | +| | | |- Nagios monitoring plugin | ++---------------------------------+---------------+-------------+----------------------------------+ diff --git a/perl-xCAT/README b/perl-xCAT/README index c015636c2..52f308009 100644 --- a/perl-xCAT/README +++ b/perl-xCAT/README @@ -2,7 +2,7 @@ xCAT - eXtreme Cloud Administration Toolkit xCAT is a toolkit for the deployment and administration of clusters. -xCAT documentation is available at: http://xcat.sourceforge.net/ +xCAT documentation is available at: http://xcat-docs.readthedocs.org/ xCAT is made available as open source software under the EPL license: http://www.opensource.org/licenses/eclipse-1.0.php diff --git a/perl-xCAT/db2man b/perl-xCAT/db2man index b9f971c60..55d738ce9 100755 --- a/perl-xCAT/db2man +++ b/perl-xCAT/db2man @@ -267,7 +267,7 @@ See http://www.perl.com/doc/manual/html/pod/perlre.html for information on perl 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 -https://sourceforge.net/p/xcat/wiki/Listing_and_Modifying_the_Database/#easy-regular-expressions +http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/basic_concepts/xcat_db/regexp_db.html#easy-regular-expressions =head1 OBJECT DEFINITIONS diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index 7fb5347e6..6ef337519 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -1175,8 +1175,7 @@ site => { "VIRTUALIZATION ATTRIBUTES\n". " -----------------------\n". " usexhrm: Have xCAT run its xHRM script when booting up KVM guests to set the\n". - " virtual network bridge up correctly. See\n". - " https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Virtualization_with_KVM#Setting_up_a_network_bridge\n\n". + " virtual network bridge up correctly.\n". " vcenterautojoin: When set to no, the VMWare plugin will not attempt to auto remove\n". " and add hypervisors while trying to perform operations. If users\n". " or tasks outside of xCAT perform the joining this assures xCAT\n". diff --git a/xCAT-OpenStack-baremetal/debian/control b/xCAT-OpenStack-baremetal/debian/control index e29fd97c5..076d274bb 100644 --- a/xCAT-OpenStack-baremetal/debian/control +++ b/xCAT-OpenStack-baremetal/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: xCAT Build-Depends: debhelper (>= 8.0.0) Standards-Version: 3.9.4 -Homepage: http://xcat.sourceforge.net/ +Homepage: http://xcat.org #Vcs-Git: git://git.debian.org/collab-maint/xcat-openstack-baremetal.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/xcat-openstack-baremetal.git;a=summary diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg b/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg index 06f9e268c..e972c1f67 100644 --- a/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg +++ b/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg @@ -6,7 +6,7 @@ description-file = README.rst author = chenglch author-email = chenglch@cn.ibm.com -home-page = http://xcat.sf.net/ +home-page = http://xcat.org classifier = Environment :: OpenStack Intended Audience :: Information Technology diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec index d866c741a..43d033b20 100644 --- a/xCAT-UI/xCAT-UI.spec +++ b/xCAT-UI/xCAT-UI.spec @@ -4,7 +4,7 @@ Version: %(cat Version) Release: snap%(date +"%Y%m%d%H%M") License: EPL Group: Applications/System -URL: http://xcat.sourceforge.net/ +URL: http://xcat.org Packager: IBM Vendor: IBM diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/docs/index.html b/xCAT-buildkit/share/xcat/kits/kit_template/docs/index.html index b00ea63c6..b0889da0e 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_template/docs/index.html +++ b/xCAT-buildkit/share/xcat/kits/kit_template/docs/index.html @@ -2,9 +2,9 @@ Product Documentation - + Redirecting to: -http://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Documentation +http://xcat-docs.readthedocs.org 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 97195e80b..6e3b081cb 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 @@ -67,7 +67,7 @@ use Data::Dumper; # and return values. # # For details on how to write plugin code, refer to: -# http://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Developer_Guide +# http://sourceforge.net/p/xcat/wiki/XCAT_Developer_Guide/ # # 3) To test the plugin commands: # a) Search this file for lines that start with "TEST:" and follow the 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 99af010f1..860b8e8ca 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 @@ -56,7 +56,7 @@ use Data::Dumper; # and return values. # # For details on how to write plugin code, refer to: -# http://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Developer_Guide +# http://sourceforge.net/p/xcat/wiki/XCAT_Developer_Guide/ # # 3) To test the plugin commands: # a) Search this file for lines that start with "TEST:" and follow the @@ -392,4 +392,4 @@ sub kitnoderefresh { # } -1; \ No newline at end of file +1; diff --git a/xCAT-client/bin/getxcatdocs b/xCAT-client/bin/getxcatdocs index d57f778d4..f7e08f32b 100755 --- a/xCAT-client/bin/getxcatdocs +++ b/xCAT-client/bin/getxcatdocs @@ -1,397 +1,9 @@ #!/usr/bin/perl +# xCAT documentation is hosted at http://xcat-docs.readthedocs.org/ +# +# You can download copies of the documentation in PDF or HTML from Read The Docs -# Downloads/converts the xCAT docs on the sourceforge Allura wiki to local HTML and PDF. -# This script is not dependent on other xCAT code, so you can copy it to a machine -# that has internet access to run it. Before running this command, you must have -# curl, pandoc, and latex installed. See: http://sourceforge.net/p/xcat/wiki/Editing_and_Downloading_xCAT_Documentation/#converting-wiki-pages-to-html-and-pdfs - - -# Note: do not use the --upload option, unless your machine has authority to write to http://xcat.sourceforge.net/doc/ . -# You also need to set $UPLOADUSER to your sourceforge user: -my $UPLOADUSER = 'bp-sawyers'; - -use strict; -use Getopt::Long; -use Cwd; -use JSON; -use List::Util qw[max]; - - -# URL for the xCAT Allura wiki API markdown on SourceForge -my $SF_URL='http://sourceforge.net/rest'; -my $WIKI_URL=$SF_URL.'/p/xcat/wiki/'; - -# Update this list if you group any xcat docs on a separate page such that they -# are no longer linked from the main doc page: -my @INDEXDOCS = ('XCAT_Documentation', - 'Power_775_Cluster_Documentation', - 'Highly_Available_Management_Node', - 'Mixed_Cluster_Support', - 'IBM_HPC_Stack_in_an_xCAT_Cluster'); - - -my $HELP; -my $UPLOAD; -my $UPLOADONLY; -my $IGNOREERRORS; -my $CONTINUE; -my $SINGLE_DOC; -my $VERBOSE; - -my $MDDIR; -my $HTMLDIR; -my $PDFDIR; -my $IMAGEDIR; -my %LOADEDDOCS; - -sub verbose { if ($VERBOSE) { print shift, "\n"; } } - -my $usage = sub { - my $exitcode = shift @_; - print "Usage: getxcatdocs [-?|-h|--help] \n"; - print "Usage: getxcatdocs [-v|--verbose] [-u|--upload] [--uploadonly] [-U|--uploaduser sourceforge_id] [-i|--ignoreerrors] []\n"; - print "Usage: getxcatdocs [-v|--verbose] [-c|--continue] [-d|--doc single_doc] [-i|--ignoreerrors] []\n"; - exit $exitcode; -}; - - -# Main processing - - # Process the cmd line args - Getopt::Long::Configure("bundling"); - #Getopt::Long::Configure("pass_through"); - Getopt::Long::Configure("no_pass_through"); - if (!GetOptions( - 'h|?|help' => \$HELP, - 'v|verbose' => \$VERBOSE, - 'u|upload' => \$UPLOAD, - 'uploadonly' => \$UPLOADONLY, - 'uploaduser' => \$UPLOADUSER, - 'c|continue' => \$CONTINUE, - 'i|ignoreerrors' => \$IGNOREERRORS, - 'd|doc=s' => \$SINGLE_DOC )) - { $usage->(1); } - - if ($HELP) { $usage->(0); } - - if ($^O =~ /^aix/i) { die "Error: this command is not yet supported on AIX.\n"; } - - my $DESTDIR = scalar(@ARGV) ? $ARGV[0] : '.'; - chdir($DESTDIR) or die "Can not cd to $DESTDIR: $!\n"; - - my $json = JSON->new(); - - if ($SINGLE_DOC) { - $MDDIR = '.'; - $HTMLDIR = '.'; - $PDFDIR = '.'; - $IMAGEDIR = '.'; - download_doc($SINGLE_DOC); - convert_doc($SINGLE_DOC); - exit; - } - - # Download the HTML docs and convert them all to pdfs - if (!$UPLOADONLY) { gethtmldocs(); } - - # tar/compress - my $date=`date +%Y%m%d%H%M`; - chop $date; - my $docname="xcat-docs-snap$date.tar.gz"; - - my $cmd = "tar -zcf $docname html pdf images 2>&1"; - verbose($cmd); - system($cmd) == 0 or die "Error running $cmd: $!, rc=$?"; - - # Optionally upload the tarball to sourceforge - if ($UPLOAD || $UPLOADONLY) { - my $count = 1; - #my $cmd = "rsync -v $docname $UPLOADUSER," . 'xcat@web.sourceforge.net:htdocs/doc/'; - my $cmd = "rsync -v $docname $UPLOADUSER," . 'xcat@web.sourceforge.net:/home/frs/project/x/xc/xcat/doc/'; - print "$cmd\n"; - while ($count<=5 && system("$cmd 2>&1")) { $count++; } - } - exit 0; - - - -sub gethtmldocs { - - $MDDIR = 'md'; - $HTMLDIR = 'html'; - $PDFDIR = 'pdf'; - $IMAGEDIR = 'images'; - - mkdir($MDDIR); - mkdir($HTMLDIR); - mkdir($PDFDIR); - mkdir($IMAGEDIR); - #delete all the files in the dirs in case they previously ran this - if ($CONTINUE) { - print "CONTINUING with files already in $MDDIR"; - my @mdfiles = glob "$MDDIR/*.md"; - foreach my $mdf (@mdfiles) { - $mdf =~ s/^$MDDIR\///; - $mdf =~ s/\.md//; - $LOADEDDOCS{$mdf}=1; - } - } else { - unlink <$MDDIR/*>; - unlink <$HTMLDIR/*>; - unlink <$PDFDIR/*>; - unlink <$IMAGEDIR/*>; - } - - print "\nDownloading and converting the xCAT wiki document list from $WIKI_URL ...\n"; - foreach my $index (@INDEXDOCS) { - my @related_docs = download_doc($index); - foreach my $docref (@related_docs) { - my $docref_name = $docref; - $docref_name =~ s/\/.*\/(.+)\/$/$1/; - download_doc($docref_name); - } - } - - foreach my $doc (keys %LOADEDDOCS) { - convert_doc($doc); - } - return; -} - - - -sub download_doc { - my $doc_name = shift; - - if ( $LOADEDDOCS{$doc_name} ) { return; } - verbose("processing $doc_name"); - $LOADEDDOCS{$doc_name}=1; - - my $curlcmd = "curl --retry 5 -X GET $WIKI_URL/$doc_name"; - verbose($curlcmd); - my $docjson = `$curlcmd`; - if ($? && !$IGNOREERRORS) { die "error encountered in $curlcmd \n";} - - my $jsout = $json->decode($docjson); - - foreach my $att (@{$jsout->{attachments}}) { - my $wgetcmd = "wget -P $IMAGEDIR/ $att->{url}"; - verbose($wgetcmd); - system($wgetcmd); - if ($? && !$IGNOREERRORS) { die "error encountered in $wgetcmd \n";} - } - - open(MDFILE, ">$MDDIR/${doc_name}.md") or die "Could not open >$MDDIR/${doc_name}.md"; - print MDFILE $jsout->{text}; - close MDFILE; - - return @{$jsout->{related_artifacts}}; -} - - - -sub convert_doc { - my $doc_name = shift; - - open(MDFILE, "<$MDDIR/${doc_name}.md") or die "Could not open <$MDDIR/${doc_name}.md"; - my @doc_lines = ; - close MDFILE; - my $doc_text = join('',@doc_lines); - - $doc_text = process_includes($doc_text,0); - - if ($doc_text =~ /begin_xcat_table/) { - open(MDFILE, ">$MDDIR/${doc_name}.md") or die "Could not open >$MDDIR/${doc_name}.md"; - print MDFILE $doc_text; - close MDFILE; - - convert_tables($doc_name); - - open(MDFILE, "<$MDDIR/${doc_name}.md") or die "Could not open <$MDDIR/${doc_name}.md"; - @doc_lines = ; - close MDFILE; - $doc_text = join('',@doc_lines); - } - - ## Make image refs local - $doc_text =~ s/\!\[\]\(.+\/(.+)\.png\)/\!\[\]\(\.\.\/$IMAGEDIR\/$1\.png\)/g; - $doc_text =~ s/\!\[\]\(.+\/(.+)\.PNG\)/\!\[\]\(\.\.\/$IMAGEDIR\/$1\.PNG\)/g; - $doc_text =~ s/\!\[\]\(.+\/(.+)\.jpg\)/\!\[\]\(\.\.\/$IMAGEDIR\/$1\.jpg\)/g; - $doc_text =~ s/\[img src=(.+)\.png\]/\!\[\]\(\.\.\/$IMAGEDIR\/$1\.png\)/g; - $doc_text =~ s/\[img src=(.+)\.PNG\]/\!\[\]\(\.\.\/$IMAGEDIR\/$1\.PNG\)/g; - $doc_text =~ s/\[img src=(.+)\.jpg\]/\!\[\]\(\.\.\/$IMAGEDIR\/$1\.jpg\)/g; - - ## Remove [TOC] entries - $doc_text =~ s/\[TOC\]//g; - - - open(MDFILE, ">$MDDIR/${doc_name}.md") or die "Could not open >$MDDIR/${doc_name}.md"; - print MDFILE $doc_text; - close MDFILE; - - my $pandoccmd = "pandoc -s --toc $MDDIR/${doc_name}.md -o $HTMLDIR/${doc_name}.html"; - verbose($pandoccmd); - system($pandoccmd); - if ($? && !$IGNOREERRORS) { die "error encountered in $pandoccmd \n";} - # This rename is probably a hack, but I didn't want to take the time to - # figure out what was going on: - # pandoc does different processing if target filetype is html - # but all internal refs only work in browser when there is no html filetype - rename "$HTMLDIR/${doc_name}.html","$HTMLDIR/${doc_name}"; - - $doc_text =~ s/\!\[\]\(\.\.\/$IMAGEDIR\/(.+)\.png\)/\!\[\]\(\.\/$IMAGEDIR\/$1\.png\)/g; - $doc_text =~ s/\!\[\]\(\.\.\/$IMAGEDIR\/(.+)\.PNG\)/\!\[\]\(\.\/$IMAGEDIR\/$1\.PNG\)/g; - $doc_text =~ s/\!\[\]\(\.\.\/$IMAGEDIR\/(.+)\.jpg\)/\!\[\]\(\.\/$IMAGEDIR\/$1\.jpg\)/g; - open(MDFILE, ">$MDDIR/${doc_name}.md") or die "Could not open >$MDDIR/${doc_name}.md"; - print MDFILE $doc_text; - close MDFILE; - my $pandoccmd2 = "pandoc --toc $MDDIR/${doc_name}.md -o $PDFDIR/${doc_name}.pdf"; - verbose($pandoccmd2); - system($pandoccmd2); - if ($? && !$IGNOREERRORS) { die "error encountered in $pandoccmd2 \n";} - -} - - - -sub process_includes { - my $doc_text = shift; - my $include_nest = shift; - - if ($include_nest++ > 10) { die "nested include processing greater than 10. Infinite recursion???"; } - - while (1) { - if ($doc_text =~ /\[\[(\s*)include (\s*)ref=(\s*)(.+)(\s*)\]\]/) { - my $next_include = $4; - download_doc($next_include); - - open(INCLDFILE, "<$MDDIR/${next_include}.md") or die "Could not open <$MDDIR/${next_include}.md"; - my @include_lines = ; - close INCLDFILE; - -# my $include_text = join('\n', @include_lines); - my $include_text = join('', @include_lines); - $include_text = process_includes($include_text,$include_nest); - - $doc_text =~ s/\[\[(\s*)include (\s*)ref=(\s*)$next_include(\s*)\]\]/$include_text/g; - - } else { - last; - } - } - - return $doc_text; -} - - -sub convert_tables { - my $doc_name=shift; - my $infile="$MDDIR/${doc_name}.md"; - my $outfile=$infile; - - open(MDFILE, "<$infile") or die "Could not open <$infile"; - my @inlines=; - close MDFILE; - my @outlines; - my @tablines; - - my $in_comment=0; - my $xcat_table=0; - my $numcols=1; - my @colwidths=(0); - my $tabcount=0; - - verbose("converting tables in $doc_name"); - foreach my $line (@inlines) { - if ($line =~ /\<\!---/) { $in_comment=1; next; } - if ($in_comment) { - if ($line =~ /begin_xcat_table/) {$xcat_table=1; next;} - if ($xcat_table) { - if ($line =~ /numcols=(\d+)/) { $numcols=$1; next;} - if ($line =~ /colwidths=([\d,]+)/) { @colwidths=split(',',$1); next;} - } - if ($line =~ /end_xcat_table/) { - my $separator = '+'; - foreach my $c (@colwidths) { - if ($c > 0) { $separator .= '-' x $c; } - $separator .= '+'; - } - $separator .= "\n"; - my $headsep = $separator; - $headsep =~ s/-/=/g; - my $rowline = $separator; - $rowline =~ s/-/ /g; - - my $nosep=0; - foreach my $tabline(@tablines) { - if ($tabline =~ /^\s*$/) { next;} - if ($tabline =~ /^\-\-/) { - push (@outlines,$headsep); - $nosep = 1; - next; - } - if ($nosep) { $nosep=0;} else {push (@outlines,$separator);} - $tabline =~ s/^\s*\|//; - my @vals = split (/\|/,$tabline); - my $last_cell_line=0; - my $colnum=0; - my @tabrow; - foreach my $c (@colwidths) { - if ($c > 0) { - my $colval=$vals[$colnum]; - $colval =~ s/(\s*)$//; - my $vallen = length($colval); - my $cell_line=0; - while ($vallen > $c) { - $tabrow[$cell_line++][$colnum] = substr($colval,0,$c); - $vallen -= $c; - $colval = substr($colval,$c,$vallen); - } - $tabrow[$cell_line][$colnum] = substr($colval,0,$vallen); - if ($vallen < $c) { - $tabrow[$cell_line][$colnum] .= " " x ($c-$vallen); - } - $last_cell_line = max($cell_line,$last_cell_line); - } - $colnum++; - } - - my @rowlines; - for (my $i=0;$i<=$last_cell_line;$i++) { - for (my $j=0;$j<=$numcols-1;$j++) { - $rowlines[$i] .= "|"; - if ($tabrow[$i][$j]) { $rowlines[$i] .= $tabrow[$i][$j]; } - else { $rowlines[$i] .= " " x $colwidths[$j]; } - } - $rowlines[$i] .= "|\n"; - } - push (@outlines,@rowlines); - } - push (@outlines,$separator); - - # reset to process next table - @tablines = (); - $xcat_table=0; $numcols=1;@colwidths=(0);next; - } - if ($line =~ /--\>/) {$in_comment=0;next;} - next; - } - if ($xcat_table) { push (@tablines,$line); next; } - - push (@outlines,$line); - next; - } - - open(MD2FILE, ">$outfile") or die "Could not open >$outfile"; - print MD2FILE @outlines; - close MD2FILE; - - return; - - - - - - -} +print "This command has been deprecetaed.\n\n"; +print "xCAT documentation is available at: http://xcat-docs.readthedocs.org/\n"; +print "Versions of the documentation can be downloaded for offline viewing from ReadTheDocs\n"; diff --git a/xCAT-client/debian/copyright b/xCAT-client/debian/copyright index ec4d5a294..2926a3f87 100644 --- a/xCAT-client/debian/copyright +++ b/xCAT-client/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Isaac Freeman on Tue May 6 11:40:34 EDT 2008 -It was downloaded via svn from http://sourceforge.net/projects/xcat/ +It was downloaded from http://xcat.org/ Upstream Author(s): IBM diff --git a/xCAT-client/pods/man1/getxcatdocs.1.pod b/xCAT-client/pods/man1/getxcatdocs.1.pod deleted file mode 100644 index a0c5729a4..000000000 --- a/xCAT-client/pods/man1/getxcatdocs.1.pod +++ /dev/null @@ -1,77 +0,0 @@ -=head1 NAME - -B - downloads the xCAT documentation and converts to HTML and PDF - -=head1 SYNOPSIS - -B [B<-?> | B<-h> | B<--help>] -B [B<-v> | B<--verbose>] [I] -B [B<-v> | B<--verbose>] [B<-c> | B<--continue>] [B<-d> | B<--doc> I] [I] - -=head1 DESCRIPTION - -The B command downloads the xCAT documentation from the wiki and converts it to both HTML and PDF. -This enables reading the documentation when you do not have internet access. Note that this command does not -download/convert the entire xCAT wiki - only the "official" xCAT documentation linked from http://sourceforge.net/p/xcat/wiki/XCAT_Documentation. - -If I is specified, B will put the converted documentation in that directory, in 3 sub-directories: html, pdf, images. -Otherwise, it will put it in the current directory (in the same three sub-directories). - -If B<--doc> I is specified, only that one wiki page will be downloaded and converted. - -B uses curl to run the Allura wiki API to download the document markdown text, and Pandoc with LaTex them to PDF. You must have all of these functions installed to run B. See: -http://sourceforge.net/p/xcat/wiki/Editing_and_Downloading_xCAT_Documentation/#converting-wiki-pages-to-html-and-pdfs - -=head2 Limitations: - -=over 3 - -=item * - -This command does not run on AIX or Windows. - -=back - -=head1 OPTIONS - -=over 10 - -=item B<-?|-h|--help> - -Display usage message. - -=item B<-v|--verbose> - -Run the command in verbose mode. - -=item B<-c|--continue> - -If a previous run of this command failed (which often happens if you lose your network connection), continue processing using files already downloaded to your markdown directory. - -=item B<-d|--doc> I - -Run this command for a single document only. If you get errors about Official-xcat-doc.png not found, either download this image directly from http://sourceforge.net/p/xcat/wiki/XCAT_Documentation/attachment/Official-xcat-doc.png or run B first. - -=back - -=head1 RETURN VALUE - -0 The command completed successfully. - -1 An error has occurred. - -=head1 EXAMPLES - -=over 3 - -=item 1. - -To download/convert the documentation and put it in ~/tmp: - - getxcatdocs ~/tmp - -=back - -=head1 FILES - -/opt/xcat/bin/getxcatdocs diff --git a/xCAT-client/pods/man1/xpbsnodes.1.pod b/xCAT-client/pods/man1/xpbsnodes.1.pod index eba75bed6..2a74672c6 100644 --- a/xCAT-client/pods/man1/xpbsnodes.1.pod +++ b/xCAT-client/pods/man1/xpbsnodes.1.pod @@ -10,6 +10,7 @@ B [B<-h>|B<--help>] [B<-v>|B<--version>] =head1 DESCRIPTION + B is a front-end to PBS pbsnode but uses xCAT's noderange to specify nodes. =head1 OPTIONS diff --git a/xCAT-client/pods/man8/xcatd.8.pod b/xCAT-client/pods/man8/xcatd.8.pod index 1b43cea55..437afd6fe 100644 --- a/xCAT-client/pods/man8/xcatd.8.pod +++ b/xCAT-client/pods/man8/xcatd.8.pod @@ -12,7 +12,7 @@ The heart of the xCAT architecture is the xCAT daemon B on the management Errors and information are reported through syslog to the /var/log/messages file. You can search for xCAT in those messages. -For further information: See https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_2_Architecture. +See http://xcat-docs.readthedocs.org/en/latest/overview/index.html#xcat-architecture for more information. =head1 EXAMPLES diff --git a/xCAT-client/xpod2man b/xCAT-client/xpod2man index a3db53f2b..6888b5c0e 100755 --- a/xCAT-client/xpod2man +++ b/xCAT-client/xpod2man @@ -156,7 +156,7 @@ descriptions of every table in the database. =head1 XCAT ADDITIONAL TOOLS -Some additional tools have been contributed to xCAT. You can read about them at http://xcat.sourceforge.net/tools/README.html +Some additional tools have been contributed to xCAT. You can read about them at http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/references/index.html or in /opt/xcat/share/xcat/tools/README.txt on your xCAT management node. =head1 XCAT COMMANDS diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install index 79cf0fb0f..644d38a1c 100755 --- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install +++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install @@ -1,6 +1,5 @@ #!/bin/sh # -# # Sample script to customize options for Mellonax OFED IB support # For AIX: # TBD @@ -13,37 +12,37 @@ # - Install IB rpms # # -#usage: -# Copy the xCAT mlnxofed_ib_install script file to postscripts directory: +# Usage: +# Copy the xCAT mlnxofed_ib_install script file to postscripts directory: # cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install /install/postscripts/mlnxofed_ib_install -# 1. install the ofed driver for diskfull node +# +# 1. install the ofed driver for diskful node # 1.1 set the postscript as one postbootscripts for the node -# chdef xcat01 -p postbootscripts=mlnxofed_ib_install,configiba +# chdef xcat01 -p postbootscripts=mlnxofed_ib_install,configiba # 1.2 copy the pkglist to the custom directory: -# cp /opt/xcat/share/xcat/install//compute...pkglist /install/custom/install//compute...pkglist -# Edit your /install/custom/install//compute...pkglist and add: -# #INCLUDE:/opt/xcat/share/xcat/ib/netboot//ib...pkglist# +# cp /opt/xcat/share/xcat/install//compute...pkglist /install/custom/install//compute...pkglist +# Edit your /install/custom/install//compute...pkglist and add: +# #INCLUDE:/opt/xcat/share/xcat/ib/netboot//ib...pkglist# # 1.3 Make sure the related osimage use the customized pkglist. -# lsdef -t osimage -o --install-compute -# if not, change it: -# chdef -t osimage -o --install-compute pkglist=/install/custom/install//compute...pkglist -# 1.4 do the diskfull installation +# lsdef -t osimage -o --install-compute +# if not, change it: +# chdef -t osimage -o --install-compute pkglist=/install/custom/install//compute...pkglist +# 1.4 do the diskful installation # 2. install the ofed driver for diskless images: # 2.1 copy the pkglist to the custom directory: -# cp /opt/xcat/share/xcat/netboot//compute...pkglist /install/custom/netboot//compute...pkglist -# Edit your /install/custom/netboot//.pkglist and add: -# #INCLUDE:/opt/xcat/share/xcat/ib/netboot//ib...pkglist# -# 2.2 Add to postinstall scripts -# Edit your /install/custom/netboot//.postinstall and add: -# installroot=$1 ofeddir=/install/post/otherpkgs///ofed/ NODESETSTATE=genimage /install/postscripts/mlnxofed_ib_install -# 2.3 Make sure the related osimage use the customized pkglist and customized compute.postinsall -# lsdef -t osimage -o --netboot-compute -# if not, change it: -# chdef -t osimage -o --netboot-compute pkglist=/install/custom/netboot//compute...pkglist postinstall=/install/custom/netboot//.postinstall -# 2.4 run genimage -# genimage --netboot-compute -# You can get more info from -# https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Managing_the_Mellanox_Infiniband_Network#Configure_IB_interfaces_during_Node_installation +# cp /opt/xcat/share/xcat/netboot//compute...pkglist /install/custom/netboot//compute...pkglist +# Edit your /install/custom/netboot//.pkglist and add: +# #INCLUDE:/opt/xcat/share/xcat/ib/netboot//ib...pkglist# +# 2.2 Add to postinstall scripts +# Edit your /install/custom/netboot//.postinstall and add: +# installroot=$1 ofeddir=/install/post/otherpkgs///ofed/ NODESETSTATE=genimage /install/postscripts/mlnxofed_ib_install +# 2.3 Make sure the related osimage use the customized pkglist and customized compute.postinsall +# lsdef -t osimage -o --netboot-compute +# if not, change it: +# chdef -t osimage -o --netboot-compute pkglist=/install/custom/netboot//compute...pkglist postinstall=/install/custom/netboot//.postinstall +# 2.4 run genimage +# genimage --netboot-compute +# You can get more info at: http://xcat-docs.readthedocs.org/ # OS=`uname` diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels5.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels5.tmpl index e113cfaaa..8438662ea 100644 --- a/xCAT-server/share/xcat/install/rh/kvm.rhels5.tmpl +++ b/xCAT-server/share/xcat/install/rh/kvm.rhels5.tmpl @@ -1,6 +1,5 @@ #egan@us.ibm.com -# read more on installing KVM here: -# http://xcat.wiki.sourceforge.net/KVM+ +# cmdline lang en_US diff --git a/xCAT-server/share/xcat/install/rh/kvm.tmpl b/xCAT-server/share/xcat/install/rh/kvm.tmpl index 601c195bf..39d7f2870 100644 --- a/xCAT-server/share/xcat/install/rh/kvm.tmpl +++ b/xCAT-server/share/xcat/install/rh/kvm.tmpl @@ -1,6 +1,5 @@ #egan@us.ibm.com -# read more on installing KVM here: -# http://xcat.wiki.sourceforge.net/KVM+ +# cmdline lang en_US diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist index 1d871ba27..cfcb8d0ca 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist @@ -8,6 +8,6 @@ #Type|URL|name #-- example: #Plaindir|file:/install/sles10sp2/x86_64/custom|custom -rpm-md|http://xcat.sourceforge.net/yum/xcat-dep/sles11/ppc64|xcat-dep -rpm-md|http://xcat.sourceforge.net/yum/devel/core-snap|core-snap +rpm-md|http://xcat.org/files/xcat/repos/yum/xcat-dep/sles11/ppc64|xcat-dep +rpm-md|http://xcat.org/files/xcat/repos/yum/devel/core-snap|core-snap #plaindir|file:///install/post/otherpkgs/sles11/ppc64|otherpkgs diff --git a/xCAT-server/xCAT-wsapi/genrestapidoc.pm b/xCAT-server/xCAT-wsapi/genrestapidoc.pm index 38aa88fce..1904c98f7 100755 --- a/xCAT-server/xCAT-wsapi/genrestapidoc.pm +++ b/xCAT-server/xCAT-wsapi/genrestapidoc.pm @@ -188,7 +188,7 @@ sub outwiki { $manpath =~ s/\.gz//; if ($manpath) { - print "Refer to the man page:[$def->{cmd}](http://xcat.sourceforge.net".$manpath.".html).\n\n"; + print "Refer to the man page:[$def->{cmd}](http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/references/index.html#xcat-man-pages).\n\n"; } else { print "Refer to the man page of ".$def->{cmd}." command.\n\n"; } @@ -260,7 +260,7 @@ sub outwiki { } -# outmediawiki is the backup subroutine to generate restapi doc for mediawiki which has been obsoleted from sourceforge +# outmediawiki is the backup subroutine to generate restapi doc for mediawiki sub outmediawiki { my $def = shift; my $opt = shift; @@ -292,7 +292,7 @@ sub outmediawiki { my $manpath = search_manpage($def->{cmd}); if ($manpath) { - print "Refer to the man page:[http://xcat.sourceforge.net".$manpath.".html ".$def->{cmd}."]\n\n"; + print "Refer to the man page:[http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/references/index.html#xcat-man-pages ".$def->{cmd}."]\n\n"; } else { print "Refer to the man page of ".$def->{cmd}." command.\n\n"; } @@ -376,7 +376,7 @@ sub gendoc { } if ($format eq "wiki") { - print "![](http://sourceforge.net/p/xcat/wiki/XCAT_Documentation/attachment/Official-xcat-doc.png)\n\n"; + print "![](http://xcat.org/images/Official-xcat-doc.png)\n\n"; print "\n[TOC]\n"; } diff --git a/xCAT-test/autotest/confsamples/xCATreg.conf b/xCAT-test/autotest/confsamples/xCATreg.conf index b5fcb136f..f2a5d1986 100644 --- a/xCAT-test/autotest/confsamples/xCATreg.conf +++ b/xCAT-test/autotest/confsamples/xCATreg.conf @@ -1,12 +1,12 @@ rhxmn=c910f04x27v02 rhxmnos=rhels6.5 -rhxmncurllink=http://sourceforge.net/projects/xcat/files/xcat-dep/2.x_Linux/ +rhxmncurllink=http://xcat.org/files/xcat/xcat-dep/2.x_Linux/ slesxmn=c910f04x27v05 slesxmnos=sles11.3 -slesxmncurllink=http://sourceforge.net/projects/xcat/files/xcat-dep/2.x_Linux/ +slesxmncurllink=http://xcat.org/files/xcat/xcat-dep/2.x_Linux/ ubuntuxmn=c910f04x27v08 ubuntuxmnos=ubuntu14.04.1 -ubuntuxmncurllink=http://sourceforge.net/projects/xcat/files/xcat-dep/2.x_Ubuntu/ +ubuntuxmncurllink=http://xcat.org/files/xcat/xcat-dep/2.x_Ubuntu/ mailgroup=litingt@cn.ibm.com #mailgroup=junxiaw@cn.ibm.com #mailgroup=gongjie@cn.ibm.com diff --git a/xCAT-test/autotest/linux.conf.template b/xCAT-test/autotest/linux.conf.template index dccc7ad36..0c0455012 100644 --- a/xCAT-test/autotest/linux.conf.template +++ b/xCAT-test/autotest/linux.conf.template @@ -77,7 +77,7 @@ KITDATA=kitdata #rm -rf /root/.ssh #rm -rf /install/autoinst #rm -rf /install/postscripts -#wget http://xcat.sourceforge.net/yum/devel/core-rpms-snap.tar.bz2 +#wget http://xcat.org/files/xcat/xcat-core/devel/Linux/core-snap/core-rpms-snap.tar.bz2 #tar jxf core-rpms-snap.tar.bz2 #./xcat-core/mklocalrepo.sh #mount -o loop /iso/RHEL5.4-Server-20090819.0-ppc-DVD.iso /iso/1 -t iso9660 From 0c2a3f4bffd3b97c19a11e51de278883d38f60d3 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Wed, 28 Oct 2015 09:20:56 -0400 Subject: [PATCH 2/3] Add link to the PDF version of the document for convenience --- xCAT-client/bin/getxcatdocs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xCAT-client/bin/getxcatdocs b/xCAT-client/bin/getxcatdocs index f7e08f32b..a40ffb02c 100755 --- a/xCAT-client/bin/getxcatdocs +++ b/xCAT-client/bin/getxcatdocs @@ -2,8 +2,11 @@ # xCAT documentation is hosted at http://xcat-docs.readthedocs.org/ # -# You can download copies of the documentation in PDF or HTML from Read The Docs +# Documentation can be downloaded for offline viewing from ReadTheDocs +# https://media.readthedocs.org/pdf/xcat-docs/latest/xcat-docs.pdf -print "This command has been deprecetaed.\n\n"; -print "xCAT documentation is available at: http://xcat-docs.readthedocs.org/\n"; -print "Versions of the documentation can be downloaded for offline viewing from ReadTheDocs\n"; +print "This command has been deprecated.\n\n"; +print "xCAT documentation is available at: http://xcat-docs.readthedocs.org/\n\n"; + +print "Documentation can be downloaded for offline viewing from ReadTheDocs.\n"; +print "\tPDF: https://media.readthedocs.org/pdf/xcat-docs/latest/xcat-docs.pdf\n"; From 7ec4f9350aa8d46342ec20b726392564901ce7af Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Wed, 28 Oct 2015 09:24:57 -0400 Subject: [PATCH 3/3] fix some indentation issues from pull request review --- .../ib/scripts/Mellanox/mlnxofed_ib_install | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install index 644d38a1c..8c0dc8fbe 100755 --- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install +++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install @@ -16,20 +16,20 @@ # Copy the xCAT mlnxofed_ib_install script file to postscripts directory: # cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install /install/postscripts/mlnxofed_ib_install # -# 1. install the ofed driver for diskful node -# 1.1 set the postscript as one postbootscripts for the node +# 1. Install the ofed driver for diskful node +# 1.1 Set the postscript as one postbootscripts for the node # chdef xcat01 -p postbootscripts=mlnxofed_ib_install,configiba -# 1.2 copy the pkglist to the custom directory: -# cp /opt/xcat/share/xcat/install//compute...pkglist /install/custom/install//compute...pkglist -# Edit your /install/custom/install//compute...pkglist and add: -# #INCLUDE:/opt/xcat/share/xcat/ib/netboot//ib...pkglist# +# 1.2 Copy the pkglist to the custom directory: +# cp /opt/xcat/share/xcat/install//compute...pkglist /install/custom/install//compute...pkglist +# Edit your /install/custom/install//compute...pkglist and add: +# #INCLUDE:/opt/xcat/share/xcat/ib/netboot//ib...pkglist# # 1.3 Make sure the related osimage use the customized pkglist. # lsdef -t osimage -o --install-compute # if not, change it: # chdef -t osimage -o --install-compute pkglist=/install/custom/install//compute...pkglist -# 1.4 do the diskful installation +# 1.4 Do the diskful installation # 2. install the ofed driver for diskless images: -# 2.1 copy the pkglist to the custom directory: +# 2.1 Copy the pkglist to the custom directory: # cp /opt/xcat/share/xcat/netboot//compute...pkglist /install/custom/netboot//compute...pkglist # Edit your /install/custom/netboot//.pkglist and add: # #INCLUDE:/opt/xcat/share/xcat/ib/netboot//ib...pkglist# @@ -40,9 +40,10 @@ # lsdef -t osimage -o --netboot-compute # if not, change it: # chdef -t osimage -o --netboot-compute pkglist=/install/custom/netboot//compute...pkglist postinstall=/install/custom/netboot//.postinstall -# 2.4 run genimage +# 2.4 Run genimage # genimage --netboot-compute -# You can get more info at: http://xcat-docs.readthedocs.org/ +# +# You can obtain more information at: http://xcat-docs.readthedocs.org/ # OS=`uname`