openstack
/
diskimage-builder
Code Issues Proposed changes

Make DIB_DNF_MODULE_STREAMS part of yum element 

While building cloud images, it is common to set modules
for CentOS and RHEL images. Earlier it was part of rhel-common
which was specific to RHEL OS not for CentOS. Moving it
under yum element as module/stream can be enabled or disabled
via dnf itself.

Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: Idc0f277f97e92e4d003f059f01b59f1b5513da34
This commit is contained in:
Chandan Kumar (raukadah) 2021-04-07 16:03:19 +05:30
parent b4f768117f
commit ced54fea75
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
diskimage_builder/elements/rhel-common/README.rst
View File

@ -31,10 +31,6 @@ use with RHEL7, you do not need to set any DIB_RHSM variables. The scripts
named with "rhel-registration" have not been developed or tested for RHEL6. named with "rhel-registration" have not been developed or tested for RHEL6.
For information on building RHEL6 images, please see the rhel element README. For information on building RHEL6 images, please see the rhel element README.
The 01-module-configuration script is specific to RHEL8. RHEL8 includes
various versions of software which can be selected during installation, some
may be older and/or incompatible with a given release of OpenStack.
Environment Variables For Regisration during Image Creation Environment Variables For Regisration during Image Creation
----------------------------------------------------------- -----------------------------------------------------------
The following environment variables are used for registering a RHEL instance The following environment variables are used for registering a RHEL instance
@ -249,21 +245,3 @@ use the following metadata::
"method":"portal" "method":"portal"
} }
} }
Environment Variables for Module Selection during Image Creation
----------------------------------------------------------------
The following environment variable is used to select module streams to be
enabled during an image build on RHEL8. Any existing stream for the given
module is first disabled prior to enabling the specified stream.
#### DIB\_DNF\_MODULE\_STREAMS
This is a space-separated list of module streams to enable prior to any
RPMs being installed.
Image Build Module Selection Example
------------------------------------
When using Train on RHEL8.2, one must select the appropriate virt and
container-tools module streams:
DIB_DNF_MODULE_STREAMS='virt:8.2 container-tools:2.0'

17
diskimage_builder/elements/yum/README.rst
View File

@ -17,3 +17,20 @@ Custom yum repository configurations can also be applied by defining
files will be copied to /etc/yum.repos.d/ during the image build, and then files will be copied to /etc/yum.repos.d/ during the image build, and then
removed at the end of the build. Each repo file should be named differently to removed at the end of the build. Each repo file should be named differently to
avoid a filename collision. avoid a filename collision.
Environment Variables for Module Selection during Image Creation
----------------------------------------------------------------
The following environment variable is used to select module streams to be
enabled during an image build on RHEL8. Any existing stream for the given
module is first disabled prior to enabling the specified stream.
#### DIB\_DNF\_MODULE\_STREAMS
This is a space-separated list of module streams to enable prior to any
RPMs being installed.
Image Build Module Selection Example
------------------------------------
When using Train on RHEL8.2, one must select the appropriate virt and
container-tools module streams:
DIB_DNF_MODULE_STREAMS='virt:8.2 container-tools:3.0'

0
diskimage_builder/elements/rhel-common/pre-install.d/01-module-configuration → diskimage_builder/elements/yum/pre-install.d/01-module-configuration
View File