From 7659b632b2f4b28f978f6bed9cfac2cb8a0f1f77 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Tue, 14 Feb 2017 00:56:42 -0800 Subject: [PATCH] [DOCS] Move links to role docs to deploy guide The links to role docs are currently hidden at the bottom of the developer guide. Move them directly to the deploy guide under the 'Configure the deployment' section. Change-Id: I89da19ae319cbe10241b0e9a65bea5a8f1502e47 --- .../source/app-advanced-config-options.rst | 1 - .../source/app-advanced-role-docs.rst | 11 -- deploy-guide/source/configure.rst | 122 +++++++++++++++++- .../developer-docs/advanced-role-docs.rst | 94 -------------- doc/source/developer-docs/role-services.rst | 1 - 5 files changed, 121 insertions(+), 108 deletions(-) delete mode 100644 deploy-guide/source/app-advanced-role-docs.rst delete mode 100644 doc/source/developer-docs/advanced-role-docs.rst diff --git a/deploy-guide/source/app-advanced-config-options.rst b/deploy-guide/source/app-advanced-config-options.rst index b2dbeedb1f..2aaa43bbbb 100644 --- a/deploy-guide/source/app-advanced-config-options.rst +++ b/deploy-guide/source/app-advanced-config-options.rst @@ -12,4 +12,3 @@ Appendix F: Advanced configuration app-advanced-config-security app-advanced-config-sslcertificates app-advanced-config-affinity - app-advanced-role-docs diff --git a/deploy-guide/source/app-advanced-role-docs.rst b/deploy-guide/source/app-advanced-role-docs.rst deleted file mode 100644 index 0c68f5a065..0000000000 --- a/deploy-guide/source/app-advanced-role-docs.rst +++ /dev/null @@ -1,11 +0,0 @@ -============================== -Advanced service configuration -============================== - -OpenStack-Ansible has many options that you can use for the advanced -configuration of services. Each role's documentation provides information -about the available options. - -You can find the list of advanced service configuration roles OpenStack-Ansible -supports in the `Developer documentation `_. - diff --git a/deploy-guide/source/configure.rst b/deploy-guide/source/configure.rst index 13bc0e00f3..1cf4161523 100644 --- a/deploy-guide/source/configure.rst +++ b/deploy-guide/source/configure.rst @@ -56,7 +56,7 @@ For details about how the inventory is generated from the environment configuration, see `developer-inventory `_. -Configuring additional services +Installing additional services ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ To install additional services, the files in @@ -64,6 +64,126 @@ To install additional services, the files in the correct host groups to use. To add another service, add the host group, allocate hosts to it, and then execute the playbooks. +Advanced service configuration +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +OpenStack-Ansible has many options that you can use for the advanced +configuration of services. Each role's documentation provides information +about the available options. + +Infrastructure service roles +---------------------------- + +- `galera_server + `_ + +- `haproxy_server + `_ + +- `memcached_server + `_ + +- `rabbitmq_server + `_ + +- `repo_build + `_ + +- `repo_server + `_ + +- `rsyslog_server + `_ + + +OpenStack service roles +----------------------- + +- `os_aodh `_ + +- `os_barbican + `_ + +- `os_ceilometer + `_ + +- `os_cinder + `_ + +- `os_designate + `_ + +- `os_glance + `_ + +- `os_gnocchi + `_ + +- `os_heat `_ + +- `os_horizon + `_ + +- `os_ironic + `_ + +- `os_keystone + `_ + +- `os_magnum + `_ + +- `os_neutron + `_ + +- `os_nova `_ + +- `os_rally `_ + +- `os_sahara + `_ + +- `os_swift `_ + +- `os_tempest + `_ + +- `os_trove `_ + + +Other roles +----------- + +- `ansible-plugins + `_ + +- `apt_package_pinning + `_ + +- `ceph_client + `_ + +- `galera_client + `_ + +- `lxc_container_create + `_ + +- `lxc_hosts + `_ + +- `pip_install + `_ + +- `openstack_openrc + `_ + +- `openstack_hosts + `_ + +- `rsyslog_client + `_ + Configuring service credentials ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/developer-docs/advanced-role-docs.rst b/doc/source/developer-docs/advanced-role-docs.rst deleted file mode 100644 index 7fd55b737d..0000000000 --- a/doc/source/developer-docs/advanced-role-docs.rst +++ /dev/null @@ -1,94 +0,0 @@ -.. _role-docs: - -============================== -Advanced service configuration -============================== - -OpenStack-Ansible has many options that you can use for the advanced -configuration of services. Each role's documentation provides information -about the available options. - -The following options are optional. - -Infrastructure service roles -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -- `galera_server `_ - -- `haproxy_server `_ - -- `memcached_server `_ - -- `rabbitmq_server `_ - -- `repo_build `_ - -- `repo_server `_ - -- `rsyslog_server `_ - - -OpenStack service roles -~~~~~~~~~~~~~~~~~~~~~~~ - -- `os_aodh `_ - -- `os_barbican `_ - -- `os_ceilometer `_ - -- `os_cinder `_ - -- `os_designate `_ - -- `os_glance `_ - -- `os_gnocchi `_ - -- `os_heat `_ - -- `os_horizon `_ - -- `os_ironic `_ - -- `os_keystone `_ - -- `os_magnum `_ - -- `os_neutron `_ - -- `os_nova `_ - -- `os_rally `_ - -- `os_sahara `_ - -- `os_swift `_ - -- `os_tempest `_ - -- `os_trove `_ - - -Other roles -~~~~~~~~~~~ - -- `ansible-plugins `_ - -- `apt_package_pinning `_ - -- `ceph_client `_ - -- `galera_client `_ - -- `lxc_container_create `_ - -- `lxc_hosts `_ - -- `pip_install `_ - -- `openstack_openrc `_ - -- `openstack_hosts `_ - -- `rsyslog_client `_ diff --git a/doc/source/developer-docs/role-services.rst b/doc/source/developer-docs/role-services.rst index fe7c55b4d5..b0f9f59a5a 100644 --- a/doc/source/developer-docs/role-services.rst +++ b/doc/source/developer-docs/role-services.rst @@ -11,4 +11,3 @@ in maintaining it. :maxdepth: 2 additional-roles - advanced-role-docs