diff options
Diffstat (limited to 'doc/source/admin')
| -rw-r--r-- | doc/source/admin/index.rst | 55 | ||||
| -rw-r--r-- | doc/source/admin/upgrade-guide.rst | 5 |
2 files changed, 24 insertions, 36 deletions
diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst index 9d86cd31f..fe9b39f5f 100644 --- a/doc/source/admin/index.rst +++ b/doc/source/admin/index.rst @@ -1,48 +1,31 @@ Administrator's Guide ===================== -Installation & Operations -------------------------- - If you are a system administrator running Ironic, this section contains -information that should help you understand how to deploy, operate, and upgrade +information that may help you understand how to operate and upgrade the services. .. toctree:: :maxdepth: 1 - Installation Guide </install/index> - gmr - Upgrade Guide <upgrade-guide> - upgrade-to-hardware-types - Release Notes <http://docs.openstack.org/releasenotes/ironic/> - Troubleshooting FAQ <troubleshooting> - -Configuration -------------- - -There are many aspects of the Bare Metal service which are environment -specific. The following pages will be helpful in configuring specific aspects -of ironic that may or may not be suitable to every situation. - -.. toctree:: - :maxdepth: 1 - - Guide to Node Cleaning <cleaning> - Configuring Node Inspection <inspection> - Configuring RAID during deployment <raid> - Configuring to boot from volume <boot-from-volume> - Security considerations for your Bare Metal installation <security> - Adopting Nodes in an ACTIVE state <adoption> - Configuring for Multi-tenant Networking <multitenancy> - Configuring for port groups <portgroups> - Configuring node web or serial console <console> - Emitting software metrics <metrics> - Auditing API Traffic <api-audit-support> - Notifications <notifications> - Ceph Object Gateway support <radosgw> - /configuration/sample-config - /configuration/sample-policy + Enabling Drivers <drivers> + Ironic Python Agent <drivers/ipa> + Node Hardware Inspection <inspection> + Node Cleaning <cleaning> + Node Adoption <adoption> + RAID Configuration <raid> + Configuring to boot from volume <boot-from-volume> + Multi-tenant Networking <multitenancy> + Port Groups <portgroups> + Configuring Web or Serial Console <console> + Enabling Notifications <notifications> + Ceph Object Gateway <radosgw> + Emitting Software Metrics <metrics> + Auditing API Traffic <api-audit-support> + Service State Reporting <gmr> + Upgrade Guide <upgrade-guide> + Security <security> + Troubleshooting FAQ <troubleshooting> Dashboard Integration --------------------- diff --git a/doc/source/admin/upgrade-guide.rst b/doc/source/admin/upgrade-guide.rst index 86eea5165..7d39b5d4e 100644 --- a/doc/source/admin/upgrade-guide.rst +++ b/doc/source/admin/upgrade-guide.rst @@ -320,6 +320,11 @@ Upgrading from Ocata to Pike Other upgrade instructions are in the `Pike release notes <https://docs.openstack.org/releasenotes/ironic/pike.html>`_. +.. toctree:: + :maxdepth: 1 + + upgrade-to-hardware-types.rst + Upgrading from Newton to Ocata ============================== |