From 5fc6160fe326102824c0476a894e228e2b1bed1b Mon Sep 17 00:00:00 2001 From: "Patrick Lundgren plundgr@us.ibm.com" Date: Mon, 26 Oct 2015 13:57:09 -0400 Subject: [PATCH 1/2] fixed links in hierarchy DB setup --- docs/source/advanced/hierarchy/index.rst | 2 +- .../setup_mn_hierachical_database.rst | 27 ------------------- .../setup_mn_hierarchical_database.rst | 8 +++--- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 docs/source/advanced/hierarchy/setup_mn_hierachical_database.rst diff --git a/docs/source/advanced/hierarchy/index.rst b/docs/source/advanced/hierarchy/index.rst index 5ff6a59af..76dcbc0c7 100644 --- a/docs/source/advanced/hierarchy/index.rst +++ b/docs/source/advanced/hierarchy/index.rst @@ -5,7 +5,7 @@ Hierarchical Clusters :maxdepth: 2 introduction.rst - setup_mn_hierachical_database.rst + setup_mn_hierarchical_database.rst define_service_node.rst configure_dhcp.rst setup_service_node.rst diff --git a/docs/source/advanced/hierarchy/setup_mn_hierachical_database.rst b/docs/source/advanced/hierarchy/setup_mn_hierachical_database.rst deleted file mode 100644 index d4c07c4e4..000000000 --- a/docs/source/advanced/hierarchy/setup_mn_hierachical_database.rst +++ /dev/null @@ -1,27 +0,0 @@ -Setup the MN Hierarchical Database -================================== - -Before setting up service nodes, you need to set up either MySQL, PostgreSQL, -as the xCAT Database on the Management Node. The database client on the -Service Nodes will be set up later when the SNs are installed. MySQL and -PostgreSQL are available with the Linux OS. - -Follow the instructions in one of these documents for setting up the -Management node to use the selected database: - -MySQL or MariaDB ----------------- - -* Follow this documentation and be sure to use the xCAT provided mysqlsetup - command to setup the database for xCAT: - .. TODO http link - - - `Setting_Up_MySQL_as_the_xCAT_DB `_ - -PostgreSQL: ------------ -* Follow this documentation and be sure and use the xCAT provided pgsqlsetup - command to setup the database for xCAT: - .. TODO http link - - - `Setting_Up_PostgreSQL_as_the_xCAT_DB `_ diff --git a/docs/source/advanced/hierarchy/setup_mn_hierarchical_database.rst b/docs/source/advanced/hierarchy/setup_mn_hierarchical_database.rst index d4c07c4e4..d0c151a06 100644 --- a/docs/source/advanced/hierarchy/setup_mn_hierarchical_database.rst +++ b/docs/source/advanced/hierarchy/setup_mn_hierarchical_database.rst @@ -13,15 +13,13 @@ MySQL or MariaDB ---------------- * Follow this documentation and be sure to use the xCAT provided mysqlsetup - command to setup the database for xCAT: - .. TODO http link + command to setup the database for xCAT 3: - - `Setting_Up_MySQL_as_the_xCAT_DB `_ + - :doc:`/guides/admin-guides/large_clusters/databases/mysql_install` PostgreSQL: ----------- * Follow this documentation and be sure and use the xCAT provided pgsqlsetup command to setup the database for xCAT: - .. TODO http link - - `Setting_Up_PostgreSQL_as_the_xCAT_DB `_ + - :doc:`/guides/admin-guides/large_clusters/databases/postgres_install` From f8c7cf66cda78d44393ce1f74573030c9d6aa8d9 Mon Sep 17 00:00:00 2001 From: "Patrick Lundgren plundgr@us.ibm.com" Date: Mon, 26 Oct 2015 14:02:19 -0400 Subject: [PATCH 2/2] removed the 3 --- .../advanced/hierarchy/setup_mn_hierarchical_database.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/advanced/hierarchy/setup_mn_hierarchical_database.rst b/docs/source/advanced/hierarchy/setup_mn_hierarchical_database.rst index d0c151a06..f68b3e843 100644 --- a/docs/source/advanced/hierarchy/setup_mn_hierarchical_database.rst +++ b/docs/source/advanced/hierarchy/setup_mn_hierarchical_database.rst @@ -13,7 +13,7 @@ MySQL or MariaDB ---------------- * Follow this documentation and be sure to use the xCAT provided mysqlsetup - command to setup the database for xCAT 3: + command to setup the database for xCAT: - :doc:`/guides/admin-guides/large_clusters/databases/mysql_install`