From 8a5922fd7156fccc926da43acee05a432672931b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 2 Jun 2022 12:03:29 +0200 Subject: doc: get rid of remainders of binary images We still documented some of binary images details. While we do not have them anymore. Change-Id: I49148ed788cd35ed9f5606d8b69c5e75230433f3 --- doc/source/admin/image-building.rst | 39 +++++---------------------- doc/source/contributor/adding-a-new-image.rst | 9 ++----- doc/source/contributor/release-management.rst | 8 +++--- 3 files changed, 12 insertions(+), 44 deletions(-) (limited to 'doc/source') diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst index 821f4c8a0..e38687361 100644 --- a/doc/source/admin/image-building.rst +++ b/doc/source/admin/image-building.rst @@ -114,21 +114,6 @@ To push images to a :kolla-ansible-doc:`local registry Build OpenStack from source =========================== -When building images, there are two methods of the OpenStack install. One is -``binary``. Another is ``source``. The ``binary`` means that OpenStack will be -installed from apt/dnf. And the ``source`` means that OpenStack will be -installed from upstream sources. The default method of the OpenStack install is -``source``. It can be changed to ``binary`` using the ``-t`` option: - -.. code-block:: console - - kolla-build -t binary - -.. note:: - - Building of binary images is deprecated in Yoga. Please switch to source - ones. - The locations of OpenStack source code are written in ``kolla-build.conf``. The source's ``type`` supports ``url``, ``git`` and ``local``. The ``location`` of the ``local`` source type can point to either a directory @@ -211,7 +196,7 @@ First, create a file to contain the customisations, for example: {% extends parent_template %} # Horizon - {% block horizon_redhat_binary_setup %} + {% block horizon_ubuntu_source_setup %} RUN useradd --user-group myuser {% endblock %} @@ -249,10 +234,10 @@ Packages customisation Packages installed as part of an image build can be overridden, appended to, and deleted. Taking the Horizon example, the following packages are installed -as part of a binary install type build (among others): +as part of a package install (among others): -* ``openstack-dashboard`` -* ``openstack-magnum-ui`` +* ``gettext`` +* ``locales`` To add a package to this list, say, ``iproute``, first create a file, for example, ``template-overrides.j2``. In it place the following: @@ -286,14 +271,14 @@ append remove Remove a package from the default list. -To remove a package from that list, say ``openstack-magnum-ui``, one would do: +To remove a package from that list, say ``locales``, one would do: .. code-block:: jinja {% extends parent_template %} # Horizon - {% set horizon_packages_remove = ['openstack-magnum-ui'] %} + {% set horizon_packages_remove = ['locales'] %} Python packages build options ----------------------------- @@ -338,10 +323,6 @@ repository may be missed on subsequent builds. To solve this, the time, which will be automatically made available to the build, within an archive named ``plugins-archive``. -.. note:: - - The following is available for source build types only. - To use this, add a section to ``kolla-build.conf`` in the following format: .. path /etc/kolla/kolla-build.conf @@ -417,10 +398,6 @@ difference between ``plugins-archive`` and ``additions-archive`` is that install available plugins while ``additions-archive`` processing is left solely to the Kolla user. -.. note:: - - The following is available for source build types only. - To use this, add a section to ``kolla-build.conf`` in the following format: .. path /etc/kolla/kolla-build.conf @@ -450,10 +427,6 @@ structure: |__ additions |__jenkins -Alternatively, it is also possible to create an ``additions-archive.tar`` file -yourself bypasssing ``kolla-build.conf`` in order to work with binary build -type. - The template becomes now: .. code-block:: jinja 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. -- cgit v1.2.3