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

rhel-common element should not use attach with activation key

Browse source 
In the case of using portal registration with an activation key, the
rhel-common element is still executing a `subscription-manager attach`
command. This should not happen if an activation key is provided. This
is because an activation key already provides the subscriptions to
attach.

This patch fixes this behavior.

Change-Id: I5a8425d1778362bb7a0dadc91a46308f16b2a526
Closes-Bug: #1456648
This commit is contained in:
John Trowbridge 2015-05-19 09:59:27 -04:00
parent a4db3f5ccb
commit 6856d96f03
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
View file

@ -116,7 +116,7 @@ case "${REG_METHOD:-}" in
portal)
echo "Registering with options: $sanitized_opts"
subscription-manager register $opts
if [ -z "${REG_AUTO_ATTACH:-}" ]; then
if [ -z "${REG_AUTO_ATTACH:-}" -a -z "${REG_ACTIVATION_KEY:-}" ]; then
echo "Attaching with options: $attach_opts"
subscription-manager attach $attach_opts
fi

2
elements/rhel-common/pre-install.d/00-rhel-registration
View file

@ -93,7 +93,7 @@ case "${REG_METHOD:-}" in
portal)
echo "Registering with options: $sanitized_opts"
subscription-manager register $opts
if [ -z "${REG_AUTO_ATTACH:-}" ]; then
if [ -z "${REG_AUTO_ATTACH:-}" -a -z "${REG_ACTIVATION_KEY:-}" ]; then
echo "Attaching with options: $attach_opts"
subscription-manager attach $attach_opts
fi