diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py index 745f26a5..6f515f4d 100644 --- a/deploy-guide/source/conf.py +++ b/deploy-guide/source/conf.py @@ -10,7 +10,6 @@ # serve to show the default. import sys, os -import sphinx_rtd_theme # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -27,7 +26,7 @@ import sphinx_rtd_theme extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.intersphinx', - 'oslosphinx' + 'openstackdocstheme' ] @@ -99,6 +98,9 @@ templates_path = ['../../_templates'] # Output file base name for HTML help builder. htmlhelp_basename = '%sdoc' % project +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'openstackdocs' # -- Options for LaTeX output -------------------------------------------------- @@ -118,3 +120,8 @@ rst_prolog = """ .. |bug_tracker| replace:: %s .. |bug_tracker_url| replace:: %s """ % (project, bug_tracker, bug_tracker_url) + +# openstackdocstheme options +repository_name = 'openstack/tripleo-docs' +bug_project = 'tripleo' +bug_tag = 'documentation' diff --git a/doc/source/conf.py b/doc/source/conf.py index ee92ea1b..6f515f4d 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,7 +10,6 @@ # serve to show the default. import sys, os -import openstackdocstheme # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -27,7 +26,7 @@ import openstackdocstheme extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.intersphinx', - 'oslosphinx' + 'openstackdocstheme' ] @@ -103,9 +102,6 @@ htmlhelp_basename = '%sdoc' % project # a list of builtin themes. html_theme = 'openstackdocs' -# Add any paths that contain custom themes here, relative to this directory. -html_theme_path = [openstackdocstheme.get_html_theme_path()] - # -- Options for LaTeX output -------------------------------------------------- latex_elements = { @@ -124,3 +120,8 @@ rst_prolog = """ .. |bug_tracker| replace:: %s .. |bug_tracker_url| replace:: %s """ % (project, bug_tracker, bug_tracker_url) + +# openstackdocstheme options +repository_name = 'openstack/tripleo-docs' +bug_project = 'tripleo' +bug_tag = 'documentation' diff --git a/doc/source/contributions/contributions.rst b/doc/source/contributor/contributions.rst similarity index 90% rename from doc/source/contributions/contributions.rst rename to doc/source/contributor/contributions.rst index a19e2a7c..50e2ccd4 100644 --- a/doc/source/contributions/contributions.rst +++ b/doc/source/contributor/contributions.rst @@ -13,7 +13,7 @@ development is happening in OpenStack upstream. Learn `how to contribute into OpenStack's upstream `_. -See :doc:`../introduction/components` to find out how to contribute into +See :doc:`../install/introduction/components` to find out how to contribute into individual projects. Contributing to this Documentation @@ -37,7 +37,7 @@ upstream projects, please follow OpenStack's process of filing bugs. `_. * If you want to file a bug against upstream project, you can find useful links - in our list of :doc:`../introduction/components`. + in our list of :doc:`../install/introduction/components`. **TripleO** If the bug impacts the |project| project as a whole, you can file a @@ -59,4 +59,4 @@ all the features are being requested upstream via Blueprints. `_. * If you want to file a bug against upstream project, you can find useful links - in our list of :doc:`../introduction/components`. + in our list of :doc:`../install/introduction/components`. diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst new file mode 100644 index 00000000..2ee39883 --- /dev/null +++ b/doc/source/contributor/index.rst @@ -0,0 +1,8 @@ +TripleO Contributor Guide +========================= + +.. toctree:: + :maxdepth: 2 + :includehidden: + + contributions diff --git a/doc/source/index.rst b/doc/source/index.rst index 14c1df64..8a63836e 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -6,27 +6,24 @@ clouds using OpenStack's own cloud facilities as the foundation - building on Nova, Ironic, Neutron and Heat to automate cloud management at datacenter scale. -Contents: + +Contribute Guide +---------------- .. toctree:: - :maxdepth: 2 + :maxdepth: 3 + :includehidden: - introduction/introduction - environments/environments - installation/installation - basic_deployment/basic_deployment_cli - containers_deployment/index - post_deployment/post_deployment - advanced_deployment/features - advanced_deployment/baremetal_nodes - advanced_deployment/backends - advanced_deployment/custom - troubleshooting/troubleshooting - validations/validations - mistral-api/mistral-api - developer/developer - contributions/contributions + contributor/index +Install Guide +------------- + +.. toctree:: + :maxdepth: 3 + :includehidden: + + install/index Documentation Conventions ========================= diff --git a/doc/source/_images/TripleO_Network_Diagram_.jpg b/doc/source/install/_images/TripleO_Network_Diagram_.jpg similarity index 100% rename from doc/source/_images/TripleO_Network_Diagram_.jpg rename to doc/source/install/_images/TripleO_Network_Diagram_.jpg diff --git a/doc/source/_images/introspection_diagram.png b/doc/source/install/_images/introspection_diagram.png similarity index 100% rename from doc/source/_images/introspection_diagram.png rename to doc/source/install/_images/introspection_diagram.png diff --git a/doc/source/_images/introspection_diagram.svg b/doc/source/install/_images/introspection_diagram.svg similarity index 100% rename from doc/source/_images/introspection_diagram.svg rename to doc/source/install/_images/introspection_diagram.svg diff --git a/doc/source/_images/logical_view.png b/doc/source/install/_images/logical_view.png similarity index 100% rename from doc/source/_images/logical_view.png rename to doc/source/install/_images/logical_view.png diff --git a/doc/source/_images/logical_view.svg b/doc/source/install/_images/logical_view.svg similarity index 100% rename from doc/source/_images/logical_view.svg rename to doc/source/install/_images/logical_view.svg diff --git a/doc/source/_images/overview.png b/doc/source/install/_images/overview.png similarity index 100% rename from doc/source/_images/overview.png rename to doc/source/install/_images/overview.png diff --git a/doc/source/_images/overview.svg b/doc/source/install/_images/overview.svg similarity index 100% rename from doc/source/_images/overview.svg rename to doc/source/install/_images/overview.svg diff --git a/doc/source/_images/physical_view.png b/doc/source/install/_images/physical_view.png similarity index 100% rename from doc/source/_images/physical_view.png rename to doc/source/install/_images/physical_view.png diff --git a/doc/source/_images/physical_view.svg b/doc/source/install/_images/physical_view.svg similarity index 100% rename from doc/source/_images/physical_view.svg rename to doc/source/install/_images/physical_view.svg diff --git a/doc/source/advanced_deployment/api_policies.rst b/doc/source/install/advanced_deployment/api_policies.rst similarity index 100% rename from doc/source/advanced_deployment/api_policies.rst rename to doc/source/install/advanced_deployment/api_policies.rst diff --git a/doc/source/advanced_deployment/backends.rst b/doc/source/install/advanced_deployment/backends.rst similarity index 100% rename from doc/source/advanced_deployment/backends.rst rename to doc/source/install/advanced_deployment/backends.rst diff --git a/doc/source/advanced_deployment/baremetal_nodes.rst b/doc/source/install/advanced_deployment/baremetal_nodes.rst similarity index 100% rename from doc/source/advanced_deployment/baremetal_nodes.rst rename to doc/source/install/advanced_deployment/baremetal_nodes.rst diff --git a/doc/source/advanced_deployment/baremetal_overcloud.rst b/doc/source/install/advanced_deployment/baremetal_overcloud.rst similarity index 100% rename from doc/source/advanced_deployment/baremetal_overcloud.rst rename to doc/source/install/advanced_deployment/baremetal_overcloud.rst diff --git a/doc/source/advanced_deployment/ceph_config.rst b/doc/source/install/advanced_deployment/ceph_config.rst similarity index 100% rename from doc/source/advanced_deployment/ceph_config.rst rename to doc/source/install/advanced_deployment/ceph_config.rst diff --git a/doc/source/advanced_deployment/ceph_external.rst b/doc/source/install/advanced_deployment/ceph_external.rst similarity index 100% rename from doc/source/advanced_deployment/ceph_external.rst rename to doc/source/install/advanced_deployment/ceph_external.rst diff --git a/doc/source/advanced_deployment/cinder_custom_backend.rst b/doc/source/install/advanced_deployment/cinder_custom_backend.rst similarity index 100% rename from doc/source/advanced_deployment/cinder_custom_backend.rst rename to doc/source/install/advanced_deployment/cinder_custom_backend.rst diff --git a/doc/source/advanced_deployment/cinder_netapp.rst b/doc/source/install/advanced_deployment/cinder_netapp.rst similarity index 100% rename from doc/source/advanced_deployment/cinder_netapp.rst rename to doc/source/install/advanced_deployment/cinder_netapp.rst diff --git a/doc/source/advanced_deployment/composable_services.rst b/doc/source/install/advanced_deployment/composable_services.rst similarity index 100% rename from doc/source/advanced_deployment/composable_services.rst rename to doc/source/install/advanced_deployment/composable_services.rst diff --git a/doc/source/advanced_deployment/custom.rst b/doc/source/install/advanced_deployment/custom.rst similarity index 100% rename from doc/source/advanced_deployment/custom.rst rename to doc/source/install/advanced_deployment/custom.rst diff --git a/doc/source/advanced_deployment/custom_roles.rst b/doc/source/install/advanced_deployment/custom_roles.rst similarity index 100% rename from doc/source/advanced_deployment/custom_roles.rst rename to doc/source/install/advanced_deployment/custom_roles.rst diff --git a/doc/source/advanced_deployment/deploy_manila.rst b/doc/source/install/advanced_deployment/deploy_manila.rst similarity index 100% rename from doc/source/advanced_deployment/deploy_manila.rst rename to doc/source/install/advanced_deployment/deploy_manila.rst diff --git a/doc/source/advanced_deployment/deploy_swift.rst b/doc/source/install/advanced_deployment/deploy_swift.rst similarity index 100% rename from doc/source/advanced_deployment/deploy_swift.rst rename to doc/source/install/advanced_deployment/deploy_swift.rst diff --git a/doc/source/advanced_deployment/deployed_server.rst b/doc/source/install/advanced_deployment/deployed_server.rst similarity index 100% rename from doc/source/advanced_deployment/deployed_server.rst rename to doc/source/install/advanced_deployment/deployed_server.rst diff --git a/doc/source/advanced_deployment/domain_specific_ldap_backends.rst b/doc/source/install/advanced_deployment/domain_specific_ldap_backends.rst similarity index 100% rename from doc/source/advanced_deployment/domain_specific_ldap_backends.rst rename to doc/source/install/advanced_deployment/domain_specific_ldap_backends.rst diff --git a/doc/source/advanced_deployment/extra_config.rst b/doc/source/install/advanced_deployment/extra_config.rst similarity index 100% rename from doc/source/advanced_deployment/extra_config.rst rename to doc/source/install/advanced_deployment/extra_config.rst diff --git a/doc/source/advanced_deployment/features.rst b/doc/source/install/advanced_deployment/features.rst similarity index 100% rename from doc/source/advanced_deployment/features.rst rename to doc/source/install/advanced_deployment/features.rst diff --git a/doc/source/advanced_deployment/high_availability.rst b/doc/source/install/advanced_deployment/high_availability.rst similarity index 100% rename from doc/source/advanced_deployment/high_availability.rst rename to doc/source/install/advanced_deployment/high_availability.rst diff --git a/doc/source/advanced_deployment/introspect_single_node.rst b/doc/source/install/advanced_deployment/introspect_single_node.rst similarity index 100% rename from doc/source/advanced_deployment/introspect_single_node.rst rename to doc/source/install/advanced_deployment/introspect_single_node.rst diff --git a/doc/source/advanced_deployment/introspection_data.rst b/doc/source/install/advanced_deployment/introspection_data.rst similarity index 100% rename from doc/source/advanced_deployment/introspection_data.rst rename to doc/source/install/advanced_deployment/introspection_data.rst diff --git a/doc/source/advanced_deployment/network_isolation.rst b/doc/source/install/advanced_deployment/network_isolation.rst similarity index 100% rename from doc/source/advanced_deployment/network_isolation.rst rename to doc/source/install/advanced_deployment/network_isolation.rst diff --git a/doc/source/advanced_deployment/network_isolation_virt.rst b/doc/source/install/advanced_deployment/network_isolation_virt.rst similarity index 100% rename from doc/source/advanced_deployment/network_isolation_virt.rst rename to doc/source/install/advanced_deployment/network_isolation_virt.rst diff --git a/doc/source/advanced_deployment/neutron_midonet.rst b/doc/source/install/advanced_deployment/neutron_midonet.rst similarity index 100% rename from doc/source/advanced_deployment/neutron_midonet.rst rename to doc/source/install/advanced_deployment/neutron_midonet.rst diff --git a/doc/source/advanced_deployment/node_config.rst b/doc/source/install/advanced_deployment/node_config.rst similarity index 100% rename from doc/source/advanced_deployment/node_config.rst rename to doc/source/install/advanced_deployment/node_config.rst diff --git a/doc/source/advanced_deployment/node_placement.rst b/doc/source/install/advanced_deployment/node_placement.rst similarity index 100% rename from doc/source/advanced_deployment/node_placement.rst rename to doc/source/install/advanced_deployment/node_placement.rst diff --git a/doc/source/advanced_deployment/node_specific_hieradata.rst b/doc/source/install/advanced_deployment/node_specific_hieradata.rst similarity index 100% rename from doc/source/advanced_deployment/node_specific_hieradata.rst rename to doc/source/install/advanced_deployment/node_specific_hieradata.rst diff --git a/doc/source/advanced_deployment/node_states.rst b/doc/source/install/advanced_deployment/node_states.rst similarity index 100% rename from doc/source/advanced_deployment/node_states.rst rename to doc/source/install/advanced_deployment/node_states.rst diff --git a/doc/source/advanced_deployment/ops_tools.rst b/doc/source/install/advanced_deployment/ops_tools.rst similarity index 100% rename from doc/source/advanced_deployment/ops_tools.rst rename to doc/source/install/advanced_deployment/ops_tools.rst diff --git a/doc/source/advanced_deployment/ovs_dpdk_config.rst b/doc/source/install/advanced_deployment/ovs_dpdk_config.rst similarity index 100% rename from doc/source/advanced_deployment/ovs_dpdk_config.rst rename to doc/source/install/advanced_deployment/ovs_dpdk_config.rst diff --git a/doc/source/advanced_deployment/profile_matching.rst b/doc/source/install/advanced_deployment/profile_matching.rst similarity index 100% rename from doc/source/advanced_deployment/profile_matching.rst rename to doc/source/install/advanced_deployment/profile_matching.rst diff --git a/doc/source/advanced_deployment/ready_state.rst b/doc/source/install/advanced_deployment/ready_state.rst similarity index 100% rename from doc/source/advanced_deployment/ready_state.rst rename to doc/source/install/advanced_deployment/ready_state.rst diff --git a/doc/source/advanced_deployment/role_specific_parameters.rst b/doc/source/install/advanced_deployment/role_specific_parameters.rst similarity index 100% rename from doc/source/advanced_deployment/role_specific_parameters.rst rename to doc/source/install/advanced_deployment/role_specific_parameters.rst diff --git a/doc/source/advanced_deployment/root_device.rst b/doc/source/install/advanced_deployment/root_device.rst similarity index 100% rename from doc/source/advanced_deployment/root_device.rst rename to doc/source/install/advanced_deployment/root_device.rst diff --git a/doc/source/advanced_deployment/security_hardening.rst b/doc/source/install/advanced_deployment/security_hardening.rst similarity index 100% rename from doc/source/advanced_deployment/security_hardening.rst rename to doc/source/install/advanced_deployment/security_hardening.rst diff --git a/doc/source/advanced_deployment/ssl.rst b/doc/source/install/advanced_deployment/ssl.rst similarity index 100% rename from doc/source/advanced_deployment/ssl.rst rename to doc/source/install/advanced_deployment/ssl.rst diff --git a/doc/source/advanced_deployment/swift_external.rst b/doc/source/install/advanced_deployment/swift_external.rst similarity index 100% rename from doc/source/advanced_deployment/swift_external.rst rename to doc/source/install/advanced_deployment/swift_external.rst diff --git a/doc/source/advanced_deployment/template_deploy.rst b/doc/source/install/advanced_deployment/template_deploy.rst similarity index 100% rename from doc/source/advanced_deployment/template_deploy.rst rename to doc/source/install/advanced_deployment/template_deploy.rst diff --git a/doc/source/advanced_deployment/tls_everywhere.rst b/doc/source/install/advanced_deployment/tls_everywhere.rst similarity index 100% rename from doc/source/advanced_deployment/tls_everywhere.rst rename to doc/source/install/advanced_deployment/tls_everywhere.rst diff --git a/doc/source/advanced_deployment/whole_disk_images.rst b/doc/source/install/advanced_deployment/whole_disk_images.rst similarity index 100% rename from doc/source/advanced_deployment/whole_disk_images.rst rename to doc/source/install/advanced_deployment/whole_disk_images.rst diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/install/basic_deployment/basic_deployment_cli.rst similarity index 100% rename from doc/source/basic_deployment/basic_deployment_cli.rst rename to doc/source/install/basic_deployment/basic_deployment_cli.rst diff --git a/doc/source/basic_deployment/repositories.rst b/doc/source/install/basic_deployment/repositories.rst similarity index 100% rename from doc/source/basic_deployment/repositories.rst rename to doc/source/install/basic_deployment/repositories.rst diff --git a/doc/source/containers_deployment/architecture.rst b/doc/source/install/containers_deployment/architecture.rst similarity index 100% rename from doc/source/containers_deployment/architecture.rst rename to doc/source/install/containers_deployment/architecture.rst diff --git a/doc/source/containers_deployment/index.rst b/doc/source/install/containers_deployment/index.rst similarity index 100% rename from doc/source/containers_deployment/index.rst rename to doc/source/install/containers_deployment/index.rst diff --git a/doc/source/containers_deployment/overcloud.rst b/doc/source/install/containers_deployment/overcloud.rst similarity index 100% rename from doc/source/containers_deployment/overcloud.rst rename to doc/source/install/containers_deployment/overcloud.rst diff --git a/doc/source/containers_deployment/tips_tricks.rst b/doc/source/install/containers_deployment/tips_tricks.rst similarity index 100% rename from doc/source/containers_deployment/tips_tricks.rst rename to doc/source/install/containers_deployment/tips_tricks.rst diff --git a/doc/source/containers_deployment/undercloud.rst b/doc/source/install/containers_deployment/undercloud.rst similarity index 100% rename from doc/source/containers_deployment/undercloud.rst rename to doc/source/install/containers_deployment/undercloud.rst diff --git a/doc/source/developer/developer.rst b/doc/source/install/developer/developer.rst similarity index 100% rename from doc/source/developer/developer.rst rename to doc/source/install/developer/developer.rst diff --git a/doc/source/developer/in_progress_review.rst b/doc/source/install/developer/in_progress_review.rst similarity index 100% rename from doc/source/developer/in_progress_review.rst rename to doc/source/install/developer/in_progress_review.rst diff --git a/doc/source/developer/release.rst b/doc/source/install/developer/release.rst similarity index 100% rename from doc/source/developer/release.rst rename to doc/source/install/developer/release.rst diff --git a/doc/source/developer/tht_walkthrough/changes-puppet-tripleo.rst b/doc/source/install/developer/tht_walkthrough/changes-puppet-tripleo.rst similarity index 100% rename from doc/source/developer/tht_walkthrough/changes-puppet-tripleo.rst rename to doc/source/install/developer/tht_walkthrough/changes-puppet-tripleo.rst diff --git a/doc/source/developer/tht_walkthrough/changes-tht.rst b/doc/source/install/developer/tht_walkthrough/changes-tht.rst similarity index 100% rename from doc/source/developer/tht_walkthrough/changes-tht.rst rename to doc/source/install/developer/tht_walkthrough/changes-tht.rst diff --git a/doc/source/developer/tht_walkthrough/design-patterns.rst b/doc/source/install/developer/tht_walkthrough/design-patterns.rst similarity index 100% rename from doc/source/developer/tht_walkthrough/design-patterns.rst rename to doc/source/install/developer/tht_walkthrough/design-patterns.rst diff --git a/doc/source/developer/tht_walkthrough/introduction.rst b/doc/source/install/developer/tht_walkthrough/introduction.rst similarity index 100% rename from doc/source/developer/tht_walkthrough/introduction.rst rename to doc/source/install/developer/tht_walkthrough/introduction.rst diff --git a/doc/source/developer/tht_walkthrough/summary.rst b/doc/source/install/developer/tht_walkthrough/summary.rst similarity index 100% rename from doc/source/developer/tht_walkthrough/summary.rst rename to doc/source/install/developer/tht_walkthrough/summary.rst diff --git a/doc/source/developer/tht_walkthrough/tht_walkthrough.rst b/doc/source/install/developer/tht_walkthrough/tht_walkthrough.rst similarity index 100% rename from doc/source/developer/tht_walkthrough/tht_walkthrough.rst rename to doc/source/install/developer/tht_walkthrough/tht_walkthrough.rst diff --git a/doc/source/developer/tht_walkthrough/tls_for_services.rst b/doc/source/install/developer/tht_walkthrough/tls_for_services.rst similarity index 100% rename from doc/source/developer/tht_walkthrough/tls_for_services.rst rename to doc/source/install/developer/tht_walkthrough/tls_for_services.rst diff --git a/doc/source/developer/tripleo.sh.rst b/doc/source/install/developer/tripleo.sh.rst similarity index 100% rename from doc/source/developer/tripleo.sh.rst rename to doc/source/install/developer/tripleo.sh.rst diff --git a/doc/source/environments/baremetal.rst b/doc/source/install/environments/baremetal.rst similarity index 100% rename from doc/source/environments/baremetal.rst rename to doc/source/install/environments/baremetal.rst diff --git a/doc/source/environments/environments.rst b/doc/source/install/environments/environments.rst similarity index 100% rename from doc/source/environments/environments.rst rename to doc/source/install/environments/environments.rst diff --git a/doc/source/environments/virtual.rst b/doc/source/install/environments/virtual.rst similarity index 100% rename from doc/source/environments/virtual.rst rename to doc/source/install/environments/virtual.rst diff --git a/doc/source/environments/virtualbmc.rst b/doc/source/install/environments/virtualbmc.rst similarity index 100% rename from doc/source/environments/virtualbmc.rst rename to doc/source/install/environments/virtualbmc.rst diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst new file mode 100644 index 00000000..5562b9fc --- /dev/null +++ b/doc/source/install/index.rst @@ -0,0 +1,21 @@ +TripleO Install Guide +========================= + +.. toctree:: + :maxdepth: 2 + :includehidden: + + introduction/introduction + environments/environments + installation/installation + basic_deployment/basic_deployment_cli + containers_deployment/index + post_deployment/post_deployment + advanced_deployment/features + advanced_deployment/baremetal_nodes + advanced_deployment/backends + advanced_deployment/custom + troubleshooting/troubleshooting + validations/validations + mistral-api/mistral-api + developer/developer diff --git a/doc/source/installation/installation.rst b/doc/source/install/installation/installation.rst similarity index 100% rename from doc/source/installation/installation.rst rename to doc/source/install/installation/installation.rst diff --git a/doc/source/installation/installing.rst b/doc/source/install/installation/installing.rst similarity index 100% rename from doc/source/installation/installing.rst rename to doc/source/install/installation/installing.rst diff --git a/doc/source/installation/updating.rst b/doc/source/install/installation/updating.rst similarity index 100% rename from doc/source/installation/updating.rst rename to doc/source/install/installation/updating.rst diff --git a/doc/source/introduction/architecture.rst b/doc/source/install/introduction/architecture.rst similarity index 100% rename from doc/source/introduction/architecture.rst rename to doc/source/install/introduction/architecture.rst diff --git a/doc/source/introduction/components.rst b/doc/source/install/introduction/components.rst similarity index 100% rename from doc/source/introduction/components.rst rename to doc/source/install/introduction/components.rst diff --git a/doc/source/introduction/introduction.rst b/doc/source/install/introduction/introduction.rst similarity index 100% rename from doc/source/introduction/introduction.rst rename to doc/source/install/introduction/introduction.rst diff --git a/doc/source/links.rst b/doc/source/install/links.rst similarity index 100% rename from doc/source/links.rst rename to doc/source/install/links.rst diff --git a/doc/source/mistral-api/mistral-api.rst b/doc/source/install/mistral-api/mistral-api.rst similarity index 100% rename from doc/source/mistral-api/mistral-api.rst rename to doc/source/install/mistral-api/mistral-api.rst diff --git a/doc/source/post_deployment/backup_restore_undercloud.rst b/doc/source/install/post_deployment/backup_restore_undercloud.rst similarity index 100% rename from doc/source/post_deployment/backup_restore_undercloud.rst rename to doc/source/install/post_deployment/backup_restore_undercloud.rst diff --git a/doc/source/post_deployment/build_single_image.rst b/doc/source/install/post_deployment/build_single_image.rst similarity index 100% rename from doc/source/post_deployment/build_single_image.rst rename to doc/source/install/post_deployment/build_single_image.rst diff --git a/doc/source/post_deployment/delete_nodes.rst b/doc/source/install/post_deployment/delete_nodes.rst similarity index 100% rename from doc/source/post_deployment/delete_nodes.rst rename to doc/source/install/post_deployment/delete_nodes.rst diff --git a/doc/source/post_deployment/migration.rst b/doc/source/install/post_deployment/migration.rst similarity index 100% rename from doc/source/post_deployment/migration.rst rename to doc/source/install/post_deployment/migration.rst diff --git a/doc/source/post_deployment/package_update.rst b/doc/source/install/post_deployment/package_update.rst similarity index 100% rename from doc/source/post_deployment/package_update.rst rename to doc/source/install/post_deployment/package_update.rst diff --git a/doc/source/post_deployment/post_deployment.rst b/doc/source/install/post_deployment/post_deployment.rst similarity index 100% rename from doc/source/post_deployment/post_deployment.rst rename to doc/source/install/post_deployment/post_deployment.rst diff --git a/doc/source/post_deployment/quiesce_cephstorage.rst b/doc/source/install/post_deployment/quiesce_cephstorage.rst similarity index 100% rename from doc/source/post_deployment/quiesce_cephstorage.rst rename to doc/source/install/post_deployment/quiesce_cephstorage.rst diff --git a/doc/source/post_deployment/quiesce_compute.rst b/doc/source/install/post_deployment/quiesce_compute.rst similarity index 100% rename from doc/source/post_deployment/quiesce_compute.rst rename to doc/source/install/post_deployment/quiesce_compute.rst diff --git a/doc/source/post_deployment/scale_roles.rst b/doc/source/install/post_deployment/scale_roles.rst similarity index 100% rename from doc/source/post_deployment/scale_roles.rst rename to doc/source/install/post_deployment/scale_roles.rst diff --git a/doc/source/post_deployment/update_undercloud_ssh_keys.rst b/doc/source/install/post_deployment/update_undercloud_ssh_keys.rst similarity index 100% rename from doc/source/post_deployment/update_undercloud_ssh_keys.rst rename to doc/source/install/post_deployment/update_undercloud_ssh_keys.rst diff --git a/doc/source/post_deployment/upgrade.rst b/doc/source/install/post_deployment/upgrade.rst similarity index 100% rename from doc/source/post_deployment/upgrade.rst rename to doc/source/install/post_deployment/upgrade.rst diff --git a/doc/source/post_deployment/upload_single_image.rst b/doc/source/install/post_deployment/upload_single_image.rst similarity index 100% rename from doc/source/post_deployment/upload_single_image.rst rename to doc/source/install/post_deployment/upload_single_image.rst diff --git a/doc/source/post_deployment/vm_snapshot.rst b/doc/source/install/post_deployment/vm_snapshot.rst similarity index 100% rename from doc/source/post_deployment/vm_snapshot.rst rename to doc/source/install/post_deployment/vm_snapshot.rst diff --git a/doc/source/repositories.txt b/doc/source/install/repositories.txt similarity index 100% rename from doc/source/repositories.txt rename to doc/source/install/repositories.txt diff --git a/doc/source/troubleshooting/troubleshooting-image-build.rst b/doc/source/install/troubleshooting/troubleshooting-image-build.rst similarity index 100% rename from doc/source/troubleshooting/troubleshooting-image-build.rst rename to doc/source/install/troubleshooting/troubleshooting-image-build.rst diff --git a/doc/source/troubleshooting/troubleshooting-log-and-status-capture.rst b/doc/source/install/troubleshooting/troubleshooting-log-and-status-capture.rst similarity index 100% rename from doc/source/troubleshooting/troubleshooting-log-and-status-capture.rst rename to doc/source/install/troubleshooting/troubleshooting-log-and-status-capture.rst diff --git a/doc/source/troubleshooting/troubleshooting-nodes.rst b/doc/source/install/troubleshooting/troubleshooting-nodes.rst similarity index 100% rename from doc/source/troubleshooting/troubleshooting-nodes.rst rename to doc/source/install/troubleshooting/troubleshooting-nodes.rst diff --git a/doc/source/troubleshooting/troubleshooting-overcloud.rst b/doc/source/install/troubleshooting/troubleshooting-overcloud.rst similarity index 100% rename from doc/source/troubleshooting/troubleshooting-overcloud.rst rename to doc/source/install/troubleshooting/troubleshooting-overcloud.rst diff --git a/doc/source/troubleshooting/troubleshooting-tripleo-heat-templates.rst b/doc/source/install/troubleshooting/troubleshooting-tripleo-heat-templates.rst similarity index 100% rename from doc/source/troubleshooting/troubleshooting-tripleo-heat-templates.rst rename to doc/source/install/troubleshooting/troubleshooting-tripleo-heat-templates.rst diff --git a/doc/source/troubleshooting/troubleshooting-virt-setup.rst b/doc/source/install/troubleshooting/troubleshooting-virt-setup.rst similarity index 100% rename from doc/source/troubleshooting/troubleshooting-virt-setup.rst rename to doc/source/install/troubleshooting/troubleshooting-virt-setup.rst diff --git a/doc/source/troubleshooting/troubleshooting.rst b/doc/source/install/troubleshooting/troubleshooting.rst similarity index 100% rename from doc/source/troubleshooting/troubleshooting.rst rename to doc/source/install/troubleshooting/troubleshooting.rst diff --git a/doc/source/validations/validations.rst b/doc/source/install/validations/validations.rst similarity index 100% rename from doc/source/validations/validations.rst rename to doc/source/install/validations/validations.rst diff --git a/test-requirements.txt b/test-requirements.txt index aa28f656..cd378c61 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,8 +3,7 @@ # process, which may cause wedges in the gate later. # Doc requirements openstackdocstheme>=1.5.0 # Apache-2.0 -sphinx!=1.6.1,>=1.5.1 # BSD -oslosphinx>=4.7.0 # Apache-2.0 +sphinx>=1.6.2 # BSD sphinx_rtd_theme==0.1.7 hacking<0.11,>=0.10.0