diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/admin/image-building.rst | 18 | ||||
| -rw-r--r-- | doc/source/admin/kolla_api.rst | 2 | ||||
| -rw-r--r-- | doc/source/support_matrix.rst | 1 |
3 files changed, 0 insertions, 21 deletions
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst index 97f2ba8ac..f5a110a7a 100644 --- a/doc/source/admin/image-building.rst +++ b/doc/source/admin/image-building.rst @@ -33,7 +33,6 @@ There are following distros (bases) available for building images: - centos - debian -- rhel (deprecated) - ubuntu See the :ref:`support matrix <support-matrix-base-images>` for information on @@ -233,23 +232,6 @@ All leaf Dockerfiles, i.e. those meant for direct consumption, additionally have a ``footer`` block which is then guaranteed to exist once at the very end of the image recipe chain. -RHEL containers and RHN -^^^^^^^^^^^^^^^^^^^^^^^ - -To build RHEL containers, it is necessary to include registration with RHN -of the container runtime operating system. To obtain a RHN -username/password/pool id, contact Red Hat. Use template's header block in the -overrides file, e.g.: - -.. code-block:: jinja - - {% extends parent_template %} - - {% block base_header %} - RUN subscription-manager register --user=<user-name> \ - --password=<password> && subscription-manager attach --pool <pool-id> - {% endblock %} - Packages customisation ---------------------- diff --git a/doc/source/admin/kolla_api.rst b/doc/source/admin/kolla_api.rst index 4c4bd69f5..b366de696 100644 --- a/doc/source/admin/kolla_api.rst +++ b/doc/source/admin/kolla_api.rst @@ -170,5 +170,3 @@ scripts: ubuntu) * **KOLLA_INSTALL_TYPE**: ``install_type`` used to build the image (binary, source) -* **KOLLA_INSTALL_METATYPE**: ``install_metatype`` used to build the image - (rdo, ...) diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst index 922456ff7..8049f248b 100644 --- a/doc/source/support_matrix.rst +++ b/doc/source/support_matrix.rst @@ -19,7 +19,6 @@ Distribution Default base Default base tag ================== =============================== ================ CentOS Stream 8 quay.io/centos/centos stream8 Debian Bullseye debian bullseye -RHEL8 (deprecated) registry.access.redhat.com/ubi8 latest Ubuntu Focal ubuntu 20.04 ================== =============================== ================ |
