From c69a07c6436cbde09ff1cfc62caa4acfdb8bf4e8 Mon Sep 17 00:00:00 2001 From: daz Date: Thu, 4 Aug 2016 12:49:21 +1000 Subject: [PATCH] [docs] Move ops content and fix build errors 1. Move "Remove compute host" to the developer docs 2. Fix build errors in the install guide Change-Id: I29091faab3af104feeb076bb1db90befbc2119ee --- ...addcomputehost.rst => ops-add-computehost.rst} | 0 .../ops-remove-computehost.rst} | 9 ++++----- doc/source/developer-docs/ops.rst | 3 ++- doc/source/install-guide/configure.rst | 15 --------------- 4 files changed, 6 insertions(+), 21 deletions(-) rename doc/source/developer-docs/{ops-addcomputehost.rst => ops-add-computehost.rst} (100%) rename doc/source/{install-guide/ops-removecomputehost.rst => developer-docs/ops-remove-computehost.rst} (91%) diff --git a/doc/source/developer-docs/ops-addcomputehost.rst b/doc/source/developer-docs/ops-add-computehost.rst similarity index 100% rename from doc/source/developer-docs/ops-addcomputehost.rst rename to doc/source/developer-docs/ops-add-computehost.rst diff --git a/doc/source/install-guide/ops-removecomputehost.rst b/doc/source/developer-docs/ops-remove-computehost.rst similarity index 91% rename from doc/source/install-guide/ops-removecomputehost.rst rename to doc/source/developer-docs/ops-remove-computehost.rst index e910f5bc9f..a119552e51 100644 --- a/doc/source/install-guide/ops-removecomputehost.rst +++ b/doc/source/developer-docs/ops-remove-computehost.rst @@ -24,7 +24,7 @@ To remove a compute host, follow the below procedure. Ensure this step is performed first - .. code-block:: + .. code-block:: console # Run these commands on the compute node to be removed # stop nova-compute @@ -32,16 +32,15 @@ To remove a compute host, follow the below procedure. #. Clone the ``openstack-ansible-ops`` repository to your deployment host: - .. code-block:: + .. code-block:: console - $ git clone \ - https://github.com/openstack/openstack-ansible-ops \ + $ git clone https://github.com/openstack/openstack-ansible-ops \ /opt/openstack-ansible-ops #. Run the ``remove_compute_node.yml`` Ansible playbook with the ``node_to_be_removed`` user variable set: - .. code-block:: + .. code-block:: console $ cd /opt/openstack-ansible-ops/ansible_tools/playbooks openstack-ansible remove_compute_node.yml \ diff --git a/doc/source/developer-docs/ops.rst b/doc/source/developer-docs/ops.rst index bc5d297639..0a8d7872db 100644 --- a/doc/source/developer-docs/ops.rst +++ b/doc/source/developer-docs/ops.rst @@ -8,7 +8,8 @@ installed environments. .. toctree:: ops-lxc-commands.rst - ops-addcomputehost.rst + ops-add-computehost.rst + ops-remove-computehost.rst ops-galera.rst ops-logging.rst ops-tips.rst diff --git a/doc/source/install-guide/configure.rst b/doc/source/install-guide/configure.rst index 85f9bb6281..0fd9d0af12 100644 --- a/doc/source/install-guide/configure.rst +++ b/doc/source/install-guide/configure.rst @@ -9,24 +9,9 @@ Chapter 4. Deployment configuration configure-networking.rst configure-hostlist.rst configure-creds.rst - configure-hypervisor.rst - configure-nova.rst - configure-ironic.rst - configure-glance.rst - configure-cinder.rst - configure-swift.rst - configure-haproxy.rst - configure-horizon.rst - configure-rabbitmq.rst - configure-ceilometer.rst - configure-aodh.rst - configure-keystone.rst - configure-network-services.rst configure-openstack.rst configure-sslcertificates.rst configure-configurationintegrity.rst - configure-federation.rst - configure-ceph.rst **Figure 4.1. Installation work flow**