sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Allow for disabling rhel registration"

Browse Source
This commit is contained in:
Jenkins 2015-01-09 18:31:30 +00:00 committed by Gerrit Code Review
commit bc4880fb91
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/rhel-common/README.md
View File

@ -71,7 +71,7 @@ the hostname.
#### REG\_METHOD #### REG\_METHOD
Sets the method of registration. Use "portal" to register a system with the Sets the method of registration. Use "portal" to register a system with the
Red Hat Customer Portal. Use "satellite" to register a system with Red Red Hat Customer Portal. Use "satellite" to register a system with Red
Hat Satellite 6. Hat Satellite 6. Use "disable" to skip the registration process.
#### REG\_ORG #### REG\_ORG
Gives the organization to which to join the system. Gives the organization to which to join the system.
@ -204,7 +204,8 @@ Heat metadata can be used to configure the rhel-common element.
method: method:
# Sets the method of registration. Use "portal" to register a # Sets the method of registration. Use "portal" to register a
# system with the Red Hat Customer Portal. Use "satellite" to # system with the Red Hat Customer Portal. Use "satellite" to
# register a system with Red Hat Satellite 6. # register a system with Red Hat Satellite 6. Use "disable" to
# skip the registration process.
Configuration Registration Examples Configuration Registration Examples
------------------------------------ ------------------------------------

7
elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
View File

@ -118,7 +118,10 @@ case "${REG_METHOD:-}" in
# beta-rpms repo only needed to support the katello-ca rpm above. # beta-rpms repo only needed to support the katello-ca rpm above.
subscription-manager repos --disable ${satellite_repo} subscription-manager repos --disable ${satellite_repo}
;; ;;
disable)
echo "Disabling RHEL registration"
;;
*) *)
echo "WARNING: only 'portal' and 'satellite' are valid values for REG_METHOD." echo "WARNING: only 'portal', 'satellite', and 'disable' are valid values for REG_METHOD."
exit 0 # keeps the stack from failing if you don't set a value in REG_METHOD exit 0
esac esac

8
elements/rhel-common/pre-install.d/00-rhel-registration
View File

@ -97,7 +97,11 @@ case "${REG_METHOD:-}" in
# beta-rpms repo only needed to support the katello-ca rpm above. # beta-rpms repo only needed to support the katello-ca rpm above.
subscription-manager repos --disable rhel-7-server-rh-common-beta-rpms subscription-manager repos --disable rhel-7-server-rh-common-beta-rpms
;; ;;
disable)
echo "Disabling RHEL registration"
export REG_HALT_UNREGISTER=1 # stops attempt to unregister
;;
*) *)
echo "WARNING: only 'portal' and 'satellite' are valid values for REG_METHOD." echo "WARNING: only 'portal', 'satellite', and 'disable' are valid values for REG_METHOD."
exit 1 # RHEL requires registration, fail image build if REG_Method isn't set exit 1
esac esac