aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-02-22 18:46:05 +0000
committerGerrit Code Review <review@openstack.org>2022-02-22 18:46:05 +0000
commit9c9c685b35863ca2d2301bdb2204e1b2ebf84801 (patch)
tree413c242e275b75fc1b260ee3cd590e496f07ed87
parent0236bc6d940ddb35c0fdbaac9dc55885b972d2b6 (diff)
parent8f43bfed55e6c48f629d642374b2325e9fe1da20 (diff)
downloadkolla-9c9c685b35863ca2d2301bdb2204e1b2ebf84801.tar.gz
kolla-9c9c685b35863ca2d2301bdb2204e1b2ebf84801.zip
Merge "docs: add ansible-collection-kolla"
-rw-r--r--doc/source/contributor/release-management.rst18
-rw-r--r--doc/source/index.rst4
2 files changed, 17 insertions, 5 deletions
diff --git a/doc/source/contributor/release-management.rst b/doc/source/contributor/release-management.rst
index ed1414f66..d3d5d830f 100644
--- a/doc/source/contributor/release-management.rst
+++ b/doc/source/contributor/release-management.rst
@@ -85,6 +85,8 @@ This needs to be done for each of the following projects:
* https://launchpad.net/kolla-ansible
+* https://launchpad.net/ansible-collection-kolla
+
At the beginning of a cycle, ensure a named series exists for the cycle in each
project. If not, create one via the project landing page (e.g.
https://launchpad.net/kolla) - in the "Series and milestones" section click in
@@ -203,7 +205,8 @@ Prior to creating an RC1 release candidate:
* example (kayobe): https://review.opendev.org/c/openstack/kayobe/+/788432
-* [kolla][kolla ansible] Mark bugs on Launchpad with the correct milestone
+* [kolla][kolla ansible][ansible-collection-kolla] Mark bugs on Launchpad with
+ the correct milestone
* this command is useful to check for commits that fixed bugs:
@@ -239,13 +242,13 @@ stable branch is cut.
<https://releases.openstack.org/reference/using.html#using-new-release-command>`__
tool for these activities.
-* [kolla][kolla-ansible] Create RC1 and stable branches by submitting patches
- to the releases repository
+* [kolla][kolla-ansible][ansible-collection-kolla] Create RC1 and stable
+ branches by submitting patches to the releases repository
* example: https://review.opendev.org/c/openstack/releases/+/786824
-* [kolla][kolla-ansible] Approve bot-proposed patches to master and the new
- stable branch
+* [kolla][kolla-ansible][ansible-collection-kolla] Approve bot-proposed patches
+ to master and the new stable branch
* [kolla][kolla-ansible] Ensure static links to documentation are enabled
@@ -376,6 +379,11 @@ R+0 to R+13: Finalise stable branch
Several tasks are required to finalise the stable branch for release.
+* [kolla ansible][kayobe] Switch to use the new branch of
+ ``ansible-collection-kolla`` in ``requirements.yml``.
+
+ .. note:: This needs to be done on the stable branch.
+
* [kolla ansible] Switch to use the newly tagged container images (the branch
for development mode on the new stable branch follows automatically since
Victoria)
diff --git a/doc/source/index.rst b/doc/source/index.rst
index b38e639db..db2e7862f 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -33,6 +33,10 @@ subproject of Kolla that deploys the Kolla container images using Ansible.
that uses Kolla Ansible and Bifrost to deploy an OpenStack control plane to
bare metal.
+`ansible-collection-kolla
+<https://docs.openstack.org/ansible-collection-kolla/latest/>`_ is a subproject
+of Kolla that provides common Ansible content for use by Kolla projects.
+
Site Notes
==========