Skip to content

Commit f7a9c7b

Browse files
committed
docs: Update following container promotion changes
1 parent 2a2b2a7 commit f7a9c7b

File tree

2 files changed

+76
-9
lines changed

2 files changed

+76
-9
lines changed

docs/usage/content-howto.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,45 @@ That is the aim of this page.
77

88
Update one or more package repositories to a new version, then build new Kolla container images from those repositories.
99

10+
If using Yoga release or earlier:
11+
12+
* [Sync package repositories](content-workflows.md#syncing-package-repositories) (optional: runs nightly as a scheduled GitHub Action)
13+
* [Update Kayobe repository versions](content-workflows.md#updating-package-repository-versions-in-kayobe-configuration)
14+
* [Build & push Kolla container images](content-workflows.md#building-container-images)
15+
* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration-yoga-release-and-earlier)
16+
* Test
17+
* Review & merge Kayobe configuration changes
18+
* [Promote container images](content-workflows.md#promoting-container-images-yoga-release-and-earlier)
19+
20+
If using Zed release onwards:
21+
1022
* [Sync package repositories](content-workflows.md#syncing-package-repositories) (optional: runs nightly as a scheduled GitHub Action)
1123
* [Update Kayobe repository versions](content-workflows.md#updating-package-repository-versions-in-kayobe-configuration)
1224
* [Build & push Kolla container images](content-workflows.md#building-container-images)
13-
* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration)
25+
* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration-zed-release-onwards)
1426
* Test
1527
* Review & merge Kayobe configuration changes
16-
* [Promote container images](content-workflows.md#promoting-container-images)
28+
* [Promote container images](content-workflows.md#promoting-container-images-zed-release-onwards)
1729

1830
## Update Kolla container images
1931

2032
Update one or more Kolla container images, without updating package repositories.
2133

34+
If using Yoga release or earlier:
35+
36+
* [Build & push Kolla container images](content-workflows.md#building-container-images)
37+
* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration-yoga-release-and-earlier)
38+
* Test
39+
* Review & merge Kayobe configuration changes
40+
* [Promote container images](content-workflows.md#promoting-container-images-yoga-release-and-earlier)
41+
42+
If using Zed release onwards:
43+
2244
* [Build & push Kolla container images](content-workflows.md#building-container-images)
23-
* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration)
45+
* [Update Kayobe container image tags](content-workflows.md#updating-container-image-tags-in-kayobe-configuration-zed-release-onwards)
2446
* Test
2547
* Review & merge Kayobe configuration changes
26-
* [Promote container images](content-workflows.md#promoting-container-images)
48+
* [Promote container images](content-workflows.md#promoting-container-images-zed-release-onwards)
2749

2850
## Add a new Kolla container image
2951

docs/usage/content-workflows.md

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,7 @@ ansible/test-pulp-container-sync.yml \
204204
ansible/test-pulp-container-publish.yml
205205
```
206206

207-
## Updating container image tags in Kayobe configuration
208-
209-
!!! note
210-
211-
This procedure is expected to change.
207+
## Updating container image tags in Kayobe configuration (Yoga release and earlier)
212208

213209
The image tag used deploy containers may be updated for all images in [etc/kayobe/kolla.yml](https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/wallaby/etc/kayobe/kolla.yml), or for specific images in [etc/kayobe/kolla/globals.yml](https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/wallaby/etc/kayobe/kolla/globals.yml).
214210
Currently this is a manual process.
@@ -237,6 +233,55 @@ Alternatively, to update the tag for a specific container, update `etc/kayobe/ko
237233
skydive_analyzer_tag: wallaby-20220811T091848
238234
```
239235

236+
## Updating container image tags in Kayobe configuration (Zed release onwards)
237+
238+
The image tags used deploy containers are defined in [etc/kayobe/kolla-image-tags.yml](https://github.com/stackhpc/stackhpc-kayobe-config/blob/stackhpc/zed/etc/kayobe/kolla-image-tags.yml).
239+
Currently updating these is a manual process.
240+
241+
Use the new tag from the [container image build](#building-container-images).
242+
243+
For example, to update the default tag for all images (used where no service-specific tag has been set), update the `openstack` key, and remove all other keys:
244+
245+
```yaml
246+
# Dict of Kolla image tags to deploy for each service.
247+
# Each key is the tag variable prefix name, and the value is another dict,
248+
# where the key is the OS distro and the value is the tag to deploy.
249+
kolla_image_tags:
250+
openstack:
251+
rocky-9: zed-rocky-9-20230101T000000
252+
ubuntu-jammy: zed-ubuntu-jammy-20230101T000000
253+
```
254+
255+
Alternatively, update the tag for all containers in a service, e.g. for all `nova` containers:
256+
257+
```yaml
258+
# Dict of Kolla image tags to deploy for each service.
259+
# Each key is the tag variable prefix name, and the value is another dict,
260+
# where the key is the OS distro and the value is the tag to deploy.
261+
kolla_image_tags:
262+
openstack:
263+
rocky-9: zed-rocky-9-20230101T000000
264+
ubuntu-jammy: zed-ubuntu-jammy-20230101T000000
265+
nova:
266+
rocky-9: zed-rocky-9-20230102T000000
267+
ubuntu-jammy: zed-ubuntu-jammy-20230102T000000
268+
```
269+
270+
Alternatively, update the tag for a specific container, e.g. for the `nova_compute` container:
271+
272+
```yaml
273+
# Dict of Kolla image tags to deploy for each service.
274+
# Each key is the tag variable prefix name, and the value is another dict,
275+
# where the key is the OS distro and the value is the tag to deploy.
276+
kolla_image_tags:
277+
openstack:
278+
rocky-9: zed-rocky-9-20230101T000000
279+
ubuntu-jammy: zed-ubuntu-jammy-20230101T000000
280+
nova_compute:
281+
rocky-9: zed-rocky-9-20230103T000000
282+
ubuntu-jammy: zed-ubuntu-jammy-20230103T000000
283+
```
284+
240285
## Promoting container images (Zed release onwards)
241286

242287
!!! note

0 commit comments

Comments
 (0)