From d7b5e0eaa9998bc4b95a28f461d6701a04cc5658 Mon Sep 17 00:00:00 2001 From: daz Date: Mon, 6 Mar 2017 14:22:29 +1100 Subject: [PATCH] [arch-design] Publish draft Arch Guide to docs.openstack.org 1. Unpublish the current arch-design and temporarily relocate it to a "to archive" directory until the archiving structure is available 2. Publish the arch-design-draft to docs.openstack.org 3. Unpublish arch-design-draft from https://docs.openstack.org/draft/ Change-Id: Ida5f237d2edce7a83a24c376c355e2c220bc8c28 Implements: blueprint arch-design-pike --- doc-tools-check-languages.conf | 4 +- doc/arch-design-draft/source/index.rst | 56 ------------------ .../setup.cfg | 0 .../setup.py | 0 .../source/common | 0 .../source/compute-focus-architecture.rst | 0 ...mpute-focus-operational-considerations.rst | 0 .../compute-focus-prescriptive-examples.rst | 0 ...compute-focus-technical-considerations.rst | 0 .../source/compute-focus.rst | 0 .../source/conf.py | 6 +- .../source/figures/Compute_NSX.png | Bin ...ompute_Tech_Bin_Packing_CPU_optimized1.png | Bin .../Compute_Tech_Bin_Packing_General1.png | Bin .../source/figures/General_Architecture3.png | Bin .../figures/Generic_CERN_Architecture.png | Bin .../source/figures/Generic_CERN_Example.png | Bin .../Massively_Scalable_Cells_regions_azs.png | Bin .../source/figures/Multi-Cloud_Priv-AWS4.png | Bin .../source/figures/Multi-Cloud_Priv-Pub3.png | Bin .../source/figures/Multi-Cloud_failover2.png | Bin .../figures/Multi-Site_Customer_Edge.png | Bin .../figures/Multi-Site_shared_keystone1.png | Bin ...ti-Site_shared_keystone_horizon_swift1.png | Bin .../figures/Multi-site_Geo_Redundant_LB.png | Bin .../source/figures/Network_Cloud_Storage2.png | Bin .../source/figures/Network_Web_Services1.png | Bin .../source/figures/Specialized_Hardware2.png | Bin .../source/figures/Specialized_OOO.png | Bin .../figures/Specialized_SDN_external.png | Bin .../source/figures/Specialized_SDN_hosted.png | Bin .../source/figures/Specialized_VDI1.png | Bin .../figures/Storage_Database_+_Object5.png | Bin .../source/figures/Storage_Hadoop3.png | Bin .../source/figures/Storage_Object.png | Bin .../source/generalpurpose-architecture.rst | 0 ...eralpurpose-operational-considerations.rst | 0 .../generalpurpose-prescriptive-example.rst | 0 ...eneralpurpose-technical-considerations.rst | 0 .../generalpurpose-user-requirements.rst | 0 .../source/generalpurpose.rst | 0 .../source/hybrid-architecture.rst | 0 .../hybrid-operational-considerations.rst | 0 .../source/hybrid-prescriptive-examples.rst | 0 .../hybrid-technical-considerations.rst | 0 .../source/hybrid-user-requirements.rst | 0 .../source/hybrid.rst | 0 doc/arch-design-to-archive/source/index.rst | 56 ++++++++++++++++++ ...ntroduction-how-this-book-is-organized.rst | 0 ...introduction-how-this-book-was-written.rst | 0 .../source/introduction-intended-audience.rst | 0 .../source/introduction-methodology.rst | 0 .../source/introduction.rst | 0 .../source/legal-security-requirements.rst | 0 ...ly-scalable-operational-considerations.rst | 0 ...vely-scalable-technical-considerations.rst | 0 .../massively-scalable-user-requirements.rst | 0 .../source/massively-scalable.rst | 0 .../source/multi-site-architecture.rst | 0 .../multi-site-operational-considerations.rst | 0 .../multi-site-prescriptive-examples.rst | 0 .../multi-site-technical-considerations.rst | 0 .../source/multi-site-user-requirements.rst | 0 .../source/multi-site.rst | 0 .../source/network-focus-architecture.rst | 0 ...twork-focus-operational-considerations.rst | 0 .../network-focus-prescriptive-examples.rst | 0 ...network-focus-technical-considerations.rst | 0 .../network-focus-user-requirements.rst | 0 .../source/network-focus.rst | 0 .../source/references.rst | 0 .../specialized-desktop-as-a-service.rst | 0 .../source/specialized-hardware.rst | 0 .../source/specialized-multi-hypervisor.rst | 0 .../source/specialized-networking.rst | 0 .../specialized-openstack-on-openstack.rst | 0 ...pecialized-software-defined-networking.rst | 0 .../source/specialized.rst | 0 .../source/storage-focus-architecture.rst | 0 ...orage-focus-operational-considerations.rst | 0 .../storage-focus-prescriptive-examples.rst | 0 ...storage-focus-technical-considerations.rst | 0 .../source/storage-focus.rst | 0 .../source/capacity-planning-scaling.rst | 0 doc/arch-design/source/conf.py | 6 +- .../source/design-cmp-tools.rst | 0 .../source/design-compute.rst | 0 .../design-compute-concepts.rst | 0 .../design-compute/design-compute-cpu.rst | 0 .../design-compute-hardware.rst | 0 .../design-compute-hypervisor.rst | 0 .../design-compute/design-compute-logging.rst | 2 +- .../design-compute-networking.rst | 0 .../design-compute-overcommit.rst | 0 .../design-compute/design-compute-storage.rst | 0 .../source/design-control-plane.rst | 0 .../source/design-identity.rst | 0 .../source/design-images.rst | 0 .../source/design-networking.rst | 0 .../design-networking-concepts.rst | 0 .../design-networking-design.rst | 0 .../design-networking-layer2.rst | 0 .../design-networking-layer3.rst | 0 .../design-networking-services.rst | 0 .../source/design-storage.rst | 0 .../design-storage/design-storage-block.rst | 0 .../design-storage-commodity.rst | 0 .../design-storage-concepts.rst | 0 .../design-storage/design-storage-file.rst | 0 .../design-storage/design-storage-object.rst | 0 .../design-storage-planning-scaling.rst | 0 .../source/design.rst | 0 .../source/figures/Check_mark_23x20_02.png | Bin .../source/figures/ELKbasicArch.png | Bin 0 -> 9302 bytes .../source/figures/ELKbasicArch.svg | 0 .../source/figures/osog_0201.png | Bin .../source/high-availability.rst | 0 doc/arch-design/source/index.rst | 29 +++++---- .../source/overview-customer-requirements.rst | 0 .../source/overview-legal-requirements.rst | 0 .../source/overview-operator-requirements.rst | 0 .../source/overview-planning.rst | 0 .../source/overview-security-requirements.rst | 0 .../source/overview-software-licensing.rst | 0 .../source/overview.rst | 0 .../source/use-cases.rst | 0 .../source/use-cases/use-case-development.rst | 0 .../use-cases/use-case-general-compute.rst | 0 .../source/use-cases/use-case-nfv.rst | 0 .../source/use-cases/use-case-storage.rst | 0 .../source/use-cases/use-case-web-scale.rst | 0 tools/build-all-rst.sh | 2 +- tools/publishdocs.sh | 2 +- www/draft/draft-index.html | 1 - 134 files changed, 81 insertions(+), 83 deletions(-) delete mode 100644 doc/arch-design-draft/source/index.rst rename doc/{arch-design-draft => arch-design-to-archive}/setup.cfg (100%) rename doc/{arch-design-draft => arch-design-to-archive}/setup.py (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/common (100%) rename doc/{arch-design => arch-design-to-archive}/source/compute-focus-architecture.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/compute-focus-operational-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/compute-focus-prescriptive-examples.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/compute-focus-technical-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/compute-focus.rst (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/conf.py (98%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Compute_NSX.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Compute_Tech_Bin_Packing_CPU_optimized1.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Compute_Tech_Bin_Packing_General1.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/General_Architecture3.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Generic_CERN_Architecture.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Generic_CERN_Example.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Massively_Scalable_Cells_regions_azs.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Multi-Cloud_Priv-AWS4.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Multi-Cloud_Priv-Pub3.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Multi-Cloud_failover2.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Multi-Site_Customer_Edge.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Multi-Site_shared_keystone1.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Multi-Site_shared_keystone_horizon_swift1.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Multi-site_Geo_Redundant_LB.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Network_Cloud_Storage2.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Network_Web_Services1.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Specialized_Hardware2.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Specialized_OOO.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Specialized_SDN_external.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Specialized_SDN_hosted.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Specialized_VDI1.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Storage_Database_+_Object5.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Storage_Hadoop3.png (100%) rename doc/{arch-design-draft => arch-design-to-archive}/source/figures/Storage_Object.png (100%) rename doc/{arch-design => arch-design-to-archive}/source/generalpurpose-architecture.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/generalpurpose-operational-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/generalpurpose-prescriptive-example.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/generalpurpose-technical-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/generalpurpose-user-requirements.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/generalpurpose.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/hybrid-architecture.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/hybrid-operational-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/hybrid-prescriptive-examples.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/hybrid-technical-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/hybrid-user-requirements.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/hybrid.rst (100%) create mode 100644 doc/arch-design-to-archive/source/index.rst rename doc/{arch-design => arch-design-to-archive}/source/introduction-how-this-book-is-organized.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/introduction-how-this-book-was-written.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/introduction-intended-audience.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/introduction-methodology.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/introduction.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/legal-security-requirements.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/massively-scalable-operational-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/massively-scalable-technical-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/massively-scalable-user-requirements.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/massively-scalable.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/multi-site-architecture.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/multi-site-operational-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/multi-site-prescriptive-examples.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/multi-site-technical-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/multi-site-user-requirements.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/multi-site.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/network-focus-architecture.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/network-focus-operational-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/network-focus-prescriptive-examples.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/network-focus-technical-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/network-focus-user-requirements.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/network-focus.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/references.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/specialized-desktop-as-a-service.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/specialized-hardware.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/specialized-multi-hypervisor.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/specialized-networking.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/specialized-openstack-on-openstack.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/specialized-software-defined-networking.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/specialized.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/storage-focus-architecture.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/storage-focus-operational-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/storage-focus-prescriptive-examples.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/storage-focus-technical-considerations.rst (100%) rename doc/{arch-design => arch-design-to-archive}/source/storage-focus.rst (100%) rename doc/{arch-design-draft => arch-design}/source/capacity-planning-scaling.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-cmp-tools.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-compute.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-compute/design-compute-concepts.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-compute/design-compute-cpu.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-compute/design-compute-hardware.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-compute/design-compute-hypervisor.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-compute/design-compute-logging.rst (99%) rename doc/{arch-design-draft => arch-design}/source/design-compute/design-compute-networking.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-compute/design-compute-overcommit.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-compute/design-compute-storage.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-control-plane.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-identity.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-images.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-networking.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-networking/design-networking-concepts.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-networking/design-networking-design.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-networking/design-networking-layer2.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-networking/design-networking-layer3.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-networking/design-networking-services.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-storage.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-storage/design-storage-block.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-storage/design-storage-commodity.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-storage/design-storage-concepts.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-storage/design-storage-file.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-storage/design-storage-object.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design-storage/design-storage-planning-scaling.rst (100%) rename doc/{arch-design-draft => arch-design}/source/design.rst (100%) rename doc/{arch-design-draft => arch-design}/source/figures/Check_mark_23x20_02.png (100%) create mode 100644 doc/arch-design/source/figures/ELKbasicArch.png rename doc/{arch-design-draft => arch-design}/source/figures/ELKbasicArch.svg (100%) rename doc/{arch-design-draft => arch-design}/source/figures/osog_0201.png (100%) rename doc/{arch-design-draft => arch-design}/source/high-availability.rst (100%) rename doc/{arch-design-draft => arch-design}/source/overview-customer-requirements.rst (100%) rename doc/{arch-design-draft => arch-design}/source/overview-legal-requirements.rst (100%) rename doc/{arch-design-draft => arch-design}/source/overview-operator-requirements.rst (100%) rename doc/{arch-design-draft => arch-design}/source/overview-planning.rst (100%) rename doc/{arch-design-draft => arch-design}/source/overview-security-requirements.rst (100%) rename doc/{arch-design-draft => arch-design}/source/overview-software-licensing.rst (100%) rename doc/{arch-design-draft => arch-design}/source/overview.rst (100%) rename doc/{arch-design-draft => arch-design}/source/use-cases.rst (100%) rename doc/{arch-design-draft => arch-design}/source/use-cases/use-case-development.rst (100%) rename doc/{arch-design-draft => arch-design}/source/use-cases/use-case-general-compute.rst (100%) rename doc/{arch-design-draft => arch-design}/source/use-cases/use-case-nfv.rst (100%) rename doc/{arch-design-draft => arch-design}/source/use-cases/use-case-storage.rst (100%) rename doc/{arch-design-draft => arch-design}/source/use-cases/use-case-web-scale.rst (100%) diff --git a/doc-tools-check-languages.conf b/doc-tools-check-languages.conf index abd119ca94..9a25534d4e 100644 --- a/doc-tools-check-languages.conf +++ b/doc-tools-check-languages.conf @@ -55,6 +55,6 @@ declare -A SPECIAL_BOOKS=( ["config-reference"]="skip" ["contributor-guide"]="skip" ["releasenotes"]="skip" - # Skip arch design while its being revised - ["arch-design-draft"]="skip" + # Skip old arch design, will be archived + ["arch-design-to-archive"]="skip" ) diff --git a/doc/arch-design-draft/source/index.rst b/doc/arch-design-draft/source/index.rst deleted file mode 100644 index c4701aa6b0..0000000000 --- a/doc/arch-design-draft/source/index.rst +++ /dev/null @@ -1,56 +0,0 @@ -.. meta:: - :description: This guide targets OpenStack Architects - for architectural design - :keywords: Architecture, OpenStack - -=========================================== -OpenStack Architecture Design Guide - Draft -=========================================== - -.. note:: - - Architecture Design Guide is under development at the moment. - Contributions are welcome. - -Abstract -~~~~~~~~ - -This guide provides information on planning and designing an OpenStack -cloud. It describes common use cases, high availability, and considerations -when changing capacity and scaling your cloud environment. A breakdown of the -major OpenStack components is also described in relation to cloud architecture -design. - -Contents -~~~~~~~~ - -.. toctree:: - :maxdepth: 2 - - common/conventions.rst - overview.rst - use-cases.rst - high-availability.rst - capacity-planning-scaling.rst - design.rst - -Appendix -~~~~~~~~ - -.. toctree:: - :maxdepth: 1 - - common/app-support.rst - -Glossary -~~~~~~~~ - -.. toctree:: - :maxdepth: 1 - - common/glossary.rst - -Search in this guide -~~~~~~~~~~~~~~~~~~~~ - -* :ref:`search` diff --git a/doc/arch-design-draft/setup.cfg b/doc/arch-design-to-archive/setup.cfg similarity index 100% rename from doc/arch-design-draft/setup.cfg rename to doc/arch-design-to-archive/setup.cfg diff --git a/doc/arch-design-draft/setup.py b/doc/arch-design-to-archive/setup.py similarity index 100% rename from doc/arch-design-draft/setup.py rename to doc/arch-design-to-archive/setup.py diff --git a/doc/arch-design-draft/source/common b/doc/arch-design-to-archive/source/common similarity index 100% rename from doc/arch-design-draft/source/common rename to doc/arch-design-to-archive/source/common diff --git a/doc/arch-design/source/compute-focus-architecture.rst b/doc/arch-design-to-archive/source/compute-focus-architecture.rst similarity index 100% rename from doc/arch-design/source/compute-focus-architecture.rst rename to doc/arch-design-to-archive/source/compute-focus-architecture.rst diff --git a/doc/arch-design/source/compute-focus-operational-considerations.rst b/doc/arch-design-to-archive/source/compute-focus-operational-considerations.rst similarity index 100% rename from doc/arch-design/source/compute-focus-operational-considerations.rst rename to doc/arch-design-to-archive/source/compute-focus-operational-considerations.rst diff --git a/doc/arch-design/source/compute-focus-prescriptive-examples.rst b/doc/arch-design-to-archive/source/compute-focus-prescriptive-examples.rst similarity index 100% rename from doc/arch-design/source/compute-focus-prescriptive-examples.rst rename to doc/arch-design-to-archive/source/compute-focus-prescriptive-examples.rst diff --git a/doc/arch-design/source/compute-focus-technical-considerations.rst b/doc/arch-design-to-archive/source/compute-focus-technical-considerations.rst similarity index 100% rename from doc/arch-design/source/compute-focus-technical-considerations.rst rename to doc/arch-design-to-archive/source/compute-focus-technical-considerations.rst diff --git a/doc/arch-design/source/compute-focus.rst b/doc/arch-design-to-archive/source/compute-focus.rst similarity index 100% rename from doc/arch-design/source/compute-focus.rst rename to doc/arch-design-to-archive/source/compute-focus.rst diff --git a/doc/arch-design-draft/source/conf.py b/doc/arch-design-to-archive/source/conf.py similarity index 98% rename from doc/arch-design-draft/source/conf.py rename to doc/arch-design-to-archive/source/conf.py index e2393c066f..5ccc3bf232 100644 --- a/doc/arch-design-draft/source/conf.py +++ b/doc/arch-design-to-archive/source/conf.py @@ -54,7 +54,7 @@ master_doc = 'index' # General information about the project. project = u'Architecture Design Guide' -bug_tag = u'arch-design-draft' +bug_tag = u'arch-design-to-archive' copyright = u'2015-2016, OpenStack contributors' # The version info for the project you're documenting, acts as replacement for @@ -71,7 +71,7 @@ release = '0.9' # gitsha: The SHA checksum of the bug description. Automatically extracted from git log. # bug_tag: Tag for categorizing the bug. Must be set manually. # These variables are passed to the logabug code via html_context. -giturl = u'https://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/arch-design-draft/source' +giturl = u'https://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/arch-design-rst/source' git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" gitsha = os.popen(git_cmd).read().strip('\n') html_context = {"gitsha": gitsha, "bug_tag": bug_tag, @@ -201,7 +201,7 @@ html_show_sourcelink = False # html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'arch-design-draft' +htmlhelp_basename = 'arch-design-to-archive' # If true, publish source files html_copy_source = False diff --git a/doc/arch-design-draft/source/figures/Compute_NSX.png b/doc/arch-design-to-archive/source/figures/Compute_NSX.png similarity index 100% rename from doc/arch-design-draft/source/figures/Compute_NSX.png rename to doc/arch-design-to-archive/source/figures/Compute_NSX.png diff --git a/doc/arch-design-draft/source/figures/Compute_Tech_Bin_Packing_CPU_optimized1.png b/doc/arch-design-to-archive/source/figures/Compute_Tech_Bin_Packing_CPU_optimized1.png similarity index 100% rename from doc/arch-design-draft/source/figures/Compute_Tech_Bin_Packing_CPU_optimized1.png rename to doc/arch-design-to-archive/source/figures/Compute_Tech_Bin_Packing_CPU_optimized1.png diff --git a/doc/arch-design-draft/source/figures/Compute_Tech_Bin_Packing_General1.png b/doc/arch-design-to-archive/source/figures/Compute_Tech_Bin_Packing_General1.png similarity index 100% rename from doc/arch-design-draft/source/figures/Compute_Tech_Bin_Packing_General1.png rename to doc/arch-design-to-archive/source/figures/Compute_Tech_Bin_Packing_General1.png diff --git a/doc/arch-design-draft/source/figures/General_Architecture3.png b/doc/arch-design-to-archive/source/figures/General_Architecture3.png similarity index 100% rename from doc/arch-design-draft/source/figures/General_Architecture3.png rename to doc/arch-design-to-archive/source/figures/General_Architecture3.png diff --git a/doc/arch-design-draft/source/figures/Generic_CERN_Architecture.png b/doc/arch-design-to-archive/source/figures/Generic_CERN_Architecture.png similarity index 100% rename from doc/arch-design-draft/source/figures/Generic_CERN_Architecture.png rename to doc/arch-design-to-archive/source/figures/Generic_CERN_Architecture.png diff --git a/doc/arch-design-draft/source/figures/Generic_CERN_Example.png b/doc/arch-design-to-archive/source/figures/Generic_CERN_Example.png similarity index 100% rename from doc/arch-design-draft/source/figures/Generic_CERN_Example.png rename to doc/arch-design-to-archive/source/figures/Generic_CERN_Example.png diff --git a/doc/arch-design-draft/source/figures/Massively_Scalable_Cells_regions_azs.png b/doc/arch-design-to-archive/source/figures/Massively_Scalable_Cells_regions_azs.png similarity index 100% rename from doc/arch-design-draft/source/figures/Massively_Scalable_Cells_regions_azs.png rename to doc/arch-design-to-archive/source/figures/Massively_Scalable_Cells_regions_azs.png diff --git a/doc/arch-design-draft/source/figures/Multi-Cloud_Priv-AWS4.png b/doc/arch-design-to-archive/source/figures/Multi-Cloud_Priv-AWS4.png similarity index 100% rename from doc/arch-design-draft/source/figures/Multi-Cloud_Priv-AWS4.png rename to doc/arch-design-to-archive/source/figures/Multi-Cloud_Priv-AWS4.png diff --git a/doc/arch-design-draft/source/figures/Multi-Cloud_Priv-Pub3.png b/doc/arch-design-to-archive/source/figures/Multi-Cloud_Priv-Pub3.png similarity index 100% rename from doc/arch-design-draft/source/figures/Multi-Cloud_Priv-Pub3.png rename to doc/arch-design-to-archive/source/figures/Multi-Cloud_Priv-Pub3.png diff --git a/doc/arch-design-draft/source/figures/Multi-Cloud_failover2.png b/doc/arch-design-to-archive/source/figures/Multi-Cloud_failover2.png similarity index 100% rename from doc/arch-design-draft/source/figures/Multi-Cloud_failover2.png rename to doc/arch-design-to-archive/source/figures/Multi-Cloud_failover2.png diff --git a/doc/arch-design-draft/source/figures/Multi-Site_Customer_Edge.png b/doc/arch-design-to-archive/source/figures/Multi-Site_Customer_Edge.png similarity index 100% rename from doc/arch-design-draft/source/figures/Multi-Site_Customer_Edge.png rename to doc/arch-design-to-archive/source/figures/Multi-Site_Customer_Edge.png diff --git a/doc/arch-design-draft/source/figures/Multi-Site_shared_keystone1.png b/doc/arch-design-to-archive/source/figures/Multi-Site_shared_keystone1.png similarity index 100% rename from doc/arch-design-draft/source/figures/Multi-Site_shared_keystone1.png rename to doc/arch-design-to-archive/source/figures/Multi-Site_shared_keystone1.png diff --git a/doc/arch-design-draft/source/figures/Multi-Site_shared_keystone_horizon_swift1.png b/doc/arch-design-to-archive/source/figures/Multi-Site_shared_keystone_horizon_swift1.png similarity index 100% rename from doc/arch-design-draft/source/figures/Multi-Site_shared_keystone_horizon_swift1.png rename to doc/arch-design-to-archive/source/figures/Multi-Site_shared_keystone_horizon_swift1.png diff --git a/doc/arch-design-draft/source/figures/Multi-site_Geo_Redundant_LB.png b/doc/arch-design-to-archive/source/figures/Multi-site_Geo_Redundant_LB.png similarity index 100% rename from doc/arch-design-draft/source/figures/Multi-site_Geo_Redundant_LB.png rename to doc/arch-design-to-archive/source/figures/Multi-site_Geo_Redundant_LB.png diff --git a/doc/arch-design-draft/source/figures/Network_Cloud_Storage2.png b/doc/arch-design-to-archive/source/figures/Network_Cloud_Storage2.png similarity index 100% rename from doc/arch-design-draft/source/figures/Network_Cloud_Storage2.png rename to doc/arch-design-to-archive/source/figures/Network_Cloud_Storage2.png diff --git a/doc/arch-design-draft/source/figures/Network_Web_Services1.png b/doc/arch-design-to-archive/source/figures/Network_Web_Services1.png similarity index 100% rename from doc/arch-design-draft/source/figures/Network_Web_Services1.png rename to doc/arch-design-to-archive/source/figures/Network_Web_Services1.png diff --git a/doc/arch-design-draft/source/figures/Specialized_Hardware2.png b/doc/arch-design-to-archive/source/figures/Specialized_Hardware2.png similarity index 100% rename from doc/arch-design-draft/source/figures/Specialized_Hardware2.png rename to doc/arch-design-to-archive/source/figures/Specialized_Hardware2.png diff --git a/doc/arch-design-draft/source/figures/Specialized_OOO.png b/doc/arch-design-to-archive/source/figures/Specialized_OOO.png similarity index 100% rename from doc/arch-design-draft/source/figures/Specialized_OOO.png rename to doc/arch-design-to-archive/source/figures/Specialized_OOO.png diff --git a/doc/arch-design-draft/source/figures/Specialized_SDN_external.png b/doc/arch-design-to-archive/source/figures/Specialized_SDN_external.png similarity index 100% rename from doc/arch-design-draft/source/figures/Specialized_SDN_external.png rename to doc/arch-design-to-archive/source/figures/Specialized_SDN_external.png diff --git a/doc/arch-design-draft/source/figures/Specialized_SDN_hosted.png b/doc/arch-design-to-archive/source/figures/Specialized_SDN_hosted.png similarity index 100% rename from doc/arch-design-draft/source/figures/Specialized_SDN_hosted.png rename to doc/arch-design-to-archive/source/figures/Specialized_SDN_hosted.png diff --git a/doc/arch-design-draft/source/figures/Specialized_VDI1.png b/doc/arch-design-to-archive/source/figures/Specialized_VDI1.png similarity index 100% rename from doc/arch-design-draft/source/figures/Specialized_VDI1.png rename to doc/arch-design-to-archive/source/figures/Specialized_VDI1.png diff --git a/doc/arch-design-draft/source/figures/Storage_Database_+_Object5.png b/doc/arch-design-to-archive/source/figures/Storage_Database_+_Object5.png similarity index 100% rename from doc/arch-design-draft/source/figures/Storage_Database_+_Object5.png rename to doc/arch-design-to-archive/source/figures/Storage_Database_+_Object5.png diff --git a/doc/arch-design-draft/source/figures/Storage_Hadoop3.png b/doc/arch-design-to-archive/source/figures/Storage_Hadoop3.png similarity index 100% rename from doc/arch-design-draft/source/figures/Storage_Hadoop3.png rename to doc/arch-design-to-archive/source/figures/Storage_Hadoop3.png diff --git a/doc/arch-design-draft/source/figures/Storage_Object.png b/doc/arch-design-to-archive/source/figures/Storage_Object.png similarity index 100% rename from doc/arch-design-draft/source/figures/Storage_Object.png rename to doc/arch-design-to-archive/source/figures/Storage_Object.png diff --git a/doc/arch-design/source/generalpurpose-architecture.rst b/doc/arch-design-to-archive/source/generalpurpose-architecture.rst similarity index 100% rename from doc/arch-design/source/generalpurpose-architecture.rst rename to doc/arch-design-to-archive/source/generalpurpose-architecture.rst diff --git a/doc/arch-design/source/generalpurpose-operational-considerations.rst b/doc/arch-design-to-archive/source/generalpurpose-operational-considerations.rst similarity index 100% rename from doc/arch-design/source/generalpurpose-operational-considerations.rst rename to doc/arch-design-to-archive/source/generalpurpose-operational-considerations.rst diff --git a/doc/arch-design/source/generalpurpose-prescriptive-example.rst b/doc/arch-design-to-archive/source/generalpurpose-prescriptive-example.rst similarity index 100% rename from doc/arch-design/source/generalpurpose-prescriptive-example.rst rename to doc/arch-design-to-archive/source/generalpurpose-prescriptive-example.rst diff --git a/doc/arch-design/source/generalpurpose-technical-considerations.rst b/doc/arch-design-to-archive/source/generalpurpose-technical-considerations.rst similarity index 100% rename from doc/arch-design/source/generalpurpose-technical-considerations.rst rename to doc/arch-design-to-archive/source/generalpurpose-technical-considerations.rst diff --git a/doc/arch-design/source/generalpurpose-user-requirements.rst b/doc/arch-design-to-archive/source/generalpurpose-user-requirements.rst similarity index 100% rename from doc/arch-design/source/generalpurpose-user-requirements.rst rename to doc/arch-design-to-archive/source/generalpurpose-user-requirements.rst diff --git a/doc/arch-design/source/generalpurpose.rst b/doc/arch-design-to-archive/source/generalpurpose.rst similarity index 100% rename from doc/arch-design/source/generalpurpose.rst rename to doc/arch-design-to-archive/source/generalpurpose.rst diff --git a/doc/arch-design/source/hybrid-architecture.rst b/doc/arch-design-to-archive/source/hybrid-architecture.rst similarity index 100% rename from doc/arch-design/source/hybrid-architecture.rst rename to doc/arch-design-to-archive/source/hybrid-architecture.rst diff --git a/doc/arch-design/source/hybrid-operational-considerations.rst b/doc/arch-design-to-archive/source/hybrid-operational-considerations.rst similarity index 100% rename from doc/arch-design/source/hybrid-operational-considerations.rst rename to doc/arch-design-to-archive/source/hybrid-operational-considerations.rst diff --git a/doc/arch-design/source/hybrid-prescriptive-examples.rst b/doc/arch-design-to-archive/source/hybrid-prescriptive-examples.rst similarity index 100% rename from doc/arch-design/source/hybrid-prescriptive-examples.rst rename to doc/arch-design-to-archive/source/hybrid-prescriptive-examples.rst diff --git a/doc/arch-design/source/hybrid-technical-considerations.rst b/doc/arch-design-to-archive/source/hybrid-technical-considerations.rst similarity index 100% rename from doc/arch-design/source/hybrid-technical-considerations.rst rename to doc/arch-design-to-archive/source/hybrid-technical-considerations.rst diff --git a/doc/arch-design/source/hybrid-user-requirements.rst b/doc/arch-design-to-archive/source/hybrid-user-requirements.rst similarity index 100% rename from doc/arch-design/source/hybrid-user-requirements.rst rename to doc/arch-design-to-archive/source/hybrid-user-requirements.rst diff --git a/doc/arch-design/source/hybrid.rst b/doc/arch-design-to-archive/source/hybrid.rst similarity index 100% rename from doc/arch-design/source/hybrid.rst rename to doc/arch-design-to-archive/source/hybrid.rst diff --git a/doc/arch-design-to-archive/source/index.rst b/doc/arch-design-to-archive/source/index.rst new file mode 100644 index 0000000000..c1dcb622bd --- /dev/null +++ b/doc/arch-design-to-archive/source/index.rst @@ -0,0 +1,56 @@ +.. meta:: + :description: This guide targets OpenStack Architects + for architectural design + :keywords: Architecture, OpenStack + +=================================== +OpenStack Architecture Design Guide +=================================== + +Abstract +~~~~~~~~ + +To reap the benefits of OpenStack, you should plan, design, +and architect your cloud properly, taking user's needs into +account and understanding the use cases. + +Contents +~~~~~~~~ + +.. toctree:: + :maxdepth: 2 + + common/conventions.rst + introduction.rst + legal-security-requirements.rst + generalpurpose.rst + compute-focus.rst + storage-focus.rst + network-focus.rst + multi-site.rst + hybrid.rst + massively-scalable.rst + specialized.rst + references.rst + +Appendix +~~~~~~~~ + +.. toctree:: + :maxdepth: 1 + + common/app-support.rst + +Glossary +~~~~~~~~ + +.. toctree:: + :maxdepth: 1 + + common/glossary.rst + +Search in this guide +~~~~~~~~~~~~~~~~~~~~ + +* :ref:`search` + diff --git a/doc/arch-design/source/introduction-how-this-book-is-organized.rst b/doc/arch-design-to-archive/source/introduction-how-this-book-is-organized.rst similarity index 100% rename from doc/arch-design/source/introduction-how-this-book-is-organized.rst rename to doc/arch-design-to-archive/source/introduction-how-this-book-is-organized.rst diff --git a/doc/arch-design/source/introduction-how-this-book-was-written.rst b/doc/arch-design-to-archive/source/introduction-how-this-book-was-written.rst similarity index 100% rename from doc/arch-design/source/introduction-how-this-book-was-written.rst rename to doc/arch-design-to-archive/source/introduction-how-this-book-was-written.rst diff --git a/doc/arch-design/source/introduction-intended-audience.rst b/doc/arch-design-to-archive/source/introduction-intended-audience.rst similarity index 100% rename from doc/arch-design/source/introduction-intended-audience.rst rename to doc/arch-design-to-archive/source/introduction-intended-audience.rst diff --git a/doc/arch-design/source/introduction-methodology.rst b/doc/arch-design-to-archive/source/introduction-methodology.rst similarity index 100% rename from doc/arch-design/source/introduction-methodology.rst rename to doc/arch-design-to-archive/source/introduction-methodology.rst diff --git a/doc/arch-design/source/introduction.rst b/doc/arch-design-to-archive/source/introduction.rst similarity index 100% rename from doc/arch-design/source/introduction.rst rename to doc/arch-design-to-archive/source/introduction.rst diff --git a/doc/arch-design/source/legal-security-requirements.rst b/doc/arch-design-to-archive/source/legal-security-requirements.rst similarity index 100% rename from doc/arch-design/source/legal-security-requirements.rst rename to doc/arch-design-to-archive/source/legal-security-requirements.rst diff --git a/doc/arch-design/source/massively-scalable-operational-considerations.rst b/doc/arch-design-to-archive/source/massively-scalable-operational-considerations.rst similarity index 100% rename from doc/arch-design/source/massively-scalable-operational-considerations.rst rename to doc/arch-design-to-archive/source/massively-scalable-operational-considerations.rst diff --git a/doc/arch-design/source/massively-scalable-technical-considerations.rst b/doc/arch-design-to-archive/source/massively-scalable-technical-considerations.rst similarity index 100% rename from doc/arch-design/source/massively-scalable-technical-considerations.rst rename to doc/arch-design-to-archive/source/massively-scalable-technical-considerations.rst diff --git a/doc/arch-design/source/massively-scalable-user-requirements.rst b/doc/arch-design-to-archive/source/massively-scalable-user-requirements.rst similarity index 100% rename from doc/arch-design/source/massively-scalable-user-requirements.rst rename to doc/arch-design-to-archive/source/massively-scalable-user-requirements.rst diff --git a/doc/arch-design/source/massively-scalable.rst b/doc/arch-design-to-archive/source/massively-scalable.rst similarity index 100% rename from doc/arch-design/source/massively-scalable.rst rename to doc/arch-design-to-archive/source/massively-scalable.rst diff --git a/doc/arch-design/source/multi-site-architecture.rst b/doc/arch-design-to-archive/source/multi-site-architecture.rst similarity index 100% rename from doc/arch-design/source/multi-site-architecture.rst rename to doc/arch-design-to-archive/source/multi-site-architecture.rst diff --git a/doc/arch-design/source/multi-site-operational-considerations.rst b/doc/arch-design-to-archive/source/multi-site-operational-considerations.rst similarity index 100% rename from doc/arch-design/source/multi-site-operational-considerations.rst rename to doc/arch-design-to-archive/source/multi-site-operational-considerations.rst diff --git a/doc/arch-design/source/multi-site-prescriptive-examples.rst b/doc/arch-design-to-archive/source/multi-site-prescriptive-examples.rst similarity index 100% rename from doc/arch-design/source/multi-site-prescriptive-examples.rst rename to doc/arch-design-to-archive/source/multi-site-prescriptive-examples.rst diff --git a/doc/arch-design/source/multi-site-technical-considerations.rst b/doc/arch-design-to-archive/source/multi-site-technical-considerations.rst similarity index 100% rename from doc/arch-design/source/multi-site-technical-considerations.rst rename to doc/arch-design-to-archive/source/multi-site-technical-considerations.rst diff --git a/doc/arch-design/source/multi-site-user-requirements.rst b/doc/arch-design-to-archive/source/multi-site-user-requirements.rst similarity index 100% rename from doc/arch-design/source/multi-site-user-requirements.rst rename to doc/arch-design-to-archive/source/multi-site-user-requirements.rst diff --git a/doc/arch-design/source/multi-site.rst b/doc/arch-design-to-archive/source/multi-site.rst similarity index 100% rename from doc/arch-design/source/multi-site.rst rename to doc/arch-design-to-archive/source/multi-site.rst diff --git a/doc/arch-design/source/network-focus-architecture.rst b/doc/arch-design-to-archive/source/network-focus-architecture.rst similarity index 100% rename from doc/arch-design/source/network-focus-architecture.rst rename to doc/arch-design-to-archive/source/network-focus-architecture.rst diff --git a/doc/arch-design/source/network-focus-operational-considerations.rst b/doc/arch-design-to-archive/source/network-focus-operational-considerations.rst similarity index 100% rename from doc/arch-design/source/network-focus-operational-considerations.rst rename to doc/arch-design-to-archive/source/network-focus-operational-considerations.rst diff --git a/doc/arch-design/source/network-focus-prescriptive-examples.rst b/doc/arch-design-to-archive/source/network-focus-prescriptive-examples.rst similarity index 100% rename from doc/arch-design/source/network-focus-prescriptive-examples.rst rename to doc/arch-design-to-archive/source/network-focus-prescriptive-examples.rst diff --git a/doc/arch-design/source/network-focus-technical-considerations.rst b/doc/arch-design-to-archive/source/network-focus-technical-considerations.rst similarity index 100% rename from doc/arch-design/source/network-focus-technical-considerations.rst rename to doc/arch-design-to-archive/source/network-focus-technical-considerations.rst diff --git a/doc/arch-design/source/network-focus-user-requirements.rst b/doc/arch-design-to-archive/source/network-focus-user-requirements.rst similarity index 100% rename from doc/arch-design/source/network-focus-user-requirements.rst rename to doc/arch-design-to-archive/source/network-focus-user-requirements.rst diff --git a/doc/arch-design/source/network-focus.rst b/doc/arch-design-to-archive/source/network-focus.rst similarity index 100% rename from doc/arch-design/source/network-focus.rst rename to doc/arch-design-to-archive/source/network-focus.rst diff --git a/doc/arch-design/source/references.rst b/doc/arch-design-to-archive/source/references.rst similarity index 100% rename from doc/arch-design/source/references.rst rename to doc/arch-design-to-archive/source/references.rst diff --git a/doc/arch-design/source/specialized-desktop-as-a-service.rst b/doc/arch-design-to-archive/source/specialized-desktop-as-a-service.rst similarity index 100% rename from doc/arch-design/source/specialized-desktop-as-a-service.rst rename to doc/arch-design-to-archive/source/specialized-desktop-as-a-service.rst diff --git a/doc/arch-design/source/specialized-hardware.rst b/doc/arch-design-to-archive/source/specialized-hardware.rst similarity index 100% rename from doc/arch-design/source/specialized-hardware.rst rename to doc/arch-design-to-archive/source/specialized-hardware.rst diff --git a/doc/arch-design/source/specialized-multi-hypervisor.rst b/doc/arch-design-to-archive/source/specialized-multi-hypervisor.rst similarity index 100% rename from doc/arch-design/source/specialized-multi-hypervisor.rst rename to doc/arch-design-to-archive/source/specialized-multi-hypervisor.rst diff --git a/doc/arch-design/source/specialized-networking.rst b/doc/arch-design-to-archive/source/specialized-networking.rst similarity index 100% rename from doc/arch-design/source/specialized-networking.rst rename to doc/arch-design-to-archive/source/specialized-networking.rst diff --git a/doc/arch-design/source/specialized-openstack-on-openstack.rst b/doc/arch-design-to-archive/source/specialized-openstack-on-openstack.rst similarity index 100% rename from doc/arch-design/source/specialized-openstack-on-openstack.rst rename to doc/arch-design-to-archive/source/specialized-openstack-on-openstack.rst diff --git a/doc/arch-design/source/specialized-software-defined-networking.rst b/doc/arch-design-to-archive/source/specialized-software-defined-networking.rst similarity index 100% rename from doc/arch-design/source/specialized-software-defined-networking.rst rename to doc/arch-design-to-archive/source/specialized-software-defined-networking.rst diff --git a/doc/arch-design/source/specialized.rst b/doc/arch-design-to-archive/source/specialized.rst similarity index 100% rename from doc/arch-design/source/specialized.rst rename to doc/arch-design-to-archive/source/specialized.rst diff --git a/doc/arch-design/source/storage-focus-architecture.rst b/doc/arch-design-to-archive/source/storage-focus-architecture.rst similarity index 100% rename from doc/arch-design/source/storage-focus-architecture.rst rename to doc/arch-design-to-archive/source/storage-focus-architecture.rst diff --git a/doc/arch-design/source/storage-focus-operational-considerations.rst b/doc/arch-design-to-archive/source/storage-focus-operational-considerations.rst similarity index 100% rename from doc/arch-design/source/storage-focus-operational-considerations.rst rename to doc/arch-design-to-archive/source/storage-focus-operational-considerations.rst diff --git a/doc/arch-design/source/storage-focus-prescriptive-examples.rst b/doc/arch-design-to-archive/source/storage-focus-prescriptive-examples.rst similarity index 100% rename from doc/arch-design/source/storage-focus-prescriptive-examples.rst rename to doc/arch-design-to-archive/source/storage-focus-prescriptive-examples.rst diff --git a/doc/arch-design/source/storage-focus-technical-considerations.rst b/doc/arch-design-to-archive/source/storage-focus-technical-considerations.rst similarity index 100% rename from doc/arch-design/source/storage-focus-technical-considerations.rst rename to doc/arch-design-to-archive/source/storage-focus-technical-considerations.rst diff --git a/doc/arch-design/source/storage-focus.rst b/doc/arch-design-to-archive/source/storage-focus.rst similarity index 100% rename from doc/arch-design/source/storage-focus.rst rename to doc/arch-design-to-archive/source/storage-focus.rst diff --git a/doc/arch-design-draft/source/capacity-planning-scaling.rst b/doc/arch-design/source/capacity-planning-scaling.rst similarity index 100% rename from doc/arch-design-draft/source/capacity-planning-scaling.rst rename to doc/arch-design/source/capacity-planning-scaling.rst diff --git a/doc/arch-design/source/conf.py b/doc/arch-design/source/conf.py index 256300a6d2..4a8a677cb2 100644 --- a/doc/arch-design/source/conf.py +++ b/doc/arch-design/source/conf.py @@ -55,7 +55,7 @@ master_doc = 'index' # General information about the project. project = u'Architecture Design Guide' bug_tag = u'arch-design' -copyright = u'2015-2016, OpenStack contributors' +copyright = u'2015-2017, OpenStack contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -71,7 +71,7 @@ release = '0.9' # gitsha: The SHA checksum of the bug description. Automatically extracted from git log. # bug_tag: Tag for categorizing the bug. Must be set manually. # These variables are passed to the logabug code via html_context. -giturl = u'https://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/arch-design-rst/source' +giturl = u'https://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/arch-design/source' git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" gitsha = os.popen(git_cmd).read().strip('\n') html_context = {"gitsha": gitsha, "bug_tag": bug_tag, @@ -201,7 +201,7 @@ html_show_sourcelink = False # html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'arch-design-rst' +htmlhelp_basename = 'arch-design' # If true, publish source files html_copy_source = False diff --git a/doc/arch-design-draft/source/design-cmp-tools.rst b/doc/arch-design/source/design-cmp-tools.rst similarity index 100% rename from doc/arch-design-draft/source/design-cmp-tools.rst rename to doc/arch-design/source/design-cmp-tools.rst diff --git a/doc/arch-design-draft/source/design-compute.rst b/doc/arch-design/source/design-compute.rst similarity index 100% rename from doc/arch-design-draft/source/design-compute.rst rename to doc/arch-design/source/design-compute.rst diff --git a/doc/arch-design-draft/source/design-compute/design-compute-concepts.rst b/doc/arch-design/source/design-compute/design-compute-concepts.rst similarity index 100% rename from doc/arch-design-draft/source/design-compute/design-compute-concepts.rst rename to doc/arch-design/source/design-compute/design-compute-concepts.rst diff --git a/doc/arch-design-draft/source/design-compute/design-compute-cpu.rst b/doc/arch-design/source/design-compute/design-compute-cpu.rst similarity index 100% rename from doc/arch-design-draft/source/design-compute/design-compute-cpu.rst rename to doc/arch-design/source/design-compute/design-compute-cpu.rst diff --git a/doc/arch-design-draft/source/design-compute/design-compute-hardware.rst b/doc/arch-design/source/design-compute/design-compute-hardware.rst similarity index 100% rename from doc/arch-design-draft/source/design-compute/design-compute-hardware.rst rename to doc/arch-design/source/design-compute/design-compute-hardware.rst diff --git a/doc/arch-design-draft/source/design-compute/design-compute-hypervisor.rst b/doc/arch-design/source/design-compute/design-compute-hypervisor.rst similarity index 100% rename from doc/arch-design-draft/source/design-compute/design-compute-hypervisor.rst rename to doc/arch-design/source/design-compute/design-compute-hypervisor.rst diff --git a/doc/arch-design-draft/source/design-compute/design-compute-logging.rst b/doc/arch-design/source/design-compute/design-compute-logging.rst similarity index 99% rename from doc/arch-design-draft/source/design-compute/design-compute-logging.rst rename to doc/arch-design/source/design-compute/design-compute-logging.rst index 635ea5fbb6..2c8e7d0f03 100644 --- a/doc/arch-design-draft/source/design-compute/design-compute-logging.rst +++ b/doc/arch-design/source/design-compute/design-compute-logging.rst @@ -24,7 +24,7 @@ Elastic Stack consists of mainly three components: Elasticsearch (log search and analysis), Logstash (log intake, processing and output) and Kibana (log dashboard service). -.. image:: ../figures/ELKbasicArch.svg +.. figure:: ../figures/ELKbasicArch.png :align: center :alt: Elastic Search Basic Architecture diff --git a/doc/arch-design-draft/source/design-compute/design-compute-networking.rst b/doc/arch-design/source/design-compute/design-compute-networking.rst similarity index 100% rename from doc/arch-design-draft/source/design-compute/design-compute-networking.rst rename to doc/arch-design/source/design-compute/design-compute-networking.rst diff --git a/doc/arch-design-draft/source/design-compute/design-compute-overcommit.rst b/doc/arch-design/source/design-compute/design-compute-overcommit.rst similarity index 100% rename from doc/arch-design-draft/source/design-compute/design-compute-overcommit.rst rename to doc/arch-design/source/design-compute/design-compute-overcommit.rst diff --git a/doc/arch-design-draft/source/design-compute/design-compute-storage.rst b/doc/arch-design/source/design-compute/design-compute-storage.rst similarity index 100% rename from doc/arch-design-draft/source/design-compute/design-compute-storage.rst rename to doc/arch-design/source/design-compute/design-compute-storage.rst diff --git a/doc/arch-design-draft/source/design-control-plane.rst b/doc/arch-design/source/design-control-plane.rst similarity index 100% rename from doc/arch-design-draft/source/design-control-plane.rst rename to doc/arch-design/source/design-control-plane.rst diff --git a/doc/arch-design-draft/source/design-identity.rst b/doc/arch-design/source/design-identity.rst similarity index 100% rename from doc/arch-design-draft/source/design-identity.rst rename to doc/arch-design/source/design-identity.rst diff --git a/doc/arch-design-draft/source/design-images.rst b/doc/arch-design/source/design-images.rst similarity index 100% rename from doc/arch-design-draft/source/design-images.rst rename to doc/arch-design/source/design-images.rst diff --git a/doc/arch-design-draft/source/design-networking.rst b/doc/arch-design/source/design-networking.rst similarity index 100% rename from doc/arch-design-draft/source/design-networking.rst rename to doc/arch-design/source/design-networking.rst diff --git a/doc/arch-design-draft/source/design-networking/design-networking-concepts.rst b/doc/arch-design/source/design-networking/design-networking-concepts.rst similarity index 100% rename from doc/arch-design-draft/source/design-networking/design-networking-concepts.rst rename to doc/arch-design/source/design-networking/design-networking-concepts.rst diff --git a/doc/arch-design-draft/source/design-networking/design-networking-design.rst b/doc/arch-design/source/design-networking/design-networking-design.rst similarity index 100% rename from doc/arch-design-draft/source/design-networking/design-networking-design.rst rename to doc/arch-design/source/design-networking/design-networking-design.rst diff --git a/doc/arch-design-draft/source/design-networking/design-networking-layer2.rst b/doc/arch-design/source/design-networking/design-networking-layer2.rst similarity index 100% rename from doc/arch-design-draft/source/design-networking/design-networking-layer2.rst rename to doc/arch-design/source/design-networking/design-networking-layer2.rst diff --git a/doc/arch-design-draft/source/design-networking/design-networking-layer3.rst b/doc/arch-design/source/design-networking/design-networking-layer3.rst similarity index 100% rename from doc/arch-design-draft/source/design-networking/design-networking-layer3.rst rename to doc/arch-design/source/design-networking/design-networking-layer3.rst diff --git a/doc/arch-design-draft/source/design-networking/design-networking-services.rst b/doc/arch-design/source/design-networking/design-networking-services.rst similarity index 100% rename from doc/arch-design-draft/source/design-networking/design-networking-services.rst rename to doc/arch-design/source/design-networking/design-networking-services.rst diff --git a/doc/arch-design-draft/source/design-storage.rst b/doc/arch-design/source/design-storage.rst similarity index 100% rename from doc/arch-design-draft/source/design-storage.rst rename to doc/arch-design/source/design-storage.rst diff --git a/doc/arch-design-draft/source/design-storage/design-storage-block.rst b/doc/arch-design/source/design-storage/design-storage-block.rst similarity index 100% rename from doc/arch-design-draft/source/design-storage/design-storage-block.rst rename to doc/arch-design/source/design-storage/design-storage-block.rst diff --git a/doc/arch-design-draft/source/design-storage/design-storage-commodity.rst b/doc/arch-design/source/design-storage/design-storage-commodity.rst similarity index 100% rename from doc/arch-design-draft/source/design-storage/design-storage-commodity.rst rename to doc/arch-design/source/design-storage/design-storage-commodity.rst diff --git a/doc/arch-design-draft/source/design-storage/design-storage-concepts.rst b/doc/arch-design/source/design-storage/design-storage-concepts.rst similarity index 100% rename from doc/arch-design-draft/source/design-storage/design-storage-concepts.rst rename to doc/arch-design/source/design-storage/design-storage-concepts.rst diff --git a/doc/arch-design-draft/source/design-storage/design-storage-file.rst b/doc/arch-design/source/design-storage/design-storage-file.rst similarity index 100% rename from doc/arch-design-draft/source/design-storage/design-storage-file.rst rename to doc/arch-design/source/design-storage/design-storage-file.rst diff --git a/doc/arch-design-draft/source/design-storage/design-storage-object.rst b/doc/arch-design/source/design-storage/design-storage-object.rst similarity index 100% rename from doc/arch-design-draft/source/design-storage/design-storage-object.rst rename to doc/arch-design/source/design-storage/design-storage-object.rst diff --git a/doc/arch-design-draft/source/design-storage/design-storage-planning-scaling.rst b/doc/arch-design/source/design-storage/design-storage-planning-scaling.rst similarity index 100% rename from doc/arch-design-draft/source/design-storage/design-storage-planning-scaling.rst rename to doc/arch-design/source/design-storage/design-storage-planning-scaling.rst diff --git a/doc/arch-design-draft/source/design.rst b/doc/arch-design/source/design.rst similarity index 100% rename from doc/arch-design-draft/source/design.rst rename to doc/arch-design/source/design.rst diff --git a/doc/arch-design-draft/source/figures/Check_mark_23x20_02.png b/doc/arch-design/source/figures/Check_mark_23x20_02.png similarity index 100% rename from doc/arch-design-draft/source/figures/Check_mark_23x20_02.png rename to doc/arch-design/source/figures/Check_mark_23x20_02.png diff --git a/doc/arch-design/source/figures/ELKbasicArch.png b/doc/arch-design/source/figures/ELKbasicArch.png new file mode 100644 index 0000000000000000000000000000000000000000..a6eb8f30a625ed1f6b770637d1b8e1acc4875feb GIT binary patch literal 9302 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 J5Q;DT{uiT<)KdTe literal 0 HcmV?d00001 diff --git a/doc/arch-design-draft/source/figures/ELKbasicArch.svg b/doc/arch-design/source/figures/ELKbasicArch.svg similarity index 100% rename from doc/arch-design-draft/source/figures/ELKbasicArch.svg rename to doc/arch-design/source/figures/ELKbasicArch.svg diff --git a/doc/arch-design-draft/source/figures/osog_0201.png b/doc/arch-design/source/figures/osog_0201.png similarity index 100% rename from doc/arch-design-draft/source/figures/osog_0201.png rename to doc/arch-design/source/figures/osog_0201.png diff --git a/doc/arch-design-draft/source/high-availability.rst b/doc/arch-design/source/high-availability.rst similarity index 100% rename from doc/arch-design-draft/source/high-availability.rst rename to doc/arch-design/source/high-availability.rst diff --git a/doc/arch-design/source/index.rst b/doc/arch-design/source/index.rst index c1dcb622bd..baba3c4c65 100644 --- a/doc/arch-design/source/index.rst +++ b/doc/arch-design/source/index.rst @@ -7,12 +7,18 @@ OpenStack Architecture Design Guide =================================== +.. note:: + + Parts of this guide is a work in progress. Contributions are welcome. + Abstract ~~~~~~~~ -To reap the benefits of OpenStack, you should plan, design, -and architect your cloud properly, taking user's needs into -account and understanding the use cases. +This guide provides information on planning and designing an OpenStack +cloud. It describes common use cases, high availability, and considerations +when changing capacity and scaling your cloud environment. A breakdown of the +major OpenStack components is also described in relation to cloud architecture +design. Contents ~~~~~~~~ @@ -21,17 +27,11 @@ Contents :maxdepth: 2 common/conventions.rst - introduction.rst - legal-security-requirements.rst - generalpurpose.rst - compute-focus.rst - storage-focus.rst - network-focus.rst - multi-site.rst - hybrid.rst - massively-scalable.rst - specialized.rst - references.rst + overview.rst + use-cases.rst + high-availability.rst + capacity-planning-scaling.rst + design.rst Appendix ~~~~~~~~ @@ -53,4 +53,3 @@ Search in this guide ~~~~~~~~~~~~~~~~~~~~ * :ref:`search` - diff --git a/doc/arch-design-draft/source/overview-customer-requirements.rst b/doc/arch-design/source/overview-customer-requirements.rst similarity index 100% rename from doc/arch-design-draft/source/overview-customer-requirements.rst rename to doc/arch-design/source/overview-customer-requirements.rst diff --git a/doc/arch-design-draft/source/overview-legal-requirements.rst b/doc/arch-design/source/overview-legal-requirements.rst similarity index 100% rename from doc/arch-design-draft/source/overview-legal-requirements.rst rename to doc/arch-design/source/overview-legal-requirements.rst diff --git a/doc/arch-design-draft/source/overview-operator-requirements.rst b/doc/arch-design/source/overview-operator-requirements.rst similarity index 100% rename from doc/arch-design-draft/source/overview-operator-requirements.rst rename to doc/arch-design/source/overview-operator-requirements.rst diff --git a/doc/arch-design-draft/source/overview-planning.rst b/doc/arch-design/source/overview-planning.rst similarity index 100% rename from doc/arch-design-draft/source/overview-planning.rst rename to doc/arch-design/source/overview-planning.rst diff --git a/doc/arch-design-draft/source/overview-security-requirements.rst b/doc/arch-design/source/overview-security-requirements.rst similarity index 100% rename from doc/arch-design-draft/source/overview-security-requirements.rst rename to doc/arch-design/source/overview-security-requirements.rst diff --git a/doc/arch-design-draft/source/overview-software-licensing.rst b/doc/arch-design/source/overview-software-licensing.rst similarity index 100% rename from doc/arch-design-draft/source/overview-software-licensing.rst rename to doc/arch-design/source/overview-software-licensing.rst diff --git a/doc/arch-design-draft/source/overview.rst b/doc/arch-design/source/overview.rst similarity index 100% rename from doc/arch-design-draft/source/overview.rst rename to doc/arch-design/source/overview.rst diff --git a/doc/arch-design-draft/source/use-cases.rst b/doc/arch-design/source/use-cases.rst similarity index 100% rename from doc/arch-design-draft/source/use-cases.rst rename to doc/arch-design/source/use-cases.rst diff --git a/doc/arch-design-draft/source/use-cases/use-case-development.rst b/doc/arch-design/source/use-cases/use-case-development.rst similarity index 100% rename from doc/arch-design-draft/source/use-cases/use-case-development.rst rename to doc/arch-design/source/use-cases/use-case-development.rst diff --git a/doc/arch-design-draft/source/use-cases/use-case-general-compute.rst b/doc/arch-design/source/use-cases/use-case-general-compute.rst similarity index 100% rename from doc/arch-design-draft/source/use-cases/use-case-general-compute.rst rename to doc/arch-design/source/use-cases/use-case-general-compute.rst diff --git a/doc/arch-design-draft/source/use-cases/use-case-nfv.rst b/doc/arch-design/source/use-cases/use-case-nfv.rst similarity index 100% rename from doc/arch-design-draft/source/use-cases/use-case-nfv.rst rename to doc/arch-design/source/use-cases/use-case-nfv.rst diff --git a/doc/arch-design-draft/source/use-cases/use-case-storage.rst b/doc/arch-design/source/use-cases/use-case-storage.rst similarity index 100% rename from doc/arch-design-draft/source/use-cases/use-case-storage.rst rename to doc/arch-design/source/use-cases/use-case-storage.rst diff --git a/doc/arch-design-draft/source/use-cases/use-case-web-scale.rst b/doc/arch-design/source/use-cases/use-case-web-scale.rst similarity index 100% rename from doc/arch-design-draft/source/use-cases/use-case-web-scale.rst rename to doc/arch-design/source/use-cases/use-case-web-scale.rst diff --git a/tools/build-all-rst.sh b/tools/build-all-rst.sh index 421aed8023..beb747ac6e 100755 --- a/tools/build-all-rst.sh +++ b/tools/build-all-rst.sh @@ -46,7 +46,7 @@ done # Draft guides # This includes guides that we publish from stable branches # as versioned like the networking-guide. -for guide in networking-guide arch-design-draft config-reference; do +for guide in networking-guide config-reference; do if [[ ${PDF_TARGETS[*]} =~ $guide ]]; then tools/build-rst.sh doc/$guide --build build \ --target "draft/$guide" $LINKCHECK $PDF_OPTION diff --git a/tools/publishdocs.sh b/tools/publishdocs.sh index 9420d14a16..8cc140761e 100755 --- a/tools/publishdocs.sh +++ b/tools/publishdocs.sh @@ -32,7 +32,7 @@ function copy_to_branch { # We don't need this file rm -f publish-docs/$BRANCH/draft-index.html # We don't need these draft guides on the branch - rm -rf publish-docs/$BRANCH/arch-design-draft + rm -rf publish-docs/$BRANCH/arch-design-to-archive rm -rf publish-docs/$BRANCH/ops-guide for f in $(find publish-docs/$BRANCH -name "atom.xml"); do diff --git a/www/draft/draft-index.html b/www/draft/draft-index.html index 29ced1b131..30071f41f3 100644 --- a/www/draft/draft-index.html +++ b/www/draft/draft-index.html @@ -77,7 +77,6 @@

Draft Operations and Administration Guides

Networking Guide - Draft Architecture Guide

Draft API Guides