From 3924e742b192f9b914c982e17d97d7f6f70147dc Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Sat, 24 Oct 2015 20:48:13 -0400 Subject: [PATCH 1/3] Update the documentation pages to be consistent and spell diskful instead of diskfull s --- .../advanced/hierarchy/appendix_b_diagnostics.rst | 2 +- docs/source/advanced/kit/addkitcomp.rst | 4 ++-- docs/source/advanced/kit/hpckit.rst | 10 +++++----- docs/source/advanced/sysclone/sysclone.rst | 2 +- .../network_planning/xcat_net_planning.rst | 2 +- .../admin-guides/basic_concepts/xcat_object/node.rst | 2 +- .../common/deployment/driver_update_disk.rst | 8 ++++---- .../manage_clusters/common/deployment/generate_img.rst | 8 ++++---- .../common/deployment/prepostscripts/post_script.rst | 4 ++-- .../common/deployment/syncfile/syncfile_install.rst | 8 ++++---- .../deployment/syncfile/syncfile_synclist_file.rst | 2 +- .../common/deployment/syncfile/syncfile_updatenode.rst | 2 +- .../diskful/customize_image/driver_update_disk.rst | 8 ++++---- .../manage_clusters/ppc64le/diskful/index.rst | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/source/advanced/hierarchy/appendix_b_diagnostics.rst b/docs/source/advanced/hierarchy/appendix_b_diagnostics.rst index cde5d7202..9bc99086e 100644 --- a/docs/source/advanced/hierarchy/appendix_b_diagnostics.rst +++ b/docs/source/advanced/hierarchy/appendix_b_diagnostics.rst @@ -12,7 +12,7 @@ Appendix B: Diagnostics xCAT rpms in :ref:`setup_service_node_stateful_label`. If rpms missing check your install setup as outlined in Build the Service Node Stateless Image for diskless or :ref:`setup_service_node_stateful_label` for - diskfull installs. + diskful installs. * **otherpkgs(including xCAT rpms) installation failed on the SN** --The OS repository is not created on the SN. When the "yum" command is processing the dependency, the rpm packages (including expect, nmap, and httpd, etc) diff --git a/docs/source/advanced/kit/addkitcomp.rst b/docs/source/advanced/kit/addkitcomp.rst index f8067af6e..1874c2915 100644 --- a/docs/source/advanced/kit/addkitcomp.rst +++ b/docs/source/advanced/kit/addkitcomp.rst @@ -49,7 +49,7 @@ By default, when a newer version/release of a kitcomponent is added to an existi Object name: compute kitcomponents=myprod_compute.1-0.1,myprod_compute.1-0.2 -When building a diskless image for the first time, or when deploying a diskfull node, xCAT will first install version 1-0.1 of myprod, and then in a separate yum or zypper call, xCAT will install version 1-0.2. The second install will either upgrade the product rpms or install the new versions of the rpms depending on how the product named the packages. +When building a diskless image for the first time, or when deploying a diskful node, xCAT will first install version 1-0.1 of myprod, and then in a separate yum or zypper call, xCAT will install version 1-0.2. The second install will either upgrade the product rpms or install the new versions of the rpms depending on how the product named the packages. Modifying Kit Deployment Parameters for an OS Image Definition ``````````````````````````````````````````````````````````````` @@ -63,4 +63,4 @@ If the kit does contain a deployment parameter file, the contents of the file wi addkitcomp -i vi /install/osimages//kits/KIT_DEPLOY_PARAMS.otherpkgs.pkglist -NOTE: Please be sure to know how changing any kit deployment parameters will impact the install of the product into the OS image. Many parameters include settings for automatic license acceptance and other controls to ensure proper unattended installs into a diskless image or remote installs into a diskfull node. Changing these values will cause problems with genimage, updatenode, and other xCAT deployment commands. +NOTE: Please be sure to know how changing any kit deployment parameters will impact the install of the product into the OS image. Many parameters include settings for automatic license acceptance and other controls to ensure proper unattended installs into a diskless image or remote installs into a diskful node. Changing these values will cause problems with genimage, updatenode, and other xCAT deployment commands. diff --git a/docs/source/advanced/kit/hpckit.rst b/docs/source/advanced/kit/hpckit.rst index 095ddbadb..df0850c3f 100644 --- a/docs/source/advanced/kit/hpckit.rst +++ b/docs/source/advanced/kit/hpckit.rst @@ -75,7 +75,7 @@ PPE requires the 32-bit version of libibverbs, but the default mlnxofed_ib_insta Starting with PE RTE 1.2.0.10, the PE RTE packages are designed so that when user upgrade the product to a newer version or release, the files from the previous version remain in the osimage along with the new version of the product. -Normally only have one version of a kitcomponent present in the xCAT osimage. When run addkitcomp to add a newer version of the kitcomponent, xCAT will first remove the old version of the kitcomponent before adding the new one. If updating a previously built diskless image or an existing diskfull node with a newer version of PE RTE, run addkitcomp to add the new PE RTE kitcomponent, xCAT will replace the previous kitcomponent with the new one. For example, if current compute osimage has PE RTE 1.3.0.1 and want to upgrade to PE RTE 1.3.0.2 :: +Normally only have one version of a kitcomponent present in the xCAT osimage. When run addkitcomp to add a newer version of the kitcomponent, xCAT will first remove the old version of the kitcomponent before adding the new one. If updating a previously built diskless image or an existing diskful node with a newer version of PE RTE, run addkitcomp to add the new PE RTE kitcomponent, xCAT will replace the previous kitcomponent with the new one. For example, if current compute osimage has PE RTE 1.3.0.1 and want to upgrade to PE RTE 1.3.0.2 :: lsdef -t osimage -o compute -i kitcomponents kitcomponents = pperte_compute-1.3.0.1-0-rhels-6-x86_64 @@ -89,14 +89,14 @@ To remove the previous version of the PE RTE product files from the osimage, nee chroot /install/netboot/rhels6/x86_64/compute/rootimg rpm -e ppe_rte_1302 -If building a new diskless image or installing a diskfull node, and need multiple versions of PE RTE present in the image as part of the initial install, need to have multiple versions of the corresponding kitcomponent defined in the xCAT osimage definition. To add multiple versions of PE RTE kitcomponents to an xCAT osimage, add the kitcomponent using the full name with separate addkitcomp commands and specifying the ``-n (--noupgrade)`` flag. For example, to add PE RTE 1.3.0.1 and PE RTE 1.3.0.2 to your compute osimage definition :: +If building a new diskless image or installing a diskful node, and need multiple versions of PE RTE present in the image as part of the initial install, need to have multiple versions of the corresponding kitcomponent defined in the xCAT osimage definition. To add multiple versions of PE RTE kitcomponents to an xCAT osimage, add the kitcomponent using the full name with separate addkitcomp commands and specifying the ``-n (--noupgrade)`` flag. For example, to add PE RTE 1.3.0.1 and PE RTE 1.3.0.2 to your compute osimage definition :: addkitcomp -i compute pperte_compute-1.3.0.1-0-rhels-6-x86_64 addkitcomp -i compute -n pperte_compute-1.3.0.2-0-rhels-6-x86_64 lsdef -t osimage -o compute -i kitcomponents kitcomponents = pperte_compute-1.3.0.1-0-rhels-6-x86_64,pperte_compute-1.3.0.2-0-rhels-6-x86_64 -In this example, when building a diskless image for the first time, or when deploying a diskfull node, xCAT will first install PE RTE 1.3.0.1, and then in a separate yum or zypper call, xCAT will install PE RTE 1.3.0.2. The second install will upgrade the pperte-1.3.0.1 rpm to pperte-1.3.0.2, and will install the new ppe_rte_1302 rpm without removing the previous ppe_rte_1301 rpm. +In this example, when building a diskless image for the first time, or when deploying a diskful node, xCAT will first install PE RTE 1.3.0.1, and then in a separate yum or zypper call, xCAT will install PE RTE 1.3.0.2. The second install will upgrade the pperte-1.3.0.1 rpm to pperte-1.3.0.2, and will install the new ppe_rte_1302 rpm without removing the previous ppe_rte_1301 rpm. **Starting PE on cluster nodes** @@ -133,7 +133,7 @@ For older Linux releases on System P, and for AIX, use the xCAT HPC Integration No special procedures are required for building the complete PESSL kit. If received an incomplete kit, simply follow the previously documented process for adding the product packages and building the complete kit -When building a diskless image or installing a diskfull node, and want ESSL installed with compiler XLC/XLF kits, there is one change when add a ESSL kitcomponent to an xCAT osimage. To add ESSL kitcomponent to an xCAT osimage, add the kitcomponent using separate addkitcomp command and specifying the ``-n(--noupgrade)`` flag. For example, to add ESSL 5.2.0.1 kitcomponent to compute osimage definition :: +When building a diskless image or installing a diskful node, and want ESSL installed with compiler XLC/XLF kits, there is one change when add a ESSL kitcomponent to an xCAT osimage. To add ESSL kitcomponent to an xCAT osimage, add the kitcomponent using separate addkitcomp command and specifying the ``-n(--noupgrade)`` flag. For example, to add ESSL 5.2.0.1 kitcomponent to compute osimage definition :: addkitcomp -i compute essl_compute-5.2.0.1-rhels-6-ppc64 lsdef -t osimage -o compute -i kitcomponents @@ -148,7 +148,7 @@ For older Linux releases on System P, and for AIX, use the xCAT HPC Integration No special procedures are required for building the PESSL complete kit. If received an incomplete kit, simply follow the previously documented process for adding the product packages and building the complete kit -When building a diskless image or installing a diskfull node, and want PESSL installed with ESSL kits, there is one change when add a PESSL kitcomponent to an xCAT osimage. To add PESSL kitcomponent to an xCAT osimage, add the kitcomponent using separate addkitcomp command and specifying the ``-n(--noupgrade)`` flag. For example, to add PESSL 4.2.0.0 kitcomponent to compute osimage definition :: +When building a diskless image or installing a diskful node, and want PESSL installed with ESSL kits, there is one change when add a PESSL kitcomponent to an xCAT osimage. To add PESSL kitcomponent to an xCAT osimage, add the kitcomponent using separate addkitcomp command and specifying the ``-n(--noupgrade)`` flag. For example, to add PESSL 4.2.0.0 kitcomponent to compute osimage definition :: addkitcomp -i compute pessl_compute-4.2.0.0-rhels-6-ppc64 lsdef -t osimage -o compute -i kitcomponents diff --git a/docs/source/advanced/sysclone/sysclone.rst b/docs/source/advanced/sysclone/sysclone.rst index d91e9ad36..16bc2b12e 100644 --- a/docs/source/advanced/sysclone/sysclone.rst +++ b/docs/source/advanced/sysclone/sysclone.rst @@ -93,7 +93,7 @@ Install and Configure the Golden Client The Golden Client acts as a regular node for xCAT, just have some extra rpms to support clone. When you deploy golden client with xCAT, you just need to add a few additional definitions to the image which will be used to deploy golden client. -For information of how to install a regular node, please refer to section :ref:`Diskful Installation ` +For information of how to install a regular node, please refer to section :ref:`Diskful Installation ` For 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. then the golden client will have extra rpms to support clone. If you have deployed your golden client already, using 'updatenode' command to push these extra rpms to golden client. CentOS share the same pkglist file with RHEL. For example: 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 6a8c15368..eeb0ca575 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 @@ -38,7 +38,7 @@ Everyone wants their cluster to be as reliable and available as possible, but th This approach is most often used with stateless nodes because that environment is more dynamic. It can possibly be used with stateful nodes (with a little more effort), but that type of node doesn't netboot nearly as often so a more manual operation (snmove) is needed in that case move a node to different SNs. -It is best to have the SNs be as robust as possible, for example, if they are diskfull, configure them with at least 2 disks that are RAID'ed together. +It is best to have the SNs be as robust as possible, for example, if they are diskful, configure them with at least 2 disks that are RAID'ed together. In smaller clusters, the management node (MN) can be part of the SN pool with one other SN. 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 1899f5db4..dbc4496f2 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 @@ -45,7 +45,7 @@ Key Attrubutes +-------------------------------------------------+-----------------------------------+ * postscripts: - Comma separated list of scripts, that should be run on this node after diskfull 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. + 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. 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 c99662152..717469dc3 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 @@ -62,7 +62,7 @@ If 'osupdatename' is specified, the kernel shipped with the 'osupdatename' will .. END_locate_driver_for_RPM -.. BEGIN_inject_into_initrd__for_diskfull_for_DUD +.. BEGIN_inject_into_initrd__for_diskful_for_DUD - If specifying the driver disk location in the osimage, there are two ways to inject drivers: @@ -79,9 +79,9 @@ If 'osupdatename' is specified, the kernel shipped with the 'osupdatename' will Running 'nodeset ' in anyway will load the driver disk -.. END_inject_into_initrd__for_diskfull_for_DUD +.. END_inject_into_initrd__for_diskful_for_DUD -.. BEGIN__inject_into_initrd__for_diskfull_for_RPM +.. BEGIN__inject_into_initrd__for_diskful_for_RPM There are two ways to inject drivers: @@ -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_diskfull_for_RPM +.. END_inject_into_initrd__for_diskful_for_RPM .. BEGIN_inject_into_initrd__for_diskless_for_DUD 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 a7183cdfa..1cfab4ba7 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,7 @@ 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) and stateless (diskless) clusters. The following documentation will show how to use :doc:`imgexport ` to export images and :doc:`imgimport ` to import images. +Image exporting and importing are supported for stateful (diskful) 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 @@ -70,7 +70,7 @@ Exporting an image imgexport myimage -p node1 -e /install/postscripts/myscript1 -e /install/postscripts/myscript2 (-p and -e are optional) -A bundle file called myimage.tgz will be created under the current directory. The bundle file contains the ramdisk, boot kernel, the root image and all the configuration files for generating the image for a diskless cluster. For diskfull, it contains the kickstart/autoyast configuration file. (see appendix). The -p flag puts the names of the postscripts for node1 into the image bundle. The -e flags put additional files into the bundle. In this case two postscripts myscript1 and myscript2 are included. +A bundle file called myimage.tgz will be created under the current directory. The bundle file contains the ramdisk, boot kernel, the root image and all the configuration files for generating the image for a diskless cluster. For diskful, it contains the kickstart/autoyast configuration file. (see appendix). The -p flag puts the names of the postscripts for node1 into the image bundle. The -e flags put additional files into the bundle. In this case two postscripts myscript1 and myscript2 are included. This image can now be used on other systems. Importing an image @@ -106,7 +106,7 @@ Skip this section if you want to use the image as is. * Modify .otherpkgs.pkglist to add or remove packages from other sources. Please refer to ``Using_Updatenode`` for details -* For diskfull, modify the .tmpl file to change the kickstart/autoyast configuration +* For diskful, modify the .tmpl file to change the kickstart/autoyast configuration * Modify .synclist file to change the files that are going to be synchronized to the nodes @@ -187,7 +187,7 @@ Exported files The following files will be exported, assuming x is the profile name: -For diskfull: :: +For diskful: :: x.pkglist x.otherpkgs.pkglist 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 795414afc..fbe5f7af3 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 @@ -12,7 +12,7 @@ There are two types of scripts in the postscripts table ( postscripts and postbo ``man postscripts`` -* **postscripts attribute** - List of scripts that should be run on this node after diskfull installation or diskless boot. +* **postscripts attribute** - List of scripts that should be run on this node after diskful installation or diskless boot. * **[RHEL]** @@ -22,7 +22,7 @@ There are two types of scripts in the postscripts table ( postscripts and postbo 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 diskfull installation reboot or diskless boot +* **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 automatically adds the postscripts from the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot.** 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 d3c647632..f8b7d23da 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 @@ -19,8 +19,8 @@ If using Service nodes to manage you nodes, you should make sure that the servic ``updatenode compute -f`` -Diskfull installation -~~~~~~~~~~~~~~~~~~~~~ +Diskful installation +~~~~~~~~~~~~~~~~~~~~ @@ -39,9 +39,9 @@ Make sure your postscripts table has the syncfiles postscript listed Diskless Installation ~~~~~~~~~~~~~~~~~~~~~ -The diskless boot is similar with the diskfull installation for the synchronizing files operation, except that the packimage commands will sync files to the root directories of image during the creating image process. +The diskless boot is similar with the diskful installation for the synchronizing files operation, except that the packimage commands will sync files to the root directories of image during the creating image process. -Creating the synclist file as the steps in Diskfull installation section, then the synced files will be synced to the os image during the packimage and mkdsklsnode commands running. +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. 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 7a5fa273b..22bc0e293 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 @@ -207,7 +207,7 @@ If the provisioning method for the node is install,or netboot then the path to t ,and are what you set for the node For example: -The location of synclist file for the diskfull installation of with 'compute' as the profile :: +The location of synclist file for the diskful installation of with 'compute' as the profile :: /install/custom///..synclist diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_updatenode.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_updatenode.rst index 7facf91b4..b7cda3461 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_updatenode.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_updatenode.rst @@ -3,7 +3,7 @@ Run the Syncing File action in the updatenode process If run ``updatenode`` command with -F option, it syncs files which configured in the synclist to the nodes. ``updatenode`` does not sync images, use ``xdcp -i -F`` option to sync images. -``updatenode`` can be used to sync files to to diskfull or diskless nodes. ``updatenode`` cannot be used to sync files to statelite nodes. +``updatenode`` can be used to sync files to to diskful or diskless nodes. ``updatenode`` cannot be used to sync files to statelite nodes. Steps to make the Syncing File working in the ``updatenode -F`` command: 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 e16af5838..bd717ba74 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 @@ -31,15 +31,15 @@ For Driver Update Disk `````````````````````` .. include:: ../../../common/deployment/driver_update_disk.rst - :start-after: BEGIN_inject_into_initrd__for_diskfull_for_DUD - :end-before: END_inject_into_initrd__for_diskfull_for_DUD + :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_diskfull_for_RPM - :end-before: END_inject_into_initrd__for_diskfull_for_RPM + :start-after: BEGIN__inject_into_initrd__for_diskful_for_RPM + :end-before: END_inject_into_initrd__for_diskful_for_RPM Notes ----- diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/index.rst index 3ecf2f10c..4b3907c02 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/index.rst @@ -1,4 +1,4 @@ -.. _diskfull_installation: +.. _diskful_installation: Diskful Installation ==================== From 011651c2ac107cc36279c441156d81f1a5363ffb Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Wed, 28 Oct 2015 09:48:27 -0400 Subject: [PATCH 2/3] update statefull and diskfull to stateful and diskful for consistency in the documentaion and code --- docs/source/advanced/hierarchy/define_service_node.rst | 6 +----- docs/source/advanced/kit/introduction.rst | 4 ++-- docs/source/advanced/kit/removekit.rst | 2 +- .../common/deployment/additionalpkg/nonubuntu_os_pkg.rst | 4 ++-- .../guides/admin-guides/references/man1/geninitrd.1.rst | 4 ++-- .../guides/admin-guides/references/man1/imgexport.1.rst | 4 ++-- .../guides/admin-guides/references/man1/imgimport.1.rst | 4 ++-- .../guides/admin-guides/references/man1/rmkitcomp.1.rst | 2 +- .../guides/admin-guides/references/man1/updatenode.1.rst | 8 ++++---- perl-xCAT/xCAT/Schema.pm | 8 ++++---- xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post | 6 +++--- xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript | 5 +++-- xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postscript | 2 +- xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start | 6 ++---- xCAT-client/pods/man1/geninitrd.1.pod | 4 ++-- xCAT-client/pods/man1/imgexport.1.pod | 4 ++-- xCAT-client/pods/man1/imgimport.1.pod | 4 ++-- xCAT-client/pods/man1/rmkitcomp.1.pod | 2 +- xCAT-client/pods/man1/updatenode.1.pod | 8 ++++---- 19 files changed, 41 insertions(+), 46 deletions(-) diff --git a/docs/source/advanced/hierarchy/define_service_node.rst b/docs/source/advanced/hierarchy/define_service_node.rst index 4034796e6..dba32462c 100644 --- a/docs/source/advanced/hierarchy/define_service_node.rst +++ b/docs/source/advanced/hierarchy/define_service_node.rst @@ -219,11 +219,7 @@ automatically mount the ``/tftpboot`` directory from the management node: chdef -t site clustersite sharedtftp=0 -For statefull (full-disk) node installs, you will need to use a local -``/install`` directory on each service node. The ``/install/autoinst/node`` -files generated by nodeset will contain values specific to that service node -for correctly installing the nodes. -:: +For stateful (diskful) installs, you will need to use a local ``/install`` directory on each service node. The ``/install/autoinst/node`` files generated by nodeset will contain values specific to that service node for correctly installing the nodes. :: chdef -t site clustersite installloc="" diff --git a/docs/source/advanced/kit/introduction.rst b/docs/source/advanced/kit/introduction.rst index b27be1ba3..d5362c89d 100644 --- a/docs/source/advanced/kit/introduction.rst +++ b/docs/source/advanced/kit/introduction.rst @@ -7,7 +7,7 @@ Overview xCAT supports a unique software bundling concept called kits. A software kit combines all of the required product packages with configuration information, scripts, and other files to easily install a software product onto an xCAT node or in an xCAT OS image based on the role that node performs in the cluster. A software kit is made up of a collection of kit components, each of which is tailored to one specific environment for that particular version of the product. -A software kit is available as a tar file that is downloaded and added to your xCAT management node. The kit components resident in that kit can then be added to an existing xCAT OS image definition and then either be installed on a statefull node during node deployment, added to an active statefull node with the updatenode command, or built into a diskless OS image with the genimage command. +A software kit is available as a tar file that is downloaded and added to your xCAT management node. The kit components resident in that kit can then be added to an existing xCAT OS image definition and then either be installed on a stateful node during node deployment, added to an active stateful node with the updatenode command, or built into a diskless OS image with the genimage command. Typically, a software kit will contain all of the product package files. However, in some instances, software kits may be delivered as partial or incomplete kits, and not be bundled with all of the product packages. You will then need to obtain your product packages through your reqular distribution channels, download them to a server along with the partial kit, and run the buildkit addpkgs command to build a complete kit that can be used by xCAT. @@ -46,7 +46,7 @@ Software Kits are deployed to xCAT nodes through the standard xCAT OS image depl When a kitcomponent is added to an OS image definition, these attributes are automatically updated. -User can then use the genimage command to install the kitcomponents into the diskless OS image, the standard node deployment process for statefull nodes, or the xCAT updatenode command to update the OS on an active compute node. Since the kitcomponent meta package defines the product packages as dependencies, the OS package manager (yum, zypper, apt-get) automatically installs all the required product packages during the xCAT otherpkgs install process. +User can then use the genimage command to install the kitcomponents into the diskless OS image, the standard node deployment process for stateful nodes, or the xCAT updatenode command to update the OS on an active compute node. Since the kitcomponent meta package defines the product packages as dependencies, the OS package manager (yum, zypper, apt-get) automatically installs all the required product packages during the xCAT otherpkgs install process. Kit Frameworks -------------- diff --git a/docs/source/advanced/kit/removekit.rst b/docs/source/advanced/kit/removekit.rst index 35edf109d..3122ffe93 100644 --- a/docs/source/advanced/kit/removekit.rst +++ b/docs/source/advanced/kit/removekit.rst @@ -15,7 +15,7 @@ Or, if know the basename of the kitcomponent, simply: :: rmkitcomp -i -Note that this ONLY removes the kitcomponent from the image definition in the xCAT database, and it will NOT remove any product packages from the actual OS image. To set up for an uninstall of the kitcomponent from the diskless image or the statefull node, specify the uninstall option: :: +Note that this ONLY removes the kitcomponent from the image definition in the xCAT database, and it will NOT remove any product packages from the actual OS image. To set up for an uninstall of the kitcomponent from the diskless image or the stateful node, specify the uninstall option: :: rmkitcomp -u -i 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 1bbde6a7b..9d8ce7184 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 @@ -80,7 +80,7 @@ Note: the trailing **"#"** character at the end of the line. It is important to Group/Pattern Names ''''''''''''''''''' -It is only supported for statefull deployment. +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 @@ -99,7 +99,7 @@ You can specify in this file the group/pattern names by adding a **'@'** and a s Remove RPMs After Installing '''''''''''''''''''''''''''' -It is only supported for statefull deployment. +It is only supported for stateful deployment. You can specify in this file that certain rpms to be removed after installing the new software. This is done by adding **'-'** before the rpm names you want to remove. For example: :: 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 f98098a02..18e44ed3d 100644 --- a/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst +++ b/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst @@ -11,7 +11,7 @@ NAME **** -\ **geninitrd**\ - Generate an initrd (initial ramfs) which to be used for statefull install or stateless netboot. +\ **geninitrd**\ - Generate an initrd (initial ramfs) which to be used for stateful install or stateless netboot. ******** @@ -34,7 +34,7 @@ Generate the initrd for the osimage: \ **imagename**\ which is an xCAT object o \ **Diskfull Osimage**\ -If the \ **imagename**\ is a statefull one (The provmethod attribute for the osimage is 'install'), +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/. 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 88615132f..a2d413f79 100644 --- a/docs/source/guides/admin-guides/references/man1/imgexport.1.rst +++ b/docs/source/guides/admin-guides/references/man1/imgexport.1.rst @@ -29,9 +29,9 @@ DESCRIPTION *********** -The imgexport command will export an image that is being used by xCAT. To export images, you must have the images defined in the \ *osimage*\ table. All the columns in the \ *osimage*\ and \ *linuximage*\ tables will be exported. If kits are used in statefull or stateless images, \ *kit*\ , \ *kitcomponent*\ and \ *kitrepo*\ tables will be exported. In addition, the following files will also be exported. +The imgexport command will export an image that is being used by xCAT. To export images, you must have the images defined in the \ *osimage*\ table. All the columns in the \ *osimage*\ and \ *linuximage*\ tables will be exported. If kits are used in stateful or stateless images, \ *kit*\ , \ *kitcomponent*\ and \ *kitrepo*\ tables will be exported. In addition, the following files will also be exported. -For statefull: +For stateful: x.pkglist x.otherpkgs.pkglist x.tmpl 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 b7a06f5cd..b88ae462f 100644 --- a/docs/source/guides/admin-guides/references/man1/imgimport.1.rst +++ b/docs/source/guides/admin-guides/references/man1/imgimport.1.rst @@ -31,7 +31,7 @@ DESCRIPTION The imgimport command will import an image that has been exported by \ *imgexport*\ from xCAT. This is the easiest way to transfer/backup/, change or share images created by xCAT whether they be stateless or stateful. The bundle file will be unpacked in the current working directory. The xCAT configuration such as \ *osimage*\ and \ *linuximage*\ tables will then be updated. -For statefull, the following files will be copied to the appropriate directories. +For stateful, the following files will be copied to the appropriate directories. x.pkglist x.otherpkgs.pkglist x.tmpl @@ -71,7 +71,7 @@ If -f flag is not specified, all the files will be copied to the same directorie After this command, you can run the \ *nodeset*\ command and then start deploying the nodes. You can also choose to modify the files and run the following commands before the node depolyment. -For statefull: +For stateful: nodeset For stateless: 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 9183853b4..ac43155a5 100644 --- a/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst @@ -120,7 +120,7 @@ Output is similar to: kitcomponents comp-test1-1.0-1-rhels-6.2-ppc64 were removed from osimage rhels6.2-ppc64-netboot-compute successfully -3. To remove a kit component from osimage and also remove the kit component meta RPM and package RPM. So in next genimage for statelss image and updatenode for statefull nodes, the kit component meta RPM and package RPM will be uninstalled. +3. To remove a kit component from osimage and also remove the kit component meta RPM and package RPM. So in next genimage for statelss image and updatenode for stateful nodes, the kit component meta RPM and package RPM will be uninstalled. rmkitcomp -u -i rhels6.2-ppc64-netboot-compute comp-test1-1.0-1-rhels-6.2-ppc64 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 602b1b8c3..a8079edc1 100644 --- a/docs/source/guides/admin-guides/references/man1/updatenode.1.rst +++ b/docs/source/guides/admin-guides/references/man1/updatenode.1.rst @@ -49,7 +49,7 @@ to perform the following node updates: 2 - Install or update software on diskfull nodes. + Install or update software on diskful nodes. @@ -114,7 +114,7 @@ The basic process for distributing and synchronizing nodes is: Files may be distributed and synchronized for both diskless and -diskfull nodes. Syncing files to NFS-based statelite nodes is not supported. +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. @@ -180,7 +180,7 @@ updatenode noderange -P "ospkgs --keeprepo,otherpkgs" \ **For AIX systems:**\ -Note: The updatenode command is used to update AIX diskfull nodes only. For updating diskless AIX nodes refer to the xCAT for AIX update documentation and use the xCAT mknimimage command. +Note: The updatenode command is used to update AIX diskful nodes only. For updating diskless AIX nodes refer to the xCAT for AIX update documentation and use the xCAT mknimimage command. For information on updating software on AIX cluster: For diskful installs, read: XCAT_AIX_RTE_Diskfull_Nodes @@ -215,7 +215,7 @@ executed on the nodes. The order of the scripts in the list determines the order in which they will be run. You can use the lsdef command to check the postscript order. -Scripts can be run on both diskless and diskfull nodes. +Scripts can be run on both diskless and diskful nodes. To run all the customization scripts that have been designated for the nodes, (in the "postscripts and postbootscripts" attributes), type: diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index 0b2c68f1b..86f7d87dd 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -744,8 +744,8 @@ osimage => { osvers => 'The Linux operating system deployed on this node. Valid values: rhels*,rhelc*, rhas*,centos*,SL*, fedora*, sles* (where * is the version #).', osarch => 'The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64.', 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 => 'Comma separated list of scripts that should be run on this image after diskfull 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. ', - postbootscripts => 'Comma separated list of scripts that should be run on this after diskfull 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.', + 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. ', + 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 => 'The role of the server created by this osimage. Default roles: mgtnode, servicenode, compute, login, storage, utility.', isdeletable => 'A flag to indicate whether this image profile can be deleted. This attribute is only used by PCM.', kitcomponents => 'List of Kit Component IDs assigned to this OS Image definition.', @@ -838,8 +838,8 @@ postscripts => { table_desc => 'The scripts that should be run on each node after installation or diskless boot.', descriptions => { node => 'The node name or group name.', - postscripts => 'Comma separated list of scripts that should be run on this node after diskfull 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. ', - postbootscripts => 'Comma separated list of scripts that should be run on this node after diskfull 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.', + 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. ', + 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.', comments => 'Any user-written notes.', disable => "Set to 'yes' or '1' to comment out this row.", }, diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post index da22619d7..802c92bd4 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post @@ -3,8 +3,8 @@ # AIX: # TBD # -# Linux: for statefull (full-disk install) and stateless/statelite nodes -# For statefull nodes: run as part of IBMhpc.postbootscript. +# 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 # copy this script to /install/postscripts and specify it to nodes' # postscripts attribute. @@ -12,5 +12,5 @@ # BSR configuration on Power 775 cluster. More BSR configuration should -# be done by PE postinstall in genimage or postbootscript in statefull install +# be done by PE postinstall in genimage or postbootscript in stateful install #chown root:bsr /dev/bsr* diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript index 28eeab87c..f6692e9f2 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript @@ -1,6 +1,7 @@ #!/bin/sh -# Sample Linux postbootscript script for installing and configuring HPC software -# for statefull (full-disk install) nodes +# Sample Linux postbootscript script for installing and configuring +# HPC software for stateful (full-disk install) nodes +# # Make sure this runs after the otherpkgs postbootscript # diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postscript b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postscript index 766149102..6509286c8 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postscript +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postscript @@ -3,7 +3,7 @@ # AIX: # set network tunables # -# Linux: for statefull (full-disk install) nodes +# Linux: for stateful (full-disk install) nodes # Make sure this runs before the node reboots after initial install # for services to be activated # diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start index 21f50dd00..f643442c0 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start @@ -1,9 +1,7 @@ #!/bin/sh - -# Run this script as a postscript on any node (stateless, statefull, -# full-disk install, AIX, Linux) to start the GPFS daemon +# +# 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 diff --git a/xCAT-client/pods/man1/geninitrd.1.pod b/xCAT-client/pods/man1/geninitrd.1.pod index 5f4753267..8c2f72473 100644 --- a/xCAT-client/pods/man1/geninitrd.1.pod +++ b/xCAT-client/pods/man1/geninitrd.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Generate an initrd (initial ramfs) which to be used for statefull install or stateless netboot. +B - Generate an initrd (initial ramfs) which to be used for stateful install or stateless netboot. =head1 SYNOPSIS @@ -17,7 +17,7 @@ B =over 2 -If the B is a statefull one (The provmethod attribute for the osimage is 'install'), +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>. diff --git a/xCAT-client/pods/man1/imgexport.1.pod b/xCAT-client/pods/man1/imgexport.1.pod index 2996591a6..e27da887e 100644 --- a/xCAT-client/pods/man1/imgexport.1.pod +++ b/xCAT-client/pods/man1/imgexport.1.pod @@ -11,9 +11,9 @@ B table. All the columns in the I and I tables will be exported. If kits are used in statefull or stateless images, I, I and I tables will be exported. In addition, the following files will also be exported. +The imgexport command will export an image that is being used by xCAT. To export images, you must have the images defined in the I table. All the columns in the I and I tables will be exported. If kits are used in stateful or stateless images, I, I and I tables will be exported. In addition, the following files will also be exported. -For statefull: +For stateful: x.pkglist x.otherpkgs.pkglist x.tmpl diff --git a/xCAT-client/pods/man1/imgimport.1.pod b/xCAT-client/pods/man1/imgimport.1.pod index a6e9eedfb..5dde8b36d 100644 --- a/xCAT-client/pods/man1/imgimport.1.pod +++ b/xCAT-client/pods/man1/imgimport.1.pod @@ -12,7 +12,7 @@ B bundle_file_name [-p|--postscripts nodelist] [-f|--profile new_prof The imgimport command will import an image that has been exported by I from xCAT. This is the easiest way to transfer/backup/, change or share images created by xCAT whether they be stateless or stateful. The bundle file will be unpacked in the current working directory. The xCAT configuration such as I and I tables will then be updated. -For statefull, the following files will be copied to the appropriate directories. +For stateful, the following files will be copied to the appropriate directories. x.pkglist x.otherpkgs.pkglist x.tmpl @@ -52,7 +52,7 @@ If -f flag is not specified, all the files will be copied to the same directorie After this command, you can run the I command and then start deploying the nodes. You can also choose to modify the files and run the following commands before the node depolyment. -For statefull: +For stateful: nodeset For stateless: diff --git a/xCAT-client/pods/man1/rmkitcomp.1.pod b/xCAT-client/pods/man1/rmkitcomp.1.pod index d9ba57b1d..3755a4eae 100644 --- a/xCAT-client/pods/man1/rmkitcomp.1.pod +++ b/xCAT-client/pods/man1/rmkitcomp.1.pod @@ -76,7 +76,7 @@ Output is similar to: kitcomponents comp-test1-1.0-1-rhels-6.2-ppc64 were removed from osimage rhels6.2-ppc64-netboot-compute successfully -3. To remove a kit component from osimage and also remove the kit component meta RPM and package RPM. So in next genimage for statelss image and updatenode for statefull nodes, the kit component meta RPM and package RPM will be uninstalled. +3. To remove a kit component from osimage and also remove the kit component meta RPM and package RPM. So in next genimage for statelss image and updatenode for stateful nodes, the kit component meta RPM and package RPM will be uninstalled. rmkitcomp -u -i rhels6.2-ppc64-netboot-compute comp-test1-1.0-1-rhels-6.2-ppc64 diff --git a/xCAT-client/pods/man1/updatenode.1.pod b/xCAT-client/pods/man1/updatenode.1.pod index df1fc6de0..9dd186658 100644 --- a/xCAT-client/pods/man1/updatenode.1.pod +++ b/xCAT-client/pods/man1/updatenode.1.pod @@ -29,7 +29,7 @@ Distribute and synchronize files. =item 2 -Install or update software on diskfull nodes. +Install or update software on diskful nodes. =item 3 @@ -86,7 +86,7 @@ Run the updatenode command to update the nodes. =back Files may be distributed and synchronized for both diskless and -diskfull nodes. Syncing files to NFS-based statelite nodes is not supported. +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. @@ -133,7 +133,7 @@ updatenode noderange -P "ospkgs --keeprepo,otherpkgs" B -Note: The updatenode command is used to update AIX diskfull nodes only. For updating diskless AIX nodes refer to the xCAT for AIX update documentation and use the xCAT mknimimage command. +Note: The updatenode command is used to update AIX diskful nodes only. For updating diskless AIX nodes refer to the xCAT for AIX update documentation and use the xCAT mknimimage command. For information on updating software on AIX cluster: For diskful installs, read: XCAT_AIX_RTE_Diskfull_Nodes @@ -161,7 +161,7 @@ executed on the nodes. The order of the scripts in the list determines the order in which they will be run. You can use the lsdef command to check the postscript order. -Scripts can be run on both diskless and diskfull nodes. +Scripts can be run on both diskless and diskful nodes. To run all the customization scripts that have been designated for the nodes, (in the "postscripts and postbootscripts" attributes), type: From ab5a9f227cb68b9789fd4c830f501ffc0de74150 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Tue, 8 Dec 2015 11:51:06 -0500 Subject: [PATCH 3/3] Found some more places where diskful was spelled with two l's --- docs/source/advanced/hierarchy/index.rst | 2 +- ...ice_node_for_diskfull.rst => service_node_for_diskful.rst} | 0 .../admin-guides/manage_clusters/common/kvm/manage_vm.rst | 2 +- docs/source/guides/admin-guides/references/man5/osimage.5.rst | 4 ++-- .../guides/admin-guides/references/man5/postscripts.5.rst | 4 ++-- docs/source/guides/admin-guides/references/man7/group.7.rst | 4 ++-- docs/source/guides/admin-guides/references/man7/node.7.rst | 4 ++-- docs/source/guides/admin-guides/references/man7/osimage.7.rst | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename docs/source/advanced/hierarchy/{service_node_for_diskfull.rst => service_node_for_diskful.rst} (100%) diff --git a/docs/source/advanced/hierarchy/index.rst b/docs/source/advanced/hierarchy/index.rst index 76dcbc0c7..2cd64777c 100644 --- a/docs/source/advanced/hierarchy/index.rst +++ b/docs/source/advanced/hierarchy/index.rst @@ -9,7 +9,7 @@ Hierarchical Clusters define_service_node.rst configure_dhcp.rst setup_service_node.rst - service_node_for_diskfull.rst + service_node_for_diskful.rst service_node_for_diskless.rst test_service_node_installation.rst appendix_a_setup_backup_service_nodes.rst diff --git a/docs/source/advanced/hierarchy/service_node_for_diskfull.rst b/docs/source/advanced/hierarchy/service_node_for_diskful.rst similarity index 100% rename from docs/source/advanced/hierarchy/service_node_for_diskfull.rst rename to docs/source/advanced/hierarchy/service_node_for_diskful.rst 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 69fd8ec3b..4c61f1dc4 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 @@ -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 diskfull VM node. + **Note**: The attribute **vmstorage** is only valid for diskful VM node. 8. Define the **console** attributes for VM: :: 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 dc0f90b9f..283c0c0eb 100644 --- a/docs/source/guides/admin-guides/references/man5/osimage.5.rst +++ b/docs/source/guides/admin-guides/references/man5/osimage.5.rst @@ -122,13 +122,13 @@ osimage Attributes: \ **postscripts**\ - Comma separated list of scripts that should be run on this image after diskfull 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. + 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. \ **postbootscripts**\ - Comma separated list of scripts that should be run on this after diskfull 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. + 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. 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 701eb9da5..ed667890d 100644 --- a/docs/source/guides/admin-guides/references/man5/postscripts.5.rst +++ b/docs/source/guides/admin-guides/references/man5/postscripts.5.rst @@ -44,13 +44,13 @@ postscripts Attributes: \ **postscripts**\ - Comma separated list of scripts that should be run on this node after diskfull 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. + 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. \ **postbootscripts**\ - Comma separated list of scripts that should be run on this node after diskfull 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. + 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. 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 95de3ab9c..550d7084e 100644 --- a/docs/source/guides/admin-guides/references/man7/group.7.rst +++ b/docs/source/guides/admin-guides/references/man7/group.7.rst @@ -803,13 +803,13 @@ group Attributes: \ **postbootscripts**\ (postscripts.postbootscripts) - Comma separated list of scripts that should be run on this node after diskfull 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. + 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. \ **postscripts**\ (postscripts.postscripts) - Comma separated list of scripts that should be run on this node after diskfull 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. + 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. 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 4c2ac6966..4cf0ea65b 100644 --- a/docs/source/guides/admin-guides/references/man7/node.7.rst +++ b/docs/source/guides/admin-guides/references/man7/node.7.rst @@ -809,13 +809,13 @@ node Attributes: \ **postbootscripts**\ (postscripts.postbootscripts) - Comma separated list of scripts that should be run on this node after diskfull 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. + 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. \ **postscripts**\ (postscripts.postscripts) - Comma separated list of scripts that should be run on this node after diskfull 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. + 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. 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 a97ebd1fa..0b43df13b 100644 --- a/docs/source/guides/admin-guides/references/man7/osimage.7.rst +++ b/docs/source/guides/admin-guides/references/man7/osimage.7.rst @@ -307,7 +307,7 @@ osimage Attributes: \ **postbootscripts**\ (osimage.postbootscripts) - Comma separated list of scripts that should be run on this after diskfull 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. + 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. @@ -319,7 +319,7 @@ osimage Attributes: \ **postscripts**\ (osimage.postscripts) - Comma separated list of scripts that should be run on this image after diskfull 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX. + 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. Support will be added in the future for the postscripts attribute to run the scripts before the reboot in AIX.