From 199e33c0a2a5ae569642b4a278ab886df5373e44 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 19 Aug 2016 14:10:43 +0100 Subject: [PATCH] [DOCS] Updates to deploy config 1. Moves affinity to advanced config in install draft 2. Deletes hypervisor (info already in nova role) 3. Deletes deploy config file and removes from index.rst Change-Id: I515b3af8ac6e45aa768fda25fd3c0f57236bc7b1 Implements: blueprint osa-install-guide-overhaul --- .../developer-docs/configure-hypervisor.rst | 18 ------------------ doc/source/developer-docs/deploy-config.rst | 16 ---------------- doc/source/developer-docs/index.rst | 1 - .../app-advanced-config-affinity.rst} | 0 .../app-advanced-config-options.rst | 1 + 5 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 doc/source/developer-docs/configure-hypervisor.rst delete mode 100644 doc/source/developer-docs/deploy-config.rst rename doc/source/{developer-docs/configure-affinity.rst => install-guide-revised-draft/app-advanced-config-affinity.rst} (100%) diff --git a/doc/source/developer-docs/configure-hypervisor.rst b/doc/source/developer-docs/configure-hypervisor.rst deleted file mode 100644 index 91a7080b34..0000000000 --- a/doc/source/developer-docs/configure-hypervisor.rst +++ /dev/null @@ -1,18 +0,0 @@ -`Home `_ OpenStack-Ansible Installation Guide - -Configuring the hypervisor (optional) -===================================== - -By default, the KVM hypervisor is used. If you are deploying to a host -that does not support KVM hardware acceleration extensions, select a -suitable hypervisor type such as ``qemu`` or ``lxc``. To change the -hypervisor type, uncomment and edit the following line in the -``/etc/openstack_deploy/user_variables.yml`` file: - -.. code-block:: yaml - - # nova_virt_type: kvm - --------------- - -.. include:: navigation.txt diff --git a/doc/source/developer-docs/deploy-config.rst b/doc/source/developer-docs/deploy-config.rst deleted file mode 100644 index 389aa8683c..0000000000 --- a/doc/source/developer-docs/deploy-config.rst +++ /dev/null @@ -1,16 +0,0 @@ -================================ -Deployment configuration options -================================ - -Ansible references a handful of files containing mandatory and optional -configuration directives. This chapter describes optional configuration -options to define the target environment before running the Ansible playbooks. - -Contents: - -.. toctree:: - - configure-affinity.rst - configure-hypervisor.rst - configure-haproxy.rst - configure-ceph.rst diff --git a/doc/source/developer-docs/index.rst b/doc/source/developer-docs/index.rst index 1948f89603..f63a8ed288 100644 --- a/doc/source/developer-docs/index.rst +++ b/doc/source/developer-docs/index.rst @@ -19,4 +19,3 @@ Contents: core-reviewers additional-roles inventory - deploy-config diff --git a/doc/source/developer-docs/configure-affinity.rst b/doc/source/install-guide-revised-draft/app-advanced-config-affinity.rst similarity index 100% rename from doc/source/developer-docs/configure-affinity.rst rename to doc/source/install-guide-revised-draft/app-advanced-config-affinity.rst diff --git a/doc/source/install-guide-revised-draft/app-advanced-config-options.rst b/doc/source/install-guide-revised-draft/app-advanced-config-options.rst index f734dd9dcd..bc6a754d12 100644 --- a/doc/source/install-guide-revised-draft/app-advanced-config-options.rst +++ b/doc/source/install-guide-revised-draft/app-advanced-config-options.rst @@ -10,6 +10,7 @@ Appendix D: Advanced configuration app-advanced-config-override app-advanced-config-security app-advanced-config-sslcertificates + app-advanced-config-affinity --------------