From 14ae5a8b645007adacd728ccff5bd51fbcbd355c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Sat, 17 Feb 2018 11:24:53 +0000 Subject: [PATCH] [Docs] Promote scale the environment Scale the environment deserves its own chapter. On top of that, the managing swift section is about how scaling is done with swift clusters (Multi-Region handling), and therefore should be moved into scaling the environment. Change-Id: I3a37bfefb53e229278c7ec08a8acde63614949ed --- doc/source/admin/index.rst | 3 ++- doc/source/admin/maintenance-tasks.rst | 2 -- .../admin/{monitor-environment => }/monitoring-systems.rst | 0 .../admin/{maintenance-tasks => }/scale-environment.rst | 2 ++ .../managing-swift.rst => scaling-swift.rst} | 7 ------- 5 files changed, 4 insertions(+), 10 deletions(-) rename doc/source/admin/{monitor-environment => }/monitoring-systems.rst (100%) rename doc/source/admin/{maintenance-tasks => }/scale-environment.rst (99%) rename doc/source/admin/{maintenance-tasks/managing-swift.rst => scaling-swift.rst} (91%) diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst index 4368b6eb1b..66ce3a1c87 100644 --- a/doc/source/admin/index.rst +++ b/doc/source/admin/index.rst @@ -21,7 +21,8 @@ more complex operations like upgrading. openstack-firstrun.rst openstack-operations.rst maintenance-tasks.rst - monitor-environment/monitoring-systems.rst + scale-environment.rst + monitoring-systems.rst troubleshooting.rst advanced-config.rst ref-info.rst diff --git a/doc/source/admin/maintenance-tasks.rst b/doc/source/admin/maintenance-tasks.rst index 5336d43662..41ff15c6de 100644 --- a/doc/source/admin/maintenance-tasks.rst +++ b/doc/source/admin/maintenance-tasks.rst @@ -11,8 +11,6 @@ maintenance tasks. maintenance-tasks/galera.rst maintenance-tasks/rabbitmq-maintain.rst maintenance-tasks/backups.rst - maintenance-tasks/scale-environment.rst maintenance-tasks/ansible-modules.rst - maintenance-tasks/managing-swift.rst maintenance-tasks/containers.rst maintenance-tasks/firewalls.rst diff --git a/doc/source/admin/monitor-environment/monitoring-systems.rst b/doc/source/admin/monitoring-systems.rst similarity index 100% rename from doc/source/admin/monitor-environment/monitoring-systems.rst rename to doc/source/admin/monitoring-systems.rst diff --git a/doc/source/admin/maintenance-tasks/scale-environment.rst b/doc/source/admin/scale-environment.rst similarity index 99% rename from doc/source/admin/maintenance-tasks/scale-environment.rst rename to doc/source/admin/scale-environment.rst index dead6bdf9a..53cba3316e 100644 --- a/doc/source/admin/maintenance-tasks/scale-environment.rst +++ b/doc/source/admin/scale-environment.rst @@ -400,3 +400,5 @@ Destroying Containers The lxc_hosts host group must be included as the playbook and roles executed require the use of facts from the hosts. + +.. include:: scaling-swift.rst diff --git a/doc/source/admin/maintenance-tasks/managing-swift.rst b/doc/source/admin/scaling-swift.rst similarity index 91% rename from doc/source/admin/maintenance-tasks/managing-swift.rst rename to doc/source/admin/scaling-swift.rst index 5d6c8e7e52..65a42f5fff 100644 --- a/doc/source/admin/maintenance-tasks/managing-swift.rst +++ b/doc/source/admin/scaling-swift.rst @@ -1,10 +1,3 @@ -============================================ -Managing Object Storage for multiple regions -============================================ - -This is a draft Object Storage page for the proposed OpenStack-Ansible -operations guide. - Accessibility for multi-region Object Storage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~