From d273fc82893cc02655fc41de082760447ccb16f0 Mon Sep 17 00:00:00 2001 From: wangxiaopeng Date: Thu, 20 Aug 2015 04:55:16 -0400 Subject: [PATCH] Refine the doc skeleton Move the subitems from install->Advanced topics to customized_image Add the subimtes for Advacned_topics Add the subitems for discovery Add subitems for developers --- source/advanced/change_mn_ip.rst | 2 + source/advanced/change_node_ip.rst | 2 + source/advanced/hamn/index.rst | 4 +- source/advanced/hierarchy_cluster.rst | 2 + source/advanced/ib.rst | 2 + source/advanced/index.rst | 18 ++++++- source/advanced/ipv6_support.rst | 2 + source/advanced/kit.rst | 2 + source/advanced/restapi/index.rst | 8 +++ .../restapi/restapi.rst} | 2 +- source/advanced/restapi/set_up_ws.rst | 2 + source/advanced/softlayer.rst | 2 + source/advanced/switch_mgmt.rst | 2 + source/advanced/sysclone.rst | 2 + source/advanced/vlan.rst | 2 + source/advanced/xcat_port.rst | 2 + source/advanced/xcat_security.rst | 2 + source/advanced/zone.rst | 2 + source/developers/debug_xcat.rst | 2 + source/developers/developer_guide.rst | 2 + source/developers/index.rst | 4 +- .../mini-design/2.10/xcatdebugmode.rst | 14 ----- .../mini-design/2.11/docker-swarm.rst | 2 - source/developers/mini-design/2.11/docker.rst | 49 ------------------ source/developers/mini-design/index.rst | 24 --------- source/developers/programming_tips.rst | 2 + .../common/deployment/create_img.rst | 3 -- .../common/discover/manually_define.rst | 2 + .../common/discover/manually_discovery.rst | 2 + .../common/discover/mtms_discovery.rst | 2 + .../common/discover/seq_discovery.rst | 2 + .../common/discover/switch_discovery.rst | 2 + .../ppc64le/discovery/index.rst | 16 ++++-- .../ppc64le/discovery/manually_define.rst | 1 + .../ppc64le/discovery/manually_discovery.rst | 1 + .../ppc64le/discovery/mtms_discovery.rst | 1 + .../ppc64le/discovery/seq_discovery.rst | 1 + .../ppc64le/discovery/switch_discovery.rst | 1 + .../ppc64le/diskful/advanced_topics/index.rst | 15 ------ .../{image_mgmt.rst => copy_image.rst} | 0 .../additional_pkg.rst | 0 .../cfg_partition.rst | 0 .../cfg_second_adapter.rst | 0 .../driver_update_disk.rst | 0 .../ppc64le/diskful/customize_image/index.rst | 16 ++++++ .../pre_post_script.rst | 0 .../raid_cfg.rst | 0 .../syncfile.rst | 0 .../manage_clusters/ppc64le/diskful/index.rst | 5 +- .../diskless/advanced_topics/index.rst | 13 ----- .../ppc64le/diskless/copy_image.rst | 2 + .../additional_pkg.rst | 0 .../cfg_partition.rst | 0 .../cfg_second_adapter.rst | 0 .../driver_update_disk.rst | 0 .../enable_kdump.rst | 0 .../diskless/customize_image/index.rst | 15 ++++++ .../pre_post_script.rst | 0 .../raid_cfg.rst | 0 .../syncfile.rst | 0 .../{image_mgmt.rst => gen_image.rst} | 2 - .../ppc64le/diskless/index.rst | 6 +-- .../ppc64le/virtual_machines/manage_vms.rst | 3 -- .../x86_64/discovery/index.rst | 4 -- .../manage_clusters/x86_64/diskful/index.rst | 3 -- .../manage_clusters/x86_64/diskless/index.rst | 3 -- .../common/.install_guide.rst.swp | Bin 12288 -> 0 bytes source/index.rst | 2 +- source/overview/index.rst | 1 + source/overview/setup_cluster_process.rst | 2 + 70 files changed, 133 insertions(+), 152 deletions(-) create mode 100644 source/advanced/change_mn_ip.rst create mode 100644 source/advanced/change_node_ip.rst create mode 100644 source/advanced/hierarchy_cluster.rst create mode 100644 source/advanced/ib.rst create mode 100644 source/advanced/ipv6_support.rst create mode 100644 source/advanced/kit.rst create mode 100644 source/advanced/restapi/index.rst rename source/{guides/admin-guides/manage_clusters/common/discovery.rst => advanced/restapi/restapi.rst} (50%) create mode 100644 source/advanced/restapi/set_up_ws.rst create mode 100644 source/advanced/softlayer.rst create mode 100644 source/advanced/switch_mgmt.rst create mode 100644 source/advanced/sysclone.rst create mode 100644 source/advanced/vlan.rst create mode 100644 source/advanced/xcat_port.rst create mode 100644 source/advanced/xcat_security.rst create mode 100644 source/advanced/zone.rst create mode 100644 source/developers/debug_xcat.rst create mode 100644 source/developers/developer_guide.rst delete mode 100644 source/developers/mini-design/2.10/xcatdebugmode.rst delete mode 100644 source/developers/mini-design/2.11/docker-swarm.rst delete mode 100644 source/developers/mini-design/2.11/docker.rst delete mode 100644 source/developers/mini-design/index.rst create mode 100644 source/developers/programming_tips.rst create mode 100644 source/guides/admin-guides/manage_clusters/common/discover/manually_define.rst create mode 100644 source/guides/admin-guides/manage_clusters/common/discover/manually_discovery.rst create mode 100644 source/guides/admin-guides/manage_clusters/common/discover/mtms_discovery.rst create mode 100644 source/guides/admin-guides/manage_clusters/common/discover/seq_discovery.rst create mode 100644 source/guides/admin-guides/manage_clusters/common/discover/switch_discovery.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms_discovery.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst delete mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/index.rst rename source/guides/admin-guides/manage_clusters/ppc64le/diskful/{image_mgmt.rst => copy_image.rst} (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskful/{advanced_topics => customize_image}/additional_pkg.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskful/{advanced_topics => customize_image}/cfg_partition.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskful/{advanced_topics => customize_image}/cfg_second_adapter.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskful/{advanced_topics => customize_image}/driver_update_disk.rst (100%) create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst rename source/guides/admin-guides/manage_clusters/ppc64le/diskful/{advanced_topics => customize_image}/pre_post_script.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskful/{advanced_topics => customize_image}/raid_cfg.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskful/{advanced_topics => customize_image}/syncfile.rst (100%) delete mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/index.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/diskless/copy_image.rst rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{advanced_topics => customize_image}/additional_pkg.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{advanced_topics => customize_image}/cfg_partition.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{advanced_topics => customize_image}/cfg_second_adapter.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{advanced_topics => customize_image}/driver_update_disk.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{advanced_topics => customize_image}/enable_kdump.rst (100%) create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{advanced_topics => customize_image}/pre_post_script.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{advanced_topics => customize_image}/raid_cfg.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{advanced_topics => customize_image}/syncfile.rst (100%) rename source/guides/admin-guides/manage_clusters/ppc64le/diskless/{image_mgmt.rst => gen_image.rst} (50%) delete mode 100644 source/guides/install-guides/common/.install_guide.rst.swp create mode 100644 source/overview/setup_cluster_process.rst diff --git a/source/advanced/change_mn_ip.rst b/source/advanced/change_mn_ip.rst new file mode 100644 index 000000000..d02fd709a --- /dev/null +++ b/source/advanced/change_mn_ip.rst @@ -0,0 +1,2 @@ +Changing the Hostname or IP for Management Node +=============================================== diff --git a/source/advanced/change_node_ip.rst b/source/advanced/change_node_ip.rst new file mode 100644 index 000000000..969f644bb --- /dev/null +++ b/source/advanced/change_node_ip.rst @@ -0,0 +1,2 @@ +Chaning the Hostname or IP for Compute Node +=========================================== diff --git a/source/advanced/hamn/index.rst b/source/advanced/hamn/index.rst index ded16df58..9e4e10e6b 100644 --- a/source/advanced/hamn/index.rst +++ b/source/advanced/hamn/index.rst @@ -1,5 +1,5 @@ -High Available Management Node -============================== +Highly Available Management Node +================================ .. toctree:: :maxdepth: 2 diff --git a/source/advanced/hierarchy_cluster.rst b/source/advanced/hierarchy_cluster.rst new file mode 100644 index 000000000..fa3b38c3f --- /dev/null +++ b/source/advanced/hierarchy_cluster.rst @@ -0,0 +1,2 @@ +Setting Up a Linux Hierarchical Cluster +======================================= diff --git a/source/advanced/ib.rst b/source/advanced/ib.rst new file mode 100644 index 000000000..bbd3f2ef0 --- /dev/null +++ b/source/advanced/ib.rst @@ -0,0 +1,2 @@ +Managing the Mellanox Infiniband Network +======================================== diff --git a/source/advanced/index.rst b/source/advanced/index.rst index 4f04f4bea..d9deb5afb 100644 --- a/source/advanced/index.rst +++ b/source/advanced/index.rst @@ -4,7 +4,21 @@ Advanced Topics .. toctree:: :maxdepth: 2 + restapi/index.rst + mixed_cluster.rst + hierarchy_cluster.rst + hamn/index.rst + change_mn_ip.rst + change_node_ip.rst + xcat_security.rst + kit.rst + ib.rst confluent/index.rst docker/index.rst - hamn/index.rst - mixed_cluster.rst + ipv6_support.rst + xcat_port.rst + sysclone.rst + switch_mgmt.rst + vlan.rst + zone.rst + softlayer.rst diff --git a/source/advanced/ipv6_support.rst b/source/advanced/ipv6_support.rst new file mode 100644 index 000000000..82ead6440 --- /dev/null +++ b/source/advanced/ipv6_support.rst @@ -0,0 +1,2 @@ +Configuring IPv6 in xCAT Cluster +================================ diff --git a/source/advanced/kit.rst b/source/advanced/kit.rst new file mode 100644 index 000000000..e83fc2930 --- /dev/null +++ b/source/advanced/kit.rst @@ -0,0 +1,2 @@ +Using Software KITs +=================== diff --git a/source/advanced/restapi/index.rst b/source/advanced/restapi/index.rst new file mode 100644 index 000000000..6724c604d --- /dev/null +++ b/source/advanced/restapi/index.rst @@ -0,0 +1,8 @@ +xCAT Web Services REST API +========================== + +.. toctree:: + :maxdepth: 2 + + set_up_ws.rst + restapi.rst diff --git a/source/guides/admin-guides/manage_clusters/common/discovery.rst b/source/advanced/restapi/restapi.rst similarity index 50% rename from source/guides/admin-guides/manage_clusters/common/discovery.rst rename to source/advanced/restapi/restapi.rst index af02f5d75..c28bacd72 100644 --- a/source/guides/admin-guides/manage_clusters/common/discovery.rst +++ b/source/advanced/restapi/restapi.rst @@ -1,2 +1,2 @@ -Hardware Discovery +REST API Reference ================== diff --git a/source/advanced/restapi/set_up_ws.rst b/source/advanced/restapi/set_up_ws.rst new file mode 100644 index 000000000..e9fde8a04 --- /dev/null +++ b/source/advanced/restapi/set_up_ws.rst @@ -0,0 +1,2 @@ +Set Up Web Service for REST API +=============================== diff --git a/source/advanced/softlayer.rst b/source/advanced/softlayer.rst new file mode 100644 index 000000000..ea9bcaf65 --- /dev/null +++ b/source/advanced/softlayer.rst @@ -0,0 +1,2 @@ +Using xCAT in SoftLayer +======================= diff --git a/source/advanced/switch_mgmt.rst b/source/advanced/switch_mgmt.rst new file mode 100644 index 000000000..c4c2617bc --- /dev/null +++ b/source/advanced/switch_mgmt.rst @@ -0,0 +1,2 @@ +Managing Ethernet Switches +========================== diff --git a/source/advanced/sysclone.rst b/source/advanced/sysclone.rst new file mode 100644 index 000000000..6b26ec335 --- /dev/null +++ b/source/advanced/sysclone.rst @@ -0,0 +1,2 @@ +Using System Clone to Deploy Diskful Node +========================================= diff --git a/source/advanced/vlan.rst b/source/advanced/vlan.rst new file mode 100644 index 000000000..0867106da --- /dev/null +++ b/source/advanced/vlan.rst @@ -0,0 +1,2 @@ +VLAN Configuration +================== diff --git a/source/advanced/xcat_port.rst b/source/advanced/xcat_port.rst new file mode 100644 index 000000000..5952d1531 --- /dev/null +++ b/source/advanced/xcat_port.rst @@ -0,0 +1,2 @@ +xCAT Port Usage +=============== diff --git a/source/advanced/xcat_security.rst b/source/advanced/xcat_security.rst new file mode 100644 index 000000000..04d904fe1 --- /dev/null +++ b/source/advanced/xcat_security.rst @@ -0,0 +1,2 @@ +xCAT 2 Security +=============== diff --git a/source/advanced/zone.rst b/source/advanced/zone.rst new file mode 100644 index 000000000..43833006b --- /dev/null +++ b/source/advanced/zone.rst @@ -0,0 +1,2 @@ +Setting Up Management Zones +=========================== diff --git a/source/developers/debug_xcat.rst b/source/developers/debug_xcat.rst new file mode 100644 index 000000000..7ae5bab53 --- /dev/null +++ b/source/developers/debug_xcat.rst @@ -0,0 +1,2 @@ +Debug xCAT Problems +=================== diff --git a/source/developers/developer_guide.rst b/source/developers/developer_guide.rst new file mode 100644 index 000000000..cf18c40ac --- /dev/null +++ b/source/developers/developer_guide.rst @@ -0,0 +1,2 @@ +Developer Guide +=============== diff --git a/source/developers/index.rst b/source/developers/index.rst index 67fe4b126..c9ae4dd8c 100644 --- a/source/developers/index.rst +++ b/source/developers/index.rst @@ -7,6 +7,8 @@ This page is for developers interested in working with xCAT. .. toctree:: :maxdepth: 2 + developer_guide.rst + programming_tips.rst + debug_xcat.rst license/index.rst git/index.rst - mini-design/index.rst diff --git a/source/developers/mini-design/2.10/xcatdebugmode.rst b/source/developers/mini-design/2.10/xcatdebugmode.rst deleted file mode 100644 index 9528ac312..000000000 --- a/source/developers/mini-design/2.10/xcatdebugmode.rst +++ /dev/null @@ -1,14 +0,0 @@ -Mini-design for xCAT Debug Mode -=============================== - -Overview --------- - - -+--------+----------+ -| Name | Age | -+========+==========+ -| Wang | 20 | -+--------+----------+ -| Zhao | 18 | -+--------+----------+ diff --git a/source/developers/mini-design/2.11/docker-swarm.rst b/source/developers/mini-design/2.11/docker-swarm.rst deleted file mode 100644 index dc44c4c66..000000000 --- a/source/developers/mini-design/2.11/docker-swarm.rst +++ /dev/null @@ -1,2 +0,0 @@ -Mini-design for Docker Swarm Support -==================================== diff --git a/source/developers/mini-design/2.11/docker.rst b/source/developers/mini-design/2.11/docker.rst deleted file mode 100644 index fe9589fbc..000000000 --- a/source/developers/mini-design/2.11/docker.rst +++ /dev/null @@ -1,49 +0,0 @@ -Mini-design for Docker Support -============================== - -Overview --------- - -Docker technology is very hot recently, xCAT plans to support it as a way to deploy applictions. - -Interface ---------- - -General Command Line -^^^^^^^^^^^^^^^^^^^^ - -Will add several new commands to support docker. - -* docker create - - * Create only - * Start after creating - -* docker stop - -Stop the docker container - -* docker remove - -Rest API -^^^^^^^^ - -Add xCAT Rest API to support docker. - -* docker create - -URI - /xcatws//start - -:: - #curl - #wget - -Add a Table -^^^^^^^^^^^ -+-----------+------------+-------------+ -|Operation |Params |Result | -+===========+============+=============+ -|GET |node |on/off | -+-----------+------------+-------------+ -|PUT |node |on/off | -+-----------+------------+-------------+ diff --git a/source/developers/mini-design/index.rst b/source/developers/mini-design/index.rst deleted file mode 100644 index 324383271..000000000 --- a/source/developers/mini-design/index.rst +++ /dev/null @@ -1,24 +0,0 @@ -Mini-Design -=========== - -The **Design Document** for certain feature. - -**NOTE** - -*The documents displayed in this page are not official guides for user to reference. They are just design documents that describe how to implement certain feature. And sometimes they are not updated with the current implementation.* - -2.11 ----- - -.. toctree:: - :maxdepth: 2 - - 2.11/docker.rst - 2.11/docker-swarm.rst - -2.10 ----- -.. toctree:: - :maxdepth: 2 - - 2.10/xcatdebugmode.rst diff --git a/source/developers/programming_tips.rst b/source/developers/programming_tips.rst new file mode 100644 index 000000000..529c10e42 --- /dev/null +++ b/source/developers/programming_tips.rst @@ -0,0 +1,2 @@ +Programming Tips +================ diff --git a/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst b/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst index 3ccac1dc3..bafa70f7a 100644 --- a/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst +++ b/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst @@ -2,6 +2,3 @@ Select or Create an osimage Definition ====================================== Run copycds to create image -Customize the osimage definitions -================================= - diff --git a/source/guides/admin-guides/manage_clusters/common/discover/manually_define.rst b/source/guides/admin-guides/manage_clusters/common/discover/manually_define.rst new file mode 100644 index 000000000..8d70d1942 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/common/discover/manually_define.rst @@ -0,0 +1,2 @@ +Manually Define Nodes +===================== diff --git a/source/guides/admin-guides/manage_clusters/common/discover/manually_discovery.rst b/source/guides/admin-guides/manage_clusters/common/discover/manually_discovery.rst new file mode 100644 index 000000000..f576a5c06 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/common/discover/manually_discovery.rst @@ -0,0 +1,2 @@ +Manually Discover Nodes +======================= diff --git a/source/guides/admin-guides/manage_clusters/common/discover/mtms_discovery.rst b/source/guides/admin-guides/manage_clusters/common/discover/mtms_discovery.rst new file mode 100644 index 000000000..9239eb9e7 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/common/discover/mtms_discovery.rst @@ -0,0 +1,2 @@ +MTMS-based Discovery +==================== diff --git a/source/guides/admin-guides/manage_clusters/common/discover/seq_discovery.rst b/source/guides/admin-guides/manage_clusters/common/discover/seq_discovery.rst new file mode 100644 index 000000000..f3004dedf --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/common/discover/seq_discovery.rst @@ -0,0 +1,2 @@ +Sequential-based Discovery +========================== diff --git a/source/guides/admin-guides/manage_clusters/common/discover/switch_discovery.rst b/source/guides/admin-guides/manage_clusters/common/discover/switch_discovery.rst new file mode 100644 index 000000000..3d6c627c0 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/common/discover/switch_discovery.rst @@ -0,0 +1,2 @@ +Switch-based Discovery +====================== diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/discovery/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/index.rst index 5c6ad7fa3..cceff4896 100644 --- a/source/guides/admin-guides/manage_clusters/ppc64le/discovery/index.rst +++ b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/index.rst @@ -1,4 +1,12 @@ -.. ======================== -.. Using common shared file -.. ======================== -.. include:: ../../common/discovery.rst +Hardware Discoveriy & Define Node +================================= + +.. toctree:: + :maxdepth: 2 + + manually_define.rst + mtms_discovery.rst + switch_discovery.rst + seq_discovery.rst + manually_discovery.rst + diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst new file mode 100644 index 000000000..c0b822a66 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst @@ -0,0 +1 @@ +.. include:: ../../common/discover/manually_define.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst new file mode 100644 index 000000000..f36c7d7fe --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst @@ -0,0 +1 @@ +.. include:: ../../common/discover/manually_discovery.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms_discovery.rst b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms_discovery.rst new file mode 100644 index 000000000..88eb9606f --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms_discovery.rst @@ -0,0 +1 @@ +.. include:: ../../common/discover/mtms_discovery.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst new file mode 100644 index 000000000..91d65af17 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst @@ -0,0 +1 @@ +.. include:: ../../common/discover/seq_discovery.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst new file mode 100644 index 000000000..0b83eca00 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst @@ -0,0 +1 @@ +.. include:: ../../common/discover/switch_discovery.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/index.rst deleted file mode 100644 index 8d09b8045..000000000 --- a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/index.rst +++ /dev/null @@ -1,15 +0,0 @@ -Advanced Topics -=============== - -.. toctree:: - :maxdepth: 2 - - raid_cfg.rst - driver_update_disk.rst - cfg_partition.rst - pre_post_script.rst - syncfile.rst - additional_pkg.rst - cfg_second_adapter.rst - - diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/image_mgmt.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/copy_image.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskful/image_mgmt.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskful/copy_image.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/additional_pkg.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/additional_pkg.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/additional_pkg.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/additional_pkg.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/cfg_partition.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/cfg_partition.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/cfg_second_adapter.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/cfg_second_adapter.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/driver_update_disk.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/driver_update_disk.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst new file mode 100644 index 000000000..d81ffe7bf --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst @@ -0,0 +1,16 @@ +Customize osimage (Optional) +============================ +Optional means all the subitems in this page are not necessary to finish an OS deployment. If you are new to xCAT, you can just jump to `Initialize the Compute for Deployment`. + +.. toctree:: + :maxdepth: 2 + + raid_cfg.rst + driver_update_disk.rst + cfg_partition.rst + pre_post_script.rst + syncfile.rst + additional_pkg.rst + cfg_second_adapter.rst + + diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/pre_post_script.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/pre_post_script.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/pre_post_script.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/pre_post_script.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/raid_cfg.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/raid_cfg.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/raid_cfg.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/raid_cfg.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/syncfile.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/syncfile.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskful/advanced_topics/syncfile.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/syncfile.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/index.rst index 38dc3e842..3e7c62d47 100644 --- a/source/guides/admin-guides/manage_clusters/ppc64le/diskful/index.rst +++ b/source/guides/admin-guides/manage_clusters/ppc64le/diskful/index.rst @@ -4,7 +4,6 @@ Diskful Installation .. toctree:: :maxdepth: 2 - image_mgmt.rst - advanced_topics/index.rst + copy_image.rst + customize_image/index.rst deploy_os.rst - diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/index.rst deleted file mode 100644 index fcff675e6..000000000 --- a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/index.rst +++ /dev/null @@ -1,13 +0,0 @@ -Advanced Topics -=============== - -.. toctree:: - :maxdepth: 2 - - driver_update_disk.rst - pre_post_script.rst - syncfile.rst - additional_pkg.rst - cfg_second_adapter.rst - enable_kdump.rst - diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/copy_image.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/copy_image.rst new file mode 100644 index 000000000..5ac9c0b46 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/copy_image.rst @@ -0,0 +1,2 @@ + +.. include:: ../../common/deployment/create_img.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/additional_pkg.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/additional_pkg.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/additional_pkg.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/additional_pkg.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/cfg_partition.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_partition.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/cfg_partition.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_partition.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/cfg_second_adapter.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/cfg_second_adapter.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/driver_update_disk.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/driver_update_disk.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/enable_kdump.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/enable_kdump.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/enable_kdump.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/enable_kdump.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst new file mode 100644 index 000000000..56c351395 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst @@ -0,0 +1,15 @@ +Customize osimage (Optional) +============================ +Optional means all the subitems in this page are not necessary to finish an OS deployment. If you are new to xCAT, you can just jump + to `Initialize the Compute for Deployment`. + +.. toctree:: + :maxdepth: 2 + + driver_update_disk.rst + pre_post_script.rst + syncfile.rst + additional_pkg.rst + cfg_second_adapter.rst + enable_kdump.rst + diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/pre_post_script.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/pre_post_script.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/pre_post_script.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/pre_post_script.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/raid_cfg.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/raid_cfg.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/raid_cfg.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/raid_cfg.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/syncfile.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/syncfile.rst similarity index 100% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/advanced_topics/syncfile.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/syncfile.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/image_mgmt.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/gen_image.rst similarity index 50% rename from source/guides/admin-guides/manage_clusters/ppc64le/diskless/image_mgmt.rst rename to source/guides/admin-guides/manage_clusters/ppc64le/diskless/gen_image.rst index 488130fd8..55d8dfd31 100644 --- a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/image_mgmt.rst +++ b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/gen_image.rst @@ -1,3 +1 @@ - -.. include:: ../../common/deployment/create_img.rst .. include:: ../../common/deployment/generate_img.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/index.rst index 249ca199f..02ef13310 100644 --- a/source/guides/admin-guides/manage_clusters/ppc64le/diskless/index.rst +++ b/source/guides/admin-guides/manage_clusters/ppc64le/diskless/index.rst @@ -4,7 +4,7 @@ Diskless Installation .. toctree:: :maxdepth: 2 - image_mgmt.rst - advanced_topics/index.rst + copy_image.rst + customize_image/index.rst + gen_image.rst deploy_os.rst - diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/manage_vms.rst b/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/manage_vms.rst index c2fcb0671..00899052e 100644 --- a/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/manage_vms.rst +++ b/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/manage_vms.rst @@ -1,4 +1 @@ -.. ======================== -.. Using common shared file -.. ======================== .. include:: ../../common/kvm/manage_vm.rst diff --git a/source/guides/admin-guides/manage_clusters/x86_64/discovery/index.rst b/source/guides/admin-guides/manage_clusters/x86_64/discovery/index.rst index 5c6ad7fa3..e69de29bb 100644 --- a/source/guides/admin-guides/manage_clusters/x86_64/discovery/index.rst +++ b/source/guides/admin-guides/manage_clusters/x86_64/discovery/index.rst @@ -1,4 +0,0 @@ -.. ======================== -.. Using common shared file -.. ======================== -.. include:: ../../common/discovery.rst diff --git a/source/guides/admin-guides/manage_clusters/x86_64/diskful/index.rst b/source/guides/admin-guides/manage_clusters/x86_64/diskful/index.rst index 41d63d3eb..e69de29bb 100644 --- a/source/guides/admin-guides/manage_clusters/x86_64/diskful/index.rst +++ b/source/guides/admin-guides/manage_clusters/x86_64/diskful/index.rst @@ -1,3 +0,0 @@ -.. ======================== -.. Using common shared file -.. ======================== diff --git a/source/guides/admin-guides/manage_clusters/x86_64/diskless/index.rst b/source/guides/admin-guides/manage_clusters/x86_64/diskless/index.rst index 41d63d3eb..e69de29bb 100644 --- a/source/guides/admin-guides/manage_clusters/x86_64/diskless/index.rst +++ b/source/guides/admin-guides/manage_clusters/x86_64/diskless/index.rst @@ -1,3 +0,0 @@ -.. ======================== -.. Using common shared file -.. ======================== diff --git a/source/guides/install-guides/common/.install_guide.rst.swp b/source/guides/install-guides/common/.install_guide.rst.swp deleted file mode 100644 index e208266880703f26426b4685eac712392a1fdc0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&2AGh5XW5(+{#zEGk`#8+U&Ma6@&nZeyFNMibPwk(Pr(WhP54RFUq1wNE|`p zz#DJ^-U4nM`UG&`g^kALzdirWhhHk)uQT4HFY7<>I{ zfA`0))9l`5#;h?uOi!}Bt@NarupXy|i?}QOUfz!TY2q8)q!CZFOoiyn7(Ev|liL)d za><2@rFK5avPR{mMk%9*v#oMAvhGk_9;QQzAp%F4z%;vhWpN>#@ZyE@Fmq=2C?A&2 zMg)ie5g-CYfCvx)B0vO)zySijH^rXe+_7r@Y&A|D7%P_sB0vO)01+SpM1Tko0U|&I zhyW2F0z}|HB#>~%&P_A+5*7acAO8OTeUh>7sBfsRs4piN`;7XC`ha?adX7p_Yp6@8 zK*DWD%5^~A|nDsfCvx)B0vO)01+SpM1Tkofs#NJ!TQ!(t9tU>GOne% z%C|H=n#T3H#+Z$}b8G;26WbL~*#K_C;_}FwoZS>$=4zC^+_*kWhQZ|QZH14tp>`AZ zoP_}_HAY*9>|0|t?uO1+v)p-MVOu^GnB5f0*aB)BD_CpN-mG4);_r*cxwJwF?cI%f zow1!g0j|Kx3hZBN&@mPYd}R*()jK<&5}kC*EC{3_3mCHkxabMZ9T*Kh6bikWPWhcy z{bCX5WeEnDsthEWmm$9BmEk>Wo=7K+mbweM6C7$>x<{Qnn}_g`3FqdAU8b4Q0$t(L y*$5!?uabwxN?(MntFvS#;eZd}g#(`3P