From b86d6b56608f08c6d8580986e9a4d0de9d8806a0 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 29 Jun 2017 09:10:04 +0200 Subject: [PATCH] move documentation into the new standard layout This change moves existing files. It is not meant to be the final word on how the main page looks or how the other files are organized, but it gets everything roughly into shape. If the barbican team wants to make changes, please do those as follow-up patches. Note this does not touch the api directory, this one needs to be migrated to the api-ref. This is part of the docs migration work for Pike. Change-Id: Ibb9d971806964ac185882272514ee9563089d69d --- .../access_control.rst | 0 .../barbican_manage.rst | 0 .../database_cleaning.rst | 0 .../{admin-guide-cloud => admin}/index.rst | 1 + .../{upgrade/index.rst => admin/upgrade.rst} | 0 doc/source/{setup => configuration}/audit.rst | 0 doc/source/{setup => configuration}/index.rst | 0 .../{setup => configuration}/keystone.rst | 0 .../{setup => configuration}/noauth.rst | 0 .../plugin_backends.rst | 0 .../troubleshooting.rst | 0 .../architecture.rst | 0 .../database_migrations.rst | 0 .../{contribute => contributor}/dataflow.rst | 0 .../dependencies.rst | 0 doc/source/{setup => contributor}/dev.rst | 0 .../{setup => contributor}/devstack.rst | 0 .../getting_involved.rst | 0 doc/source/contributor/index.rst | 31 ++ .../{ => contributor}/plugin/crypto.rst | 0 doc/source/{ => contributor}/plugin/index.rst | 0 .../{ => contributor}/plugin/secret_store.rst | 0 .../{contribute => contributor}/structure.rst | 0 doc/source/{ => contributor}/testing.rst | 0 doc/source/index.rst | 59 +--- .../source/install}/barbican-backend.rst | 0 .../source/install}/common_configure.rst | 0 .../source/install}/common_prerequisites.rst | 0 .../source/install}/get_started.rst | 0 .../source => doc/source/install}/index.rst | 0 .../source/install}/install-obs.rst | 0 .../source/install}/install-rdo.rst | 0 .../source/install}/install-ubuntu.rst | 0 .../source => doc/source/install}/install.rst | 0 .../source/install}/next-steps.rst | 0 .../source => doc/source/install}/verify.rst | 0 install-guide/source/conf.py | 302 ------------------ 37 files changed, 43 insertions(+), 350 deletions(-) rename doc/source/{admin-guide-cloud => admin}/access_control.rst (100%) rename doc/source/{admin-guide-cloud => admin}/barbican_manage.rst (100%) rename doc/source/{admin-guide-cloud => admin}/database_cleaning.rst (100%) rename doc/source/{admin-guide-cloud => admin}/index.rst (96%) rename doc/source/{upgrade/index.rst => admin/upgrade.rst} (100%) rename doc/source/{setup => configuration}/audit.rst (100%) rename doc/source/{setup => configuration}/index.rst (100%) rename doc/source/{setup => configuration}/keystone.rst (100%) rename doc/source/{setup => configuration}/noauth.rst (100%) rename doc/source/{setup => configuration}/plugin_backends.rst (100%) rename doc/source/{setup => configuration}/troubleshooting.rst (100%) rename doc/source/{contribute => contributor}/architecture.rst (100%) rename doc/source/{contribute => contributor}/database_migrations.rst (100%) rename doc/source/{contribute => contributor}/dataflow.rst (100%) rename doc/source/{contribute => contributor}/dependencies.rst (100%) rename doc/source/{setup => contributor}/dev.rst (100%) rename doc/source/{setup => contributor}/devstack.rst (100%) rename doc/source/{contribute => contributor}/getting_involved.rst (100%) create mode 100644 doc/source/contributor/index.rst rename doc/source/{ => contributor}/plugin/crypto.rst (100%) rename doc/source/{ => contributor}/plugin/index.rst (100%) rename doc/source/{ => contributor}/plugin/secret_store.rst (100%) rename doc/source/{contribute => contributor}/structure.rst (100%) rename doc/source/{ => contributor}/testing.rst (100%) rename {install-guide/source => doc/source/install}/barbican-backend.rst (100%) rename {install-guide/source => doc/source/install}/common_configure.rst (100%) rename {install-guide/source => doc/source/install}/common_prerequisites.rst (100%) rename {install-guide/source => doc/source/install}/get_started.rst (100%) rename {install-guide/source => doc/source/install}/index.rst (100%) rename {install-guide/source => doc/source/install}/install-obs.rst (100%) rename {install-guide/source => doc/source/install}/install-rdo.rst (100%) rename {install-guide/source => doc/source/install}/install-ubuntu.rst (100%) rename {install-guide/source => doc/source/install}/install.rst (100%) rename {install-guide/source => doc/source/install}/next-steps.rst (100%) rename {install-guide/source => doc/source/install}/verify.rst (100%) delete mode 100644 install-guide/source/conf.py diff --git a/doc/source/admin-guide-cloud/access_control.rst b/doc/source/admin/access_control.rst similarity index 100% rename from doc/source/admin-guide-cloud/access_control.rst rename to doc/source/admin/access_control.rst diff --git a/doc/source/admin-guide-cloud/barbican_manage.rst b/doc/source/admin/barbican_manage.rst similarity index 100% rename from doc/source/admin-guide-cloud/barbican_manage.rst rename to doc/source/admin/barbican_manage.rst diff --git a/doc/source/admin-guide-cloud/database_cleaning.rst b/doc/source/admin/database_cleaning.rst similarity index 100% rename from doc/source/admin-guide-cloud/database_cleaning.rst rename to doc/source/admin/database_cleaning.rst diff --git a/doc/source/admin-guide-cloud/index.rst b/doc/source/admin/index.rst similarity index 96% rename from doc/source/admin-guide-cloud/index.rst rename to doc/source/admin/index.rst index 229a9b47..5c9e7b86 100644 --- a/doc/source/admin-guide-cloud/index.rst +++ b/doc/source/admin/index.rst @@ -12,3 +12,4 @@ management of secrets. access_control.rst barbican_manage.rst database_cleaning.rst + upgrade.rst diff --git a/doc/source/upgrade/index.rst b/doc/source/admin/upgrade.rst similarity index 100% rename from doc/source/upgrade/index.rst rename to doc/source/admin/upgrade.rst diff --git a/doc/source/setup/audit.rst b/doc/source/configuration/audit.rst similarity index 100% rename from doc/source/setup/audit.rst rename to doc/source/configuration/audit.rst diff --git a/doc/source/setup/index.rst b/doc/source/configuration/index.rst similarity index 100% rename from doc/source/setup/index.rst rename to doc/source/configuration/index.rst diff --git a/doc/source/setup/keystone.rst b/doc/source/configuration/keystone.rst similarity index 100% rename from doc/source/setup/keystone.rst rename to doc/source/configuration/keystone.rst diff --git a/doc/source/setup/noauth.rst b/doc/source/configuration/noauth.rst similarity index 100% rename from doc/source/setup/noauth.rst rename to doc/source/configuration/noauth.rst diff --git a/doc/source/setup/plugin_backends.rst b/doc/source/configuration/plugin_backends.rst similarity index 100% rename from doc/source/setup/plugin_backends.rst rename to doc/source/configuration/plugin_backends.rst diff --git a/doc/source/setup/troubleshooting.rst b/doc/source/configuration/troubleshooting.rst similarity index 100% rename from doc/source/setup/troubleshooting.rst rename to doc/source/configuration/troubleshooting.rst diff --git a/doc/source/contribute/architecture.rst b/doc/source/contributor/architecture.rst similarity index 100% rename from doc/source/contribute/architecture.rst rename to doc/source/contributor/architecture.rst diff --git a/doc/source/contribute/database_migrations.rst b/doc/source/contributor/database_migrations.rst similarity index 100% rename from doc/source/contribute/database_migrations.rst rename to doc/source/contributor/database_migrations.rst diff --git a/doc/source/contribute/dataflow.rst b/doc/source/contributor/dataflow.rst similarity index 100% rename from doc/source/contribute/dataflow.rst rename to doc/source/contributor/dataflow.rst diff --git a/doc/source/contribute/dependencies.rst b/doc/source/contributor/dependencies.rst similarity index 100% rename from doc/source/contribute/dependencies.rst rename to doc/source/contributor/dependencies.rst diff --git a/doc/source/setup/dev.rst b/doc/source/contributor/dev.rst similarity index 100% rename from doc/source/setup/dev.rst rename to doc/source/contributor/dev.rst diff --git a/doc/source/setup/devstack.rst b/doc/source/contributor/devstack.rst similarity index 100% rename from doc/source/setup/devstack.rst rename to doc/source/contributor/devstack.rst diff --git a/doc/source/contribute/getting_involved.rst b/doc/source/contributor/getting_involved.rst similarity index 100% rename from doc/source/contribute/getting_involved.rst rename to doc/source/contributor/getting_involved.rst diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst new file mode 100644 index 00000000..918df0c6 --- /dev/null +++ b/doc/source/contributor/index.rst @@ -0,0 +1,31 @@ +======================= +Barbican for Developers +======================= + +If you're new to OpenStack development you should start by reading the +`OpenStack Developer's Guide`_. + +.. _`OpenStack Developer's Guide`: http://docs.openstack.org/infra/manual/developers.html + +Once you've read the OpenStack guide you'll be ready to set up a local barbican +development environment. + +.. toctree:: + :maxdepth: 1 + + dev.rst + devstack.rst + +When you're ready to dive deeper in to barbican take a look at: + +.. toctree:: + :maxdepth: 1 + + getting_involved.rst + architecture.rst + structure.rst + dataflow.rst + dependencies.rst + database_migrations.rst + plugin/index.rst + testing.rst diff --git a/doc/source/plugin/crypto.rst b/doc/source/contributor/plugin/crypto.rst similarity index 100% rename from doc/source/plugin/crypto.rst rename to doc/source/contributor/plugin/crypto.rst diff --git a/doc/source/plugin/index.rst b/doc/source/contributor/plugin/index.rst similarity index 100% rename from doc/source/plugin/index.rst rename to doc/source/contributor/plugin/index.rst diff --git a/doc/source/plugin/secret_store.rst b/doc/source/contributor/plugin/secret_store.rst similarity index 100% rename from doc/source/plugin/secret_store.rst rename to doc/source/contributor/plugin/secret_store.rst diff --git a/doc/source/contribute/structure.rst b/doc/source/contributor/structure.rst similarity index 100% rename from doc/source/contribute/structure.rst rename to doc/source/contributor/structure.rst diff --git a/doc/source/testing.rst b/doc/source/contributor/testing.rst similarity index 100% rename from doc/source/testing.rst rename to doc/source/contributor/testing.rst diff --git a/doc/source/index.rst b/doc/source/index.rst index 5a7da294..4150b188 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -5,8 +5,17 @@ Barbican is the OpenStack Key Manager service. It provides secure storage, provisioning and management of secret data. This includes keying material such as Symmetric Keys, Asymmetric Keys, Certificates and raw binary data. -Barbican for Users -================== +.. toctree:: + :maxdepth: 2 + + user/index + admin/index + install/index + configuration/index + contributor/index + +API Reference +============= If you're trying to learn how to use barbican, you can start by reading about `Secrets in the Barbican API Guide `__. @@ -19,52 +28,6 @@ API. api/index.rst -Barbican for Developers -======================= - -If you're new to OpenStack development you should start by reading the -`OpenStack Developer's Guide`_. - -.. _`OpenStack Developer's Guide`: http://docs.openstack.org/infra/manual/developers.html - -Once you've read the OpenStack guide you'll be ready to set up a local barbican -development environment. - -.. toctree:: - :maxdepth: 1 - - setup/dev.rst - setup/devstack.rst - -When you're ready to dive deeper in to barbican take a look at: - -.. toctree:: - :maxdepth: 1 - - contribute/getting_involved.rst - contribute/architecture.rst - contribute/structure.rst - contribute/dataflow.rst - contribute/dependencies.rst - contribute/database_migrations.rst - plugin/index.rst - testing.rst - -Barbican for Operators -====================== - -If you're looking for information for deploying and configuring barbican you -will probably want to read: - -.. toctree:: - :maxdepth: 1 - - setup/index.rst - admin-guide-cloud/index.rst - upgrade/index.rst - -This documentation is generated by the Sphinx toolkit and lives in the source -tree. Indices and tables diff --git a/install-guide/source/barbican-backend.rst b/doc/source/install/barbican-backend.rst similarity index 100% rename from install-guide/source/barbican-backend.rst rename to doc/source/install/barbican-backend.rst diff --git a/install-guide/source/common_configure.rst b/doc/source/install/common_configure.rst similarity index 100% rename from install-guide/source/common_configure.rst rename to doc/source/install/common_configure.rst diff --git a/install-guide/source/common_prerequisites.rst b/doc/source/install/common_prerequisites.rst similarity index 100% rename from install-guide/source/common_prerequisites.rst rename to doc/source/install/common_prerequisites.rst diff --git a/install-guide/source/get_started.rst b/doc/source/install/get_started.rst similarity index 100% rename from install-guide/source/get_started.rst rename to doc/source/install/get_started.rst diff --git a/install-guide/source/index.rst b/doc/source/install/index.rst similarity index 100% rename from install-guide/source/index.rst rename to doc/source/install/index.rst diff --git a/install-guide/source/install-obs.rst b/doc/source/install/install-obs.rst similarity index 100% rename from install-guide/source/install-obs.rst rename to doc/source/install/install-obs.rst diff --git a/install-guide/source/install-rdo.rst b/doc/source/install/install-rdo.rst similarity index 100% rename from install-guide/source/install-rdo.rst rename to doc/source/install/install-rdo.rst diff --git a/install-guide/source/install-ubuntu.rst b/doc/source/install/install-ubuntu.rst similarity index 100% rename from install-guide/source/install-ubuntu.rst rename to doc/source/install/install-ubuntu.rst diff --git a/install-guide/source/install.rst b/doc/source/install/install.rst similarity index 100% rename from install-guide/source/install.rst rename to doc/source/install/install.rst diff --git a/install-guide/source/next-steps.rst b/doc/source/install/next-steps.rst similarity index 100% rename from install-guide/source/next-steps.rst rename to doc/source/install/next-steps.rst diff --git a/install-guide/source/verify.rst b/doc/source/install/verify.rst similarity index 100% rename from install-guide/source/verify.rst rename to doc/source/install/verify.rst diff --git a/install-guide/source/conf.py b/install-guide/source/conf.py deleted file mode 100644 index 51879503..00000000 --- a/install-guide/source/conf.py +++ /dev/null @@ -1,302 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import os -# import sys - - -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 -# documentation root, use os.path.abspath to make it absolute, like shown here. -# sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ------------------------------------------------ - -# If your documentation needs a minimal Sphinx version, state it here. -# needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. -# TODO(ajaeger): enable PDF building, for example add 'rst2pdf.pdfbuilder' -# extensions = - -# Add any paths that contain templates here, relative to this directory. -# templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -# source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'Installation Guide for Key Manager Service' -bug_tag = u'install-guide' -copyright = u'2016, OpenStack contributors' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '0.1' -# The full version, including alpha/beta/rc tags. -release = '0.1' - -# A few variables have to be set for the log-a-bug feature. -# giturl: The location of conf.py on Git. Must be set manually. -# gitsha: The SHA checksum of the bug description. Automatically -# extracted from git log. -# bug_tag: Tag for categorizing the bug. Must be set manually. -# These variables are passed to the logabug code via html_context. -giturl = (u'https://git.openstack.org/cgit/openstack/barbican/' - 'tree/install-guide/source') -git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" -gitsha = os.popen(git_cmd).read().strip('\n') -html_context = {"gitsha": gitsha, "bug_tag": bug_tag, - "giturl": giturl, - "bug_project": "barbican"} - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -# language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -# today = '' -# Else, today_fmt is used as the format for a strftime call. -# today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ["common_prerequisites.rst", "common_configure.rst"] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -# default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -# add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -# add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -# show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -# modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -# keep_warnings = False - - -# -- Options for HTML output ---------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'openstackdocs' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -# html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -html_theme_path = [openstackdocstheme.get_html_theme_path()] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -# html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -# html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -# html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -# html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -# html_static_path = [] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -# html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -# So that we can enable "log-a-bug" links from each output HTML page, this -# variable must be set to a format that includes year, month, day, hours and -# minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -# html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -# html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -# html_additional_pages = {} - -# If false, no module index is generated. -# html_domain_indices = True - -# If false, no index is generated. -html_use_index = False - -# If true, the index is split into individual pages for each letter. -# html_split_index = False - -# If true, links to the reST sources are added to the pages. -html_show_sourcelink = False - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -# html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -# html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -# html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -# html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'install-guide' - -# If true, publish source files -html_copy_source = False - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = { - # The paper size ('letterpaper' or 'a4paper'). - # 'papersize': 'letterpaper', - - # The font size ('10pt', '11pt' or '12pt'). - # 'pointsize': '10pt', - - # Additional stuff for the LaTeX preamble. - # 'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - ('index', 'InstallGuide.tex', u'Install Guide', - u'OpenStack contributors', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -# latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -# latex_use_parts = False - -# If true, show page references after internal links. -# latex_show_pagerefs = False - -# If true, show URL addresses after external links. -# latex_show_urls = False - -# Documents to append as an appendix to all manuals. -# latex_appendices = [] - -# If false, no module index is generated. -# latex_domain_indices = True - - -# -- Options for manual page output --------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'installguide', u'Install Guide', - [u'OpenStack contributors'], 1) -] - -# If true, show URL addresses after external links. -# man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'InstallGuide', u'Install Guide', - u'OpenStack contributors', 'InstallGuide', - 'This guide shows OpenStack end users how to install ' - 'an OpenStack cloud.', 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -# texinfo_appendices = [] - -# If false, no module index is generated. -# texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -# texinfo_show_urls = 'footnote' - -# If true, do not generate a @detailmenu in the "Top" node's menu. -# texinfo_no_detailmenu = False - -# -- Options for Internationalization output ------------------------------ -locale_dirs = ['locale/'] - -# -- Options for PDF output -------------------------------------------------- - -pdf_documents = [ - ('index', u'InstallGuide', u'Install Guide', - u'OpenStack contributors') -]