sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add support Red Hat Network (RHN)"

Browse source
This commit is contained in:
Jenkins 2014-01-22 14:02:30 +00:00 committed by Gerrit Code Review
commit 0a5b5159ad
3 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
elements/rhel/README.md
View file

@ -1,10 +1,18 @@
Overrides: # Overrides:
## General
* Set DIB_CLOUD_IMAGES to a URL for downloading base Red Hat Enterprise Linux cloud image. * Set DIB_CLOUD_IMAGES to a URL for downloading base Red Hat Enterprise Linux cloud image.
* Set DIB_CLOUD_RELEASE to a use a non-default name for the Red Hat Enterprise Linux cloud image. * Set DIB_CLOUD_RELEASE to a use a non-default name for the Red Hat Enterprise Linux cloud image.
* Set DIB_RHSM_USER and DIB_RHSM_PASSOWRD for the RHN user to be used for a subscription registration.
If these are set, the image building process will register the system with RHN ## Red Hat Subscription Manager (RHSM)
and apply the associated Red Hat Enterprise Linux Server subscription so the
latest package updates can be applied. At the end of the image building Certificate-based Red Hat Subscription Managment (RHSM) is the default registration type.
process, the system will be unregistered from RHN.
* Set DIB_RHSM_POOL to a subscription pool if you want the system to not use * Set DIB_RHSM_USER and DIB_RHSM_PASSWORD to register the system with RHSM during the image building process. This will apply the associated Red Hat Enterprise Linux Server subscription so the latest package updates can be applied. At the end of the image building process, the system will be unregistered from RHSM.
the auto attach feature of subscription-manager * Set DIB_RHSM_POOL to a subscription pool if you do not want the system to use the `--auto-attach` feature of `subscription-manager`.
## Red Hat Network (RHN)
Set `DIB_REG_TYPE=rhn` for Red Hat Network (RHN classic) registration. The image building process will register the system to RHN and apply the associated Red Hat Enterprise Linux Server subscription so the latest package updates can be applied. At the end of the image building process, the system will be unregistered from RHN.
* For RHN username/password authentication set DIB_RHSM_USER and DIB_RHSM_PASSWORD.

4
elements/rhel/finalise.d/60-rhsm-unregister
View file

@ -3,5 +3,9 @@
set -e set -e
if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]; then if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]; then
if [[ "$DIB_REG_TYPE" == "rhn" ]]; then
rm -rf /etc/sysconfig/rhn/systemid
else
subscription-manager unregister subscription-manager unregister
fi
fi fi

17
elements/rhel/pre-install.d/00-rhsm
View file

@ -4,7 +4,16 @@ set -e
if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ] if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]
then then
subscription-manager register --user $DIB_RHSM_USER --password $DIB_RHSM_PASSWORD opts="--force --username ${DIB_RHSM_USER} --password ${DIB_RHSM_PASSWORD}"
if [[ "$DIB_REG_TYPE" == "rhn" ]]; then
rhnreg_ks $opts --norhnsd
sleep 1
# optional channel required for diskimage-builder dependency
channels="-a -c rhel-x86_64-server-optional-6"
rhn-channel --user=$DIB_RHSM_USER --password=$DIB_RHSM_PASSWORD $channels
rhn-channel -l
else
subscription-manager register $opts
# wait a second to ensure consumer certificate is finished writing to disk # wait a second to ensure consumer certificate is finished writing to disk
sleep 1 sleep 1
if [ -z $DIB_RHSM_POOL ]; then if [ -z $DIB_RHSM_POOL ]; then
@ -12,5 +21,9 @@ if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]
else else
subscription-manager attach --pool $DIB_RHSM_POOL subscription-manager attach --pool $DIB_RHSM_POOL
fi fi
subscription-manager repos --enable rhel-6-server-optional-rpms # optional repo required for diskimage-builder dependency
repos="--enable rhel-6-server-optional-rpms"
subscription-manager repos $repos
subscription-manager repos --list
fi
fi fi