Skip to content

Commit ae62beb

Browse files
authored
Merge pull request #515 from stackhpc/upstream/2025.1-2026-01-26
Synchronise 2025.1 with upstream
2 parents a2ec463 + 7905d65 commit ae62beb

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

README.rst

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@ Kolla Overview
88
.. Change things from this point on
99
1010
11-
The Kolla project is a member of the OpenStack `Big Tent
12-
Governance <https://governance.openstack.org/tc/reference/projects/index.html>`__.
11+
The Kolla project is a member of the OpenStack `Governance
12+
<https://governance.openstack.org/tc/reference/projects/index.html>`__.
1313

1414
Kolla's mission statement is:
1515

1616
::
1717

18-
To provide production-ready containers and deployment tools for operating
19-
OpenStack clouds.
18+
To provide tools to create production-ready containers and
19+
to provide deployment tools for operating OpenStack clouds.
2020

21-
Kolla provides `Docker <https://docker.com/>`__ containers,
21+
Kolla provides tools to create containers that can be run under either
22+
`Docker <https://docker.com/>`__ or `Podman <https://podman.io/>`, as well as
2223
`Ansible <https://ansible.com/>`__ playbooks to deploy OpenStack on baremetal
2324
or virtual machine to meet Kolla's mission.
2425

@@ -39,21 +40,17 @@ Quickstart <https://docs.openstack.org/kolla-ansible/latest/user/quickstart.html
3940
The Kolla Repository
4041
====================
4142

42-
The Kolla repository is one of three deliverables of the OpenStack Kolla
43-
project. The three deliverables that make up the Kolla project are:
43+
The Kolla repository is one of four deliverables of the OpenStack Kolla
44+
project. The four deliverables that make up the Kolla project are:
4445

45-
================ =========================================================
46-
Deliverable Repository
47-
================ =========================================================
48-
kolla https://opendev.org/openstack/kolla
49-
kolla-ansible https://opendev.org/openstack/kolla-ansible
50-
kayobe https://opendev.org/openstack/kayobe
51-
================ =========================================================
52-
53-
The `Docker images <https://docs.docker.com/storage/storagedriver/>`__
54-
are built by the Kolla project maintainers. A detailed process for
55-
contributing to the images can be found in the `image building
56-
guide <https://docs.openstack.org/kolla/latest/admin/image-building.html>`__.
46+
======================== ======================================================
47+
Deliverable Repository
48+
======================== ======================================================
49+
kolla https://opendev.org/openstack/kolla
50+
kolla-ansible https://opendev.org/openstack/kolla-ansible
51+
ansible-collection-kolla https://opendev.org/openstack/ansible-collection-kolla
52+
kayobe https://opendev.org/openstack/kayobe
53+
======================== ======================================================
5754

5855
The Kolla developers build images in the `kolla` namespace for every tagged
5956
release.
@@ -63,6 +60,13 @@ You can view the available images on `Docker Hub
6360

6461
$ sudo docker search kolla
6562

63+
.. warning::
64+
Kolla(-ansible) defaults to using these images in order to ease testing and
65+
demonstration setups, but they are not intended to be used beyond this.
66+
In particular, they do not undergo any security scrutiny. If you intend to
67+
deploy Kolla for production purposes, you are advised to create and curate your
68+
own set of images using the ``kolla`` tool.
69+
6670
OpenStack services
6771
------------------
6872

@@ -176,14 +180,6 @@ workflow <https://docs.openstack.org/infra/manual/developers.html>`__.
176180
<https://docs.openstack.org/kolla/latest/contributor/meeting.html>`__.
177181
- Contribute `code <https://opendev.org/openstack/kolla>`__.
178182

179-
Contributors
180-
============
181-
182-
Check out who is `contributing
183-
code <https://stackalytics.io/?module=kolla-group&metric=commits>`__ and
184-
`contributing
185-
reviews <https://stackalytics.io/?module=kolla-group&metric=marks>`__.
186-
187183
Notices
188184
=======
189185

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
prelude: >
3+
The Kolla project publishes images to quay.io.
4+
These are however only intended for demonstration and testing purposes.
5+
In particular, they do not undergo any security scrutiny. If you intend to
6+
deploy Kolla for production purposes, you are advised to create and curate your
7+
own set of images.

0 commit comments

Comments
 (0)