From 6879a52890cb97076db0558087d712759aaf46bc Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Wed, 22 Mar 2017 16:05:04 +0900 Subject: [PATCH] [ops-guide] move operations content into top level To improve readability with table of content. Change-Id: I7e06ac3b55f7fec2dac07f1d54ee8d5c1272b0f4 --- doc/ops-guide/source/index.rst | 36 ++++++++++++++++++++++++-- doc/ops-guide/source/operations.rst | 40 ----------------------------- www/static/.htaccess | 3 +++ 3 files changed, 37 insertions(+), 42 deletions(-) delete mode 100644 doc/ops-guide/source/operations.rst diff --git a/doc/ops-guide/source/index.rst b/doc/ops-guide/source/index.rst index 14fb172ac3..e68e7c8dec 100644 --- a/doc/ops-guide/source/index.rst +++ b/doc/ops-guide/source/index.rst @@ -5,7 +5,30 @@ OpenStack Operations Guide Abstract ~~~~~~~~ -This book provides information about designing and operating OpenStack clouds. +This guide provides information about operating OpenStack clouds. + +We recommend that you turn to the `Installation Tutorials and Guides +`_, +which contains a step-by-step guide on how to manually install the +OpenStack packages and dependencies on your cloud. + +While it is important for an operator to be familiar with the steps +involved in deploying OpenStack, we also strongly encourage you to +evaluate `OpenStack deployment tools +`_ +and configuration-management tools, such as :term:`Puppet` or +:term:`Chef`, which can help automate this deployment process. + +In this guide, we assume that you have successfully deployed an +OpenStack cloud and are able to perform basic operations +such as adding images, booting instances, and attaching volumes. + +As your focus turns to stable operations, we recommend that you do skim +this guide to get a sense of the content. Some of this content is useful +to read in advance so that you can put best practices into effect to +simplify your life in the long run. Other content is more useful as a +reference that you might turn to when an unexpected event occurs (such +as a power failure), or to troubleshoot a particular problem. Contents ~~~~~~~~ @@ -16,7 +39,16 @@ Contents acknowledgements.rst preface.rst common/conventions.rst - operations.rst + ops-lay-of-the-land.rst + ops-projects-users.rst + ops-user-facing-operations.rst + ops-maintenance.rst + ops-network-troubleshooting.rst + ops-logging-monitoring.rst + ops-backup-recovery.rst + ops-customize.rst + ops-advanced-configuration.rst + ops-upgrades.rst Appendix ~~~~~~~~ diff --git a/doc/ops-guide/source/operations.rst b/doc/ops-guide/source/operations.rst deleted file mode 100644 index 9c5efcc056..0000000000 --- a/doc/ops-guide/source/operations.rst +++ /dev/null @@ -1,40 +0,0 @@ -========== -Operations -========== - -Congratulations! By now, you should have a solid design for your cloud. -We now recommend that you turn to the `Installation Tutorials and Guides -`_, which contains a -step-by-step guide on how to manually install the OpenStack packages and -dependencies on your cloud. - -While it is important for an operator to be familiar with the steps -involved in deploying OpenStack, we also strongly encourage you to -evaluate configuration-management tools, such as :term:`Puppet` or -:term:`Chef`, which can help automate this deployment process. - -In the remainder of this guide, we assume that you have successfully -deployed an OpenStack cloud and are able to perform basic operations -such as adding images, booting instances, and attaching volumes. - -As your focus turns to stable operations, we recommend that you do skim -the remainder of this book to get a sense of the content. Some of this -content is useful to read in advance so that you can put best practices -into effect to simplify your life in the long run. Other content is more -useful as a reference that you might turn to when an unexpected event -occurs (such as a power failure), or to troubleshoot a particular -problem. - -.. toctree:: - :maxdepth: 2 - - ops-lay-of-the-land.rst - ops-projects-users.rst - ops-user-facing-operations.rst - ops-maintenance.rst - ops-network-troubleshooting.rst - ops-logging-monitoring.rst - ops-backup-recovery.rst - ops-customize.rst - ops-advanced-configuration.rst - ops-upgrades.rst diff --git a/www/static/.htaccess b/www/static/.htaccess index 693dd611da..04093fa4c3 100644 --- a/www/static/.htaccess +++ b/www/static/.htaccess @@ -90,6 +90,9 @@ redirectmatch 301 /ops/.*$ /ops-guide/index.html # Redirect Operations Guide architecture part to Architecture Guide redirectmatch 301 /ops-guide/arch.*$ /arch-design/index.html +# Redirect Operations Guide operations to index +redirect 301 /ops-guide/operations.html /ops-guide/index.html + # Redirect Architecture Guide to /arch-design/ redirect 301 /arch/index.html /arch-design/index.html