From aa284a69c23f7c892992aac61de746ad61087698 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 22 Jul 2017 12:16:24 +0200 Subject: [PATCH] Remove reno, add pike releasenotes Remove reno, we only used it for a single entry so far and since the manual is now not branching anymore, let's not do use it. Create a new pike releasenotes page. Remove unreleased page, we don't need it. Change-Id: Ieecdf0d16b26267d7ce6bfcba37d25551b226f32 --- releasenotes/config.yaml | 81 ------------------- .../update_cinder_doc-602aee5a01a1a321.yaml | 7 -- releasenotes/source/conf.py | 3 +- releasenotes/source/index.rst | 5 +- releasenotes/source/ocata.rst | 4 + releasenotes/source/pike.rst | 8 ++ releasenotes/source/unreleased.rst | 5 -- test-requirements.txt | 1 - 8 files changed, 14 insertions(+), 100 deletions(-) delete mode 100644 releasenotes/config.yaml delete mode 100644 releasenotes/notes/update_cinder_doc-602aee5a01a1a321.yaml create mode 100644 releasenotes/source/pike.rst delete mode 100644 releasenotes/source/unreleased.rst diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml deleted file mode 100644 index b1e4401190..0000000000 --- a/releasenotes/config.yaml +++ /dev/null @@ -1,81 +0,0 @@ ---- -earliest_version: -collapse_pre_releases: false -stop_at_branch_base: true -sections: - - [user_visible, User visible changes] - - [internal, Internal changes] - - [admin, Administrator Guide] - - [api, API Guides] - - [architecture_design, Architecture Design Guide] - - [cli, Command Line Interface Reference] - - [config, Configuration Reference] - - [contributor, Contributor Guide] - - [deployment, Deployment Guide] - - [enduser, End User Guide] - - [ha, High Availability Guide] - - [installation, Installation Tutorials and Guides] - - [networking, Networking Guide] - - [operations, Operations Guide] - - [security, Security Guide] - - [training, Training Guides] - - [translations, Translations] - - [user, User Guide] -template: | - --- - # For each of the following sections, add any changes relating - # to that section, or remove the section altogether if there - # are no changes relating to it. - # - # All of the list items in each of the following sections are - # combined when the release notes are rendered, so the text needs - # to be worded so that it does not depend on any information only - # available in another section, such as the prelude. This may mean - # repeating some details. - # - # If the relevant section is missing from the below list, please - # first submit a review adding it to releasenotes/config.yaml. - # This way we can ensure that we have a consistent set of sections - # without any duplication. - prelude: > - Replace this text with content to appear at the top of the - section for this release. Not every release note requires a - prelude. Usually only notes describing major features or - adding release theme details should have a prelude. - user_visible: - - List user-visible changes here. - internal: - - List internal changes here. - admin: - - List changes to the Administrator Guide here. - api: - - List changes to the API Guides here. - architecture_design: - - List changes to the Architecture Design Guide here. - cli: - - List changes to the Command Line Interface Reference Guide - here. - config: - - List changes to the Configuration Reference here. - contributor: - - List changes to the Contributor Guide here. - deployment: - - List changes to the Deployment Guide here. - enduser: - - List changes to the End User Guide here. - ha: - - List changes to the High Availability Guide here. - installation: - - List changes to the Installation Tutorials and Guides here. - networking: - - List changes to the Networking Guide here. - operations: - - List changes to the Operations Guide here. - security: - - List changes to the Security Guide here. - training: - - List changes to the Training Guides here. - translations: - - List changes to the translations here. - user: - - List changes to the User Guide here. diff --git a/releasenotes/notes/update_cinder_doc-602aee5a01a1a321.yaml b/releasenotes/notes/update_cinder_doc-602aee5a01a1a321.yaml deleted file mode 100644 index 2f3ea11e3b..0000000000 --- a/releasenotes/notes/update_cinder_doc-602aee5a01a1a321.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -config: - - | - Update Huawei cinder driver configuration. - - 1. Remove the redundant configuration. - 2. Add new features and storage system that Huawei cinder driver support. diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index a19fa9b8be..52ae3d11c7 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -37,7 +37,6 @@ import os # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'reno.sphinxext', 'openstackdocstheme' ] @@ -58,7 +57,7 @@ project = u'OpenStack Documentation Team Release Notes' repository_name = "openstack/openstack-manuals" bug_project = 'openstack-manuals' bug_tag = u'releasenotes' -copyright = u'2016, OpenStack contributors' +copyright = u'2017, 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 diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index b646e79292..965c1f5cb3 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -16,13 +16,10 @@ Thus this file covers the content of the following repositories: Contents ~~~~~~~~ -.. release-notes:: - :branch: origin/master - .. toctree:: :maxdepth: 2 - unreleased + pike.rst ocata.rst newton.rst mitaka.rst diff --git a/releasenotes/source/ocata.rst b/releasenotes/source/ocata.rst index 733d4987bd..df9f905d5e 100644 --- a/releasenotes/source/ocata.rst +++ b/releasenotes/source/ocata.rst @@ -35,6 +35,10 @@ Configuration Reference * Removed content that is not specifically configuration options. * Created sections for newly added vendor plug-ins for Ocata. +* Update Huawei cinder driver configuration to remove the redundant + configuration and add new features and storage system that Huawei + cinder driver support. + Contributor Guide ~~~~~~~~~~~~~~~~~ diff --git a/releasenotes/source/pike.rst b/releasenotes/source/pike.rst new file mode 100644 index 0000000000..64d8fc8cd1 --- /dev/null +++ b/releasenotes/source/pike.rst @@ -0,0 +1,8 @@ +============ +Pike release +============ + +The complete documentation has been reworked and most of the content +has been moved to the project team repositories. + + diff --git a/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst deleted file mode 100644 index c88b67f62f..0000000000 --- a/releasenotes/source/unreleased.rst +++ /dev/null @@ -1,5 +0,0 @@ -==================================== - Release Notes for Work In Progress -==================================== - -.. release-notes:: diff --git a/test-requirements.txt b/test-requirements.txt index a14d4db436..85f758aa9b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,7 +14,6 @@ openstackdocstheme>=1.16.0 # Apache-2.0 doc8 # Apache-2.0 requests>=2.14.2 # Apache-2.0 requestsexceptions>=1.2.0 # Apache-2.0 -reno>=1.8.0,!=2.3.1 # Apache-2.0 lxml>=2.3,!=3.7.0 # BSD PyYAML>=3.10.0 # MIT jsonschema>=2.6.0