diff --git a/doc/source/_exts/badges.py b/doc/source/_exts/badges.py index e265250fa..952fcaaff 100644 --- a/doc/source/_exts/badges.py +++ b/doc/source/_exts/badges.py @@ -130,7 +130,7 @@ def _get_tag_badges(tags): for tag in tags: # NOTE(flaper87): will submit other patches to make these # tags consistent with the rest. - if tag in ['starter-kit:compute', 'tc-approved-release']: + if tag in ['starter-kit:compute']: group, tname = 'tc', tag else: group, tname = tag.split(':') diff --git a/reference/licensing.rst b/reference/licensing.rst index 5da4c22c1..2315f0219 100644 --- a/reference/licensing.rst +++ b/reference/licensing.rst @@ -5,9 +5,7 @@ Official OpenStack projects need to follow a number of rules when it comes to licensing. -In order to be considered for inclusion in the -:ref:`tag-tc:approved-release`, the project must be licensed under `Apache -License, Version 2.0`_ (ASLv2). +The project must be licensed under `Apache License, Version 2.0`_ (ASLv2). .. _Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 @@ -17,8 +15,7 @@ licensed under a license supported by the `Contributor License Agreement`_ (CLA) which allows redistribution by the OpenStack Foundation under ASLv2 (currently only the MIT and both forms of the BSD license meet this requirement). In particular, service projects -are recommended to *always* pick ASLv2 so that they may be included in -the TC-approved release in the future. +are recommended to *always* pick ASLv2. .. _Contributor License Agreement: https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement diff --git a/reference/projects.yaml b/reference/projects.yaml index b84cbcb7c..8eadf671f 100644 --- a/reference/projects.yaml +++ b/reference/projects.yaml @@ -129,7 +129,6 @@ cinder: repos: - openstack/cinder tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -250,7 +249,6 @@ designate: repos: - openstack/designate tags: - - tc:approved-release - starter-kit:kubernetes-in-virt - stable:follows-policy - assert:follows-standard-deprecation @@ -351,7 +349,6 @@ glance: tags: - assert:follows-standard-deprecation - assert:supports-upgrade - - tc:approved-release - starter-kit:compute - starter-kit:kubernetes-in-virt - vulnerability:managed @@ -391,7 +388,6 @@ heat: repos: - openstack/heat tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -457,7 +453,6 @@ horizon: repos: - openstack/horizon tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -576,7 +571,6 @@ ironic: repos: - openstack/ironic tags: - - tc:approved-release - stable:follows-policy - assert:supports-upgrade - assert:supports-accessible-upgrade @@ -704,7 +698,6 @@ keystone: repos: - openstack/keystone tags: - - tc:approved-release - starter-kit:compute - starter-kit:kubernetes-in-virt - vulnerability:managed @@ -852,7 +845,6 @@ manila: repos: - openstack/manila tags: - - tc:approved-release - starter-kit:kubernetes-in-virt - assert:follows-standard-deprecation - assert:supports-upgrade @@ -1119,7 +1111,6 @@ neutron: repos: - openstack/neutron tags: - - tc:approved-release - stable:follows-policy - starter-kit:compute - starter-kit:kubernetes-in-virt @@ -1136,7 +1127,6 @@ neutron: repos: - openstack/neutron-lib tags: - - tc:approved-release - stable:follows-policy - vulnerability:managed neutron-specs: @@ -1192,7 +1182,6 @@ nova: repos: - openstack/nova tags: - - tc:approved-release - starter-kit:compute - starter-kit:kubernetes-in-virt - vulnerability:managed @@ -2744,7 +2733,6 @@ sahara: repos: - openstack/sahara tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -2771,7 +2759,6 @@ sahara: repos: - openstack/sahara-plugin-ambari tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -2780,7 +2767,6 @@ sahara: repos: - openstack/sahara-plugin-cdh tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -2789,7 +2775,6 @@ sahara: repos: - openstack/sahara-plugin-mapr tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -2798,7 +2783,6 @@ sahara: repos: - openstack/sahara-plugin-spark tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -2807,7 +2791,6 @@ sahara: repos: - openstack/sahara-plugin-storm tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -2816,7 +2799,6 @@ sahara: repos: - openstack/sahara-plugin-vanilla tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation - assert:supports-upgrade @@ -2977,7 +2959,6 @@ swift: repos: - openstack/swift tags: - - tc:approved-release - vulnerability:managed - stable:follows-policy - assert:follows-standard-deprecation @@ -3047,7 +3028,6 @@ Telemetry: tags: - assert:follows-standard-deprecation - assert:supports-upgrade - - tc:approved-release telemetry-specs: release-management: none repos: @@ -3236,7 +3216,6 @@ trove: repos: - openstack/trove tags: - - tc:approved-release - vulnerability:managed - assert:follows-standard-deprecation trove-dashboard: diff --git a/reference/tags/index.rst b/reference/tags/index.rst index dfa630775..49c400147 100644 --- a/reference/tags/index.rst +++ b/reference/tags/index.rst @@ -24,13 +24,11 @@ TC Managed Tags starter-kit_compute starter-kit_kubernetes-in-virt - tc_approved-release -.. toctree:: - :maxdepth: 1 - :hidden: - - tc-approved-release +OpenStack Technical Committee Approved Release +---------------------------------------------- +All deliverables created by our `Official OpenStack Projects Teams `_ +are "OpenStack Technical Committee Approved Release". Team Description Tags ===================== diff --git a/reference/tags/tc-approved-release.rst b/reference/tags/tc-approved-release.rst deleted file mode 100644 index 95c62d4fc..000000000 --- a/reference/tags/tc-approved-release.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. - This work is licensed under a Creative Commons Attribution 3.0 - Unported License. - http://creativecommons.org/licenses/by/3.0/legalcode - - -===================== - tc-approved-release -===================== - -This tag has been renamed to :ref:`tag-tc:approved-release` diff --git a/reference/tags/tc_approved-release.rst b/reference/tags/tc_approved-release.rst deleted file mode 100644 index 7d405fde7..000000000 --- a/reference/tags/tc_approved-release.rst +++ /dev/null @@ -1,93 +0,0 @@ -.. - This work is licensed under a Creative Commons Attribution 3.0 - Unported License. - http://creativecommons.org/licenses/by/3.0/legalcode - -.. _`tag-tc:approved-release`: - -===================== - tc:approved-release -===================== - -.. NOTE(dhellmann): I don't especially like the name of this tag, but - I decided its use would be more easily communicated if we stuck - with the designation from the bylaws rather than making up a - different name. - -This tag is used to indicate the projects the TC recommends to the -OpenStack Foundation Board as candidates for trademark use under the -OpenStack Foundation trademark policy. - - -Application to current deliverables -=================================== - -.. tagged-projects:: tc:approved-release - - -Rationale -========= - -The "OpenStack TC Approved Release" is used as the superset of -projects used by the OpenStack Foundation when creating commercial -trademark programs. A commercial trademark program would not be able -to have any requirements for code or functionality outside of what is -included in this group. The foundation may choose to create trademark -programs only related to a subset of the projects. - -The projects included in this group should generally represent the -most mature OpenStack projects. OpenStack Foundation commercial -trademark programs use criteria developed by the Interop working group -(formerly the DefCore committee) of the Foundation board of -directors. This criteria is partially based on a set of capabilities -provided by OpenStack Projects. The capabilities adopted by the -Interop committee are ones that are mature, well adopted, and not -expected to change in the near future. - -This tag is applied to projects the TC considers suitable to be -included in the set of "Trademark Designated OpenStack Software" as -defined in the Foundation bylaws. Applying the tag is an indication -that the TC is including the project in the "OpenStack TC Approved -Release", following the guidelines laid out in sections 4.1 and 4.13 -of `the OpenStack Foundation Bylaws`_. - -.. _the OpenStack Foundation Bylaws: http://www.openstack.org/legal/bylaws-of-the-openstack-foundation - -Requirements -============ - -A project that receives the "tc:approved-release" tag should at a -minimum meet the following requirements: - -* The TC approves the request for the tag to be applied to a project. - -*Additional criteria for applying this tag will be worked out at a -future date.* - -Tag application process -======================= - -The sole purpose of this tag is defining the pool of projects that -could be used for the OpenStack Trademark program. It is the role of -the Board (as well as working groups like the Interop committee) to -best understand the demand for the commercial trademark by OpenStack -users and vendors. - -As such, changes proposing to add or remove this tag are expected to -come from the Interop working group based on their judgment that the -marketplace has evolved and a new set of projects should be used in -future versions of trademark programs. - -Deprecation -=========== - -Deprecation of the use of this tag is governed by the bylaws, the -trademark policy set out by the board, and the procedures the Board -and TC have agreed to follow for communicating changes to the -"Trademark Designated OpenStack Software". - -.. note:: - - We need a reference to that agreement, when we have it. We also - need a reference to the deprecation policy the Board adopts, since - that will influence our policy by at least setting a minimum.