From 67cbb37cdf7593b0872d41f540ea0357db5bf182 Mon Sep 17 00:00:00 2001 From: wangxiaopeng Date: Fri, 14 Aug 2015 04:28:35 -0400 Subject: [PATCH] Change the skeleton of cluster management I moved the [Hardware Architectures] to [Manage Clusters] since I thought the name [Hardware Architectures] will make user confusing that this page is for hardware things. Another change was I moved the kvm part to be a sub-doc of specific arch. This is because the kvm only can be done after the bare-metal deployment. In the kvm part, I'd like only includes the [host install] and [vm management]. The OS deployment should be same with bare-metal. And since there's no much customer were using kvm, move it to low level will make our doc more clear to follow. --- .../hardware_architectures/ppc64le/index.rst | 8 -------- .../ppc64le/power8le_baremetal/index.rst | 11 ----------- .../ppc64le/power8le_kvm/index.rst | 11 ----------- .../x86_64_baremetal/management/index.rst | 16 ---------------- .../x86_64/x86_64_kvm/management/index.rst | 16 ---------------- source/guides/admin-guides/index.rst | 2 +- .../common/discovery.rst | 0 .../common/diskful.rst | 0 .../common/diskless.rst | 0 .../manage_clusters/common/kvm/manage_vm.rst | 8 ++++++++ .../common/management.rst | 0 .../common/management/rbeacon.rst | 0 .../common/management/rcons.rst | 0 .../common/management/renergy.rst | 0 .../common/management/reventlog.rst | 0 .../common/management/rflash.rst | 0 .../common/management/rinv.rst | 0 .../common/management/rpower.rst | 0 .../common/management/rspconfig.rst | 0 .../common/management/rvitals.rst | 0 .../index.rst | 4 ++-- .../manage_clusters/ppc64le/index.rst | 11 +++++++++++ .../ppc64le/management/.index.rst.swp | Bin 0 -> 12288 bytes .../ppc64le/management/index.rst | 16 ++++++++++++++++ .../ppc64le/power8le_kvm/index.rst | 8 ++++++++ .../ppc64le/power8le_kvm/install_powerkvm.rst | 2 ++ .../x86_64/index.rst | 0 .../x86_64/x86_64_baremetal/index.rst | 0 .../x86_64_baremetal}/management/index.rst | 0 .../x86_64/x86_64_kvm/index.rst | 0 .../x86_64/x86_64_kvm}/management/index.rst | 0 31 files changed, 48 insertions(+), 65 deletions(-) delete mode 100644 source/guides/admin-guides/hardware_architectures/ppc64le/index.rst delete mode 100644 source/guides/admin-guides/hardware_architectures/ppc64le/power8le_baremetal/index.rst delete mode 100644 source/guides/admin-guides/hardware_architectures/ppc64le/power8le_kvm/index.rst delete mode 100644 source/guides/admin-guides/hardware_architectures/x86_64/x86_64_baremetal/management/index.rst delete mode 100644 source/guides/admin-guides/hardware_architectures/x86_64/x86_64_kvm/management/index.rst rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/discovery.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/diskful.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/diskless.rst (100%) create mode 100644 source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/rbeacon.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/rcons.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/renergy.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/reventlog.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/rflash.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/rinv.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/rpower.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/rspconfig.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/common/management/rvitals.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/index.rst (60%) create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/index.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/management/.index.rst.swp create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/power8le_kvm/index.rst create mode 100644 source/guides/admin-guides/manage_clusters/ppc64le/power8le_kvm/install_powerkvm.rst rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/x86_64/index.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/x86_64/x86_64_baremetal/index.rst (100%) rename source/guides/admin-guides/{hardware_architectures/ppc64le/power8le_baremetal => manage_clusters/x86_64/x86_64_baremetal}/management/index.rst (100%) rename source/guides/admin-guides/{hardware_architectures => manage_clusters}/x86_64/x86_64_kvm/index.rst (100%) rename source/guides/admin-guides/{hardware_architectures/ppc64le/power8le_kvm => manage_clusters/x86_64/x86_64_kvm}/management/index.rst (100%) diff --git a/source/guides/admin-guides/hardware_architectures/ppc64le/index.rst b/source/guides/admin-guides/hardware_architectures/ppc64le/index.rst deleted file mode 100644 index e9b3e7899..000000000 --- a/source/guides/admin-guides/hardware_architectures/ppc64le/index.rst +++ /dev/null @@ -1,8 +0,0 @@ -ppc64le -======= - -.. toctree:: - :maxdepth: 2 - - power8le_baremetal/index.rst - power8le_kvm/index.rst diff --git a/source/guides/admin-guides/hardware_architectures/ppc64le/power8le_baremetal/index.rst b/source/guides/admin-guides/hardware_architectures/ppc64le/power8le_baremetal/index.rst deleted file mode 100644 index 27d0b2cee..000000000 --- a/source/guides/admin-guides/hardware_architectures/ppc64le/power8le_baremetal/index.rst +++ /dev/null @@ -1,11 +0,0 @@ -IBM Power8 LE and OpenPOWER (bare metal) -======================================== - -.. toctree:: - :maxdepth: 2 - - ../../common/discovery.rst - management/index.rst - ../../common/diskful.rst - ../../common/diskless.rst - diff --git a/source/guides/admin-guides/hardware_architectures/ppc64le/power8le_kvm/index.rst b/source/guides/admin-guides/hardware_architectures/ppc64le/power8le_kvm/index.rst deleted file mode 100644 index 156ff80de..000000000 --- a/source/guides/admin-guides/hardware_architectures/ppc64le/power8le_kvm/index.rst +++ /dev/null @@ -1,11 +0,0 @@ -IBM Power8 LE and OpenPOWER (kvm) -================================= - -.. toctree:: - :maxdepth: 2 - - ../../common/discovery.rst - management/index.rst - ../../common/diskful.rst - ../../common/diskless.rst - diff --git a/source/guides/admin-guides/hardware_architectures/x86_64/x86_64_baremetal/management/index.rst b/source/guides/admin-guides/hardware_architectures/x86_64/x86_64_baremetal/management/index.rst deleted file mode 100644 index d491207b5..000000000 --- a/source/guides/admin-guides/hardware_architectures/x86_64/x86_64_baremetal/management/index.rst +++ /dev/null @@ -1,16 +0,0 @@ -Hardware Management -=================== - -.. toctree:: - :maxdepth: 2 - - ../../../common/management/rpower.rst - ../../../common/management/rspconfig.rst - ../../../common/management/reventlog.rst - ../../../common/management/rbeacon - ../../../common/management/rcons - ../../../common/management/rinv - ../../../common/management/rvitals - ../../../common/management/rflash - ../../../common/management/renergy - diff --git a/source/guides/admin-guides/hardware_architectures/x86_64/x86_64_kvm/management/index.rst b/source/guides/admin-guides/hardware_architectures/x86_64/x86_64_kvm/management/index.rst deleted file mode 100644 index d491207b5..000000000 --- a/source/guides/admin-guides/hardware_architectures/x86_64/x86_64_kvm/management/index.rst +++ /dev/null @@ -1,16 +0,0 @@ -Hardware Management -=================== - -.. toctree:: - :maxdepth: 2 - - ../../../common/management/rpower.rst - ../../../common/management/rspconfig.rst - ../../../common/management/reventlog.rst - ../../../common/management/rbeacon - ../../../common/management/rcons - ../../../common/management/rinv - ../../../common/management/rvitals - ../../../common/management/rflash - ../../../common/management/renergy - diff --git a/source/guides/admin-guides/index.rst b/source/guides/admin-guides/index.rst index ba23d53f3..20502bd4b 100644 --- a/source/guides/admin-guides/index.rst +++ b/source/guides/admin-guides/index.rst @@ -5,6 +5,6 @@ Admin Guide :maxdepth: 2 basic_concepts/index.rst - hardware_architectures/index.rst + manage_clusters/index.rst references/index.rst large_clusters/index.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/discovery.rst b/source/guides/admin-guides/manage_clusters/common/discovery.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/discovery.rst rename to source/guides/admin-guides/manage_clusters/common/discovery.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/diskful.rst b/source/guides/admin-guides/manage_clusters/common/diskful.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/diskful.rst rename to source/guides/admin-guides/manage_clusters/common/diskful.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/diskless.rst b/source/guides/admin-guides/manage_clusters/common/diskless.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/diskless.rst rename to source/guides/admin-guides/manage_clusters/common/diskless.rst diff --git a/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst b/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst new file mode 100644 index 000000000..ab5ec9ab7 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst @@ -0,0 +1,8 @@ +Manage Virtual Machine +====================== + +Create Virtual Machine +---------------------- + +Change Virtual Machine +---------------------- diff --git a/source/guides/admin-guides/hardware_architectures/common/management.rst b/source/guides/admin-guides/manage_clusters/common/management.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management.rst rename to source/guides/admin-guides/manage_clusters/common/management.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/rbeacon.rst b/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/rbeacon.rst rename to source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/rcons.rst b/source/guides/admin-guides/manage_clusters/common/management/rcons.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/rcons.rst rename to source/guides/admin-guides/manage_clusters/common/management/rcons.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/renergy.rst b/source/guides/admin-guides/manage_clusters/common/management/renergy.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/renergy.rst rename to source/guides/admin-guides/manage_clusters/common/management/renergy.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/reventlog.rst b/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/reventlog.rst rename to source/guides/admin-guides/manage_clusters/common/management/reventlog.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/rflash.rst b/source/guides/admin-guides/manage_clusters/common/management/rflash.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/rflash.rst rename to source/guides/admin-guides/manage_clusters/common/management/rflash.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/rinv.rst b/source/guides/admin-guides/manage_clusters/common/management/rinv.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/rinv.rst rename to source/guides/admin-guides/manage_clusters/common/management/rinv.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/rpower.rst b/source/guides/admin-guides/manage_clusters/common/management/rpower.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/rpower.rst rename to source/guides/admin-guides/manage_clusters/common/management/rpower.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/rspconfig.rst b/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/rspconfig.rst rename to source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst diff --git a/source/guides/admin-guides/hardware_architectures/common/management/rvitals.rst b/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/common/management/rvitals.rst rename to source/guides/admin-guides/manage_clusters/common/management/rvitals.rst diff --git a/source/guides/admin-guides/hardware_architectures/index.rst b/source/guides/admin-guides/manage_clusters/index.rst similarity index 60% rename from source/guides/admin-guides/hardware_architectures/index.rst rename to source/guides/admin-guides/manage_clusters/index.rst index 9185c722b..e2040f6ce 100644 --- a/source/guides/admin-guides/hardware_architectures/index.rst +++ b/source/guides/admin-guides/manage_clusters/index.rst @@ -1,5 +1,5 @@ -Hardware Architectures -====================== +Manage Clusters +=============== .. toctree:: :maxdepth: 2 diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/index.rst new file mode 100644 index 000000000..072b74e6c --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/index.rst @@ -0,0 +1,11 @@ +IBM Power8 LE and OpenPOWER +=========================== + +.. toctree:: + :maxdepth: 2 + + ../common/discovery.rst + management/index.rst + ../common/diskful.rst + ../common/diskless.rst + power8le_kvm/index.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/management/.index.rst.swp b/source/guides/admin-guides/manage_clusters/ppc64le/management/.index.rst.swp new file mode 100644 index 0000000000000000000000000000000000000000..e2a4b6f2fe4d847006a19e54341ec9ea55db2944 GIT binary patch literal 12288 zcmeI&F>ll`6bJCv?$C-#ofr(A8<(~M=_JGoL&tWleD>>|rNoYG=X#y^4h$XmB(xs^ ziMf^f75WWWcsULUft2e?`CIo_-ZIaS(c%zTYrUKLF^n!UX^T literal 0 HcmV?d00001 diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst new file mode 100644 index 000000000..aebe27a92 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst @@ -0,0 +1,16 @@ +Hardware Management +=================== + +.. toctree:: + :maxdepth: 2 + + ../../common/management/rpower.rst + ../../common/management/rspconfig.rst + ../../common/management/reventlog.rst + ../../common/management/rbeacon + ../../common/management/rcons + ../../common/management/rinv + ../../common/management/rvitals + ../../common/management/rflash + ../../common/management/renergy + diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/power8le_kvm/index.rst b/source/guides/admin-guides/manage_clusters/ppc64le/power8le_kvm/index.rst new file mode 100644 index 000000000..d117d3071 --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/power8le_kvm/index.rst @@ -0,0 +1,8 @@ +Manage kvm VM +================================= + +.. toctree:: + :maxdepth: 2 + + install_powerkvm.rst + ../../common/kvm/manage_vm.rst diff --git a/source/guides/admin-guides/manage_clusters/ppc64le/power8le_kvm/install_powerkvm.rst b/source/guides/admin-guides/manage_clusters/ppc64le/power8le_kvm/install_powerkvm.rst new file mode 100644 index 000000000..8ee5dd48e --- /dev/null +++ b/source/guides/admin-guides/manage_clusters/ppc64le/power8le_kvm/install_powerkvm.rst @@ -0,0 +1,2 @@ +Install PowerKVM +================ diff --git a/source/guides/admin-guides/hardware_architectures/x86_64/index.rst b/source/guides/admin-guides/manage_clusters/x86_64/index.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/x86_64/index.rst rename to source/guides/admin-guides/manage_clusters/x86_64/index.rst diff --git a/source/guides/admin-guides/hardware_architectures/x86_64/x86_64_baremetal/index.rst b/source/guides/admin-guides/manage_clusters/x86_64/x86_64_baremetal/index.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/x86_64/x86_64_baremetal/index.rst rename to source/guides/admin-guides/manage_clusters/x86_64/x86_64_baremetal/index.rst diff --git a/source/guides/admin-guides/hardware_architectures/ppc64le/power8le_baremetal/management/index.rst b/source/guides/admin-guides/manage_clusters/x86_64/x86_64_baremetal/management/index.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/ppc64le/power8le_baremetal/management/index.rst rename to source/guides/admin-guides/manage_clusters/x86_64/x86_64_baremetal/management/index.rst diff --git a/source/guides/admin-guides/hardware_architectures/x86_64/x86_64_kvm/index.rst b/source/guides/admin-guides/manage_clusters/x86_64/x86_64_kvm/index.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/x86_64/x86_64_kvm/index.rst rename to source/guides/admin-guides/manage_clusters/x86_64/x86_64_kvm/index.rst diff --git a/source/guides/admin-guides/hardware_architectures/ppc64le/power8le_kvm/management/index.rst b/source/guides/admin-guides/manage_clusters/x86_64/x86_64_kvm/management/index.rst similarity index 100% rename from source/guides/admin-guides/hardware_architectures/ppc64le/power8le_kvm/management/index.rst rename to source/guides/admin-guides/manage_clusters/x86_64/x86_64_kvm/management/index.rst