From 24980552468bb2c2df4f18c5e34aa0c079503d37 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Mon, 25 Apr 2016 10:30:45 -0400 Subject: [PATCH] Changing Redhat to RedHat, Update the install for postgres to be a single package with a wildcard, the other packages will get pulled in with the wild card --- .../advanced/hierarchy/databases/mysql_install.rst | 4 ++-- .../advanced/hierarchy/databases/postgres_install.rst | 8 ++++---- docs/source/advanced/kit/custom/using/addkitcomp.rst | 2 +- .../common/deployment/acc_initrd_rootimg_gen.rst | 2 +- .../common/deployment/cfg_partition.rst | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/source/advanced/hierarchy/databases/mysql_install.rst b/docs/source/advanced/hierarchy/databases/mysql_install.rst index e5dd7cc58..4ed15b5ab 100644 --- a/docs/source/advanced/hierarchy/databases/mysql_install.rst +++ b/docs/source/advanced/hierarchy/databases/mysql_install.rst @@ -18,8 +18,8 @@ The MySQL database is supported by xCAT since xCAT 2.1. MariaDB is a fork of th MySQL/MariaDB packages are shipped as part of most Linux Distributions. -Redhat Enterprise Linux ------------------------ +Red Hat Enterprise Linux +------------------------ * MySQL - Using ``yum``, ensure that the following packages are installed on the management node: :: diff --git a/docs/source/advanced/hierarchy/databases/postgres_install.rst b/docs/source/advanced/hierarchy/databases/postgres_install.rst index cf26bbc6d..1c0d7254a 100644 --- a/docs/source/advanced/hierarchy/databases/postgres_install.rst +++ b/docs/source/advanced/hierarchy/databases/postgres_install.rst @@ -4,12 +4,12 @@ Install PostgreSQL PostgreSQL packages are shipped as part of most Linux Distributions. -Redhat Enterprise Linux ------------------------ +Red Hat Enterprise Linux +------------------------ Using yum, install the following rpms: :: - yum install postgresql-libs-* postgresql-server-* postgresql-* + yum install postgresql-* yum install perl-DBD-Pg* @@ -20,7 +20,7 @@ Suse Linux Enterprise Server Using zyppr, install the following rpms: :: - zyppr install postgresql-libs-* postgresql-server-* postgresql-* + zyppr install postgresql-* zyppr install perl-DBD-Pg* diff --git a/docs/source/advanced/kit/custom/using/addkitcomp.rst b/docs/source/advanced/kit/custom/using/addkitcomp.rst index 1874c2915..b5b7acbae 100644 --- a/docs/source/advanced/kit/custom/using/addkitcomp.rst +++ b/docs/source/advanced/kit/custom/using/addkitcomp.rst @@ -36,7 +36,7 @@ Adding Multiple Versions of the Same Kit Component to an OS Image Definition xCAT allows to have multiple versions/releases of a product software kit available in the cluster. Typically, different OS image definitions corresponding to the different versions/releases of a product software stack. However, in some instances, may need mulitple versions/releases of the same product available within a single OS image. This is only feasible if the software product supports the install of multiple versions or releases of its product within an OS image. -Currently, it is not possible to install multiple versions of a product into an OS image using xCAT commands. xCAT uses yum on Redhat and zypper on SLES to install product rpms. These package managers do not provide an interface to install different versions of the same package, and will always force an upgrade of the package. We are investigating different ways to accomplish this function for future xCAT releases. +Currently, it is not possible to install multiple versions of a product into an OS image using xCAT commands. xCAT uses yum on RedHat and zypper on SLES to install product rpms. These package managers do not provide an interface to install different versions of the same package, and will always force an upgrade of the package. We are investigating different ways to accomplish this function for future xCAT releases. Some software products have designed their packaging to leave previous versions of the software installed in an OS image even when the product is upgraded. This is done by using different package names for each version/release, so that the package manager does not see the new version as an upgrade, but rather as a new package install. In this case, it is possible to use xCAT to install multiple versions of the product into the same image. diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst index c296af68a..da723e72b 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst @@ -12,7 +12,7 @@ The paralell compression tool ``pigz`` can be enabled by installing ``pigz`` pac * **[RHEL]** - The package ``pigz`` is shipped in Extra Packages for Enterprise Linux (or EPEL) instead of Redhat iso, this involves some complexity. + The package ``pigz`` is shipped in Extra Packages for Enterprise Linux (or EPEL) instead of RedHat iso, this involves some complexity. Extra Packages for Enterprise Linux (or EPEL) is a Fedora Special Interest Group that creates, maintains, and manages a high quality set of additional packages for Enterprise Linux, including, but not limited to, Red Hat Enterprise Linux (RHEL), CentOS and Scientific Linux (SL), Oracle Linux (OL). diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst index 6fa84715f..44e05eebd 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst @@ -6,7 +6,7 @@ By default, xCAT will install the operating system on the first disk and with de - 'Partition definition file' way can be used for RedHat, SLES and Ubuntu. - 'partition definition script' way was tested only for RedHat and Ubuntu, use this feature on SLES at your own risk. -- Because disk configuration for ubuntu is different from Redhat, there maybe some section special for ubuntu. +- Because disk configuration for ubuntu is different from RedHat, there maybe some section special for ubuntu. .. END_Overview @@ -356,7 +356,7 @@ Run the following commands to associate the partition with the osimage: :: chdef -t osimage partitionfile=/install/custom/my-partitions nodeset osimage= -- For Redhat, when nodeset runs and generates the /install/autoinst file for a node, it will replace the #XCAT_PARTITION_START#...#XCAT_PARTITION_END# directives from your osimage template with the contents of your custom partitionfile. +- For RedHat, when nodeset runs and generates the /install/autoinst file for a node, it will replace the #XCAT_PARTITION_START#...#XCAT_PARTITION_END# directives from your osimage template with the contents of your custom partitionfile. - For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the partition configuration to /tmp/partitionfile, this script will replace the #XCA_PARTMAN_RECIPE_SCRIPT# directive in /install/autoinst/.pre. @@ -365,7 +365,7 @@ Run the following commands to associate the partition with the osimage: :: .. BEGIN_Partition_Definition_Script_overview -Create a shell script that will be run on the node during the install process to dynamically create the disk partitioning definition. This script will be run during the OS installer %pre script on Redhat or preseed/early_command on Unbuntu execution and must write the correct partitioning definition into the file /tmp/partitionfile on the node +Create a shell script that will be run on the node during the install process to dynamically create the disk partitioning definition. This script will be run during the OS installer %pre script on RedHat or preseed/early_command on Unbuntu execution and must write the correct partitioning definition into the file /tmp/partitionfile on the node .. END_Partition_Definition_Script_overview @@ -379,7 +379,7 @@ The purpose of the partition script is to create the /tmp/partionfile that will .. BEGIN_Partition_Definition_Script_Create_partition_script_example_redhat_sles -Here is an example of the partition script on Redhat and SLES, the partitioning script is ``/install/custom/my-partitions.sh``: :: +Here is an example of the partition script on RedHat and SLES, the partitioning script is ``/install/custom/my-partitions.sh``: :: instdisk="/dev/sda" @@ -448,7 +448,7 @@ Run below commands to associate partition script with osimage: :: nodeset osimage= - The "s:" preceding the filename tells nodeset that this is a script. - - For Redhat, when nodeset runs and generates the /install/autoinst file for a node, it will add the execution of the contents of this script to the %pre section of that file. The nodeset command will then replace the #XCAT_PARTITION_START#...#XCAT_PARTITION_END# directives from the osimage template file with "%include /tmp/partitionfile" to dynamically include the tmp definition file your script created. + - For RedHat, when nodeset runs and generates the /install/autoinst file for a node, it will add the execution of the contents of this script to the %pre section of that file. The nodeset command will then replace the #XCAT_PARTITION_START#...#XCAT_PARTITION_END# directives from the osimage template file with "%include /tmp/partitionfile" to dynamically include the tmp definition file your script created. - For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will replace the "#XCA_PARTMAN_RECIPE_SCRIPT#" directive and add the execution of the contents of this script to the /install/autoinst/.pre, the /install/autoinst/.pre script will be run in the preseed/early_command. .. END_Partition_Definition_Script_Associate_partition_script_with_osimage_common