diff options
| author | Zuul <zuul@review.opendev.org> | 2022-06-02 12:45:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-06-02 12:45:21 +0000 |
| commit | 3e35fede9adc622610451b7b5a7f8a45b933473b (patch) | |
| tree | c0a92f9ff059194253e212398cf883aa699ae1a3 /doc/source/contributor | |
| parent | 213190ae030e9971225ea3f103b4be0a7f2532d4 (diff) | |
| parent | 8a5922fd7156fccc926da43acee05a432672931b (diff) | |
| download | kolla-3e35fede9adc622610451b7b5a7f8a45b933473b.tar.gz kolla-3e35fede9adc622610451b7b5a7f8a45b933473b.zip | |
Merge "doc: get rid of remainders of binary images"
Diffstat (limited to 'doc/source/contributor')
| -rw-r--r-- | doc/source/contributor/adding-a-new-image.rst | 9 | ||||
| -rw-r--r-- | doc/source/contributor/release-management.rst | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/doc/source/contributor/adding-a-new-image.rst b/doc/source/contributor/adding-a-new-image.rst index 1c04fe48c..2edfed9d2 100644 --- a/doc/source/contributor/adding-a-new-image.rst +++ b/doc/source/contributor/adding-a-new-image.rst @@ -40,10 +40,6 @@ OpenStack project base image is as follows: {% import "macros.j2" as macros with context %} - << binary specific steps >> - - << source specific steps >> - << common steps >> {% block << service >>_footer %}{% endblock %} @@ -77,9 +73,8 @@ be built for some distribution/architecture/build-type combinations. "bifrost-base", # someone need to get upstream working first }, - 'binary': { - "bifrost-base", - "blazar-base", + 'centos': { + "hacluster-pcs", # Missing crmsh package }, 'ubuntu+aarch64': { diff --git a/doc/source/contributor/release-management.rst b/doc/source/contributor/release-management.rst index 45a3a0743..7221052f5 100644 --- a/doc/source/contributor/release-management.rst +++ b/doc/source/contributor/release-management.rst @@ -146,8 +146,8 @@ R-17: Switch source images to current release * example: https://review.opendev.org/c/openstack/kayobe/+/763375 -R-8: Switch binary images to current release --------------------------------------------- +R-8: Switch images to current release +------------------------------------- .. note:: Debian does not provide repositories for the in-development release until much later in the cycle. @@ -157,7 +157,7 @@ R-8: Switch binary images to current release * example: https://review.opendev.org/c/openstack/kolla/+/804269 -* [kolla] Switch Ubuntu binary images to use the current in-development release +* [kolla] Switch Ubuntu images to use the current in-development release Ubuntu Cloud Archive (UCA) repository * example: https://review.opendev.org/c/openstack/kolla/+/782308 @@ -402,7 +402,7 @@ Several tasks are required to finalise the stable branch for release. * example: https://review.opendev.org/c/openstack/kolla/+/788490 -* [kolla] Switch Debian binary images to use the Debian OpenStack repository +* [kolla] Switch Debian images to use the Debian OpenStack repository for the new release .. note:: This needs to be done on the master branch and stable branch. |
