From b4eea799ef8c116fd5d5e2af42016cbd4a0abe7f Mon Sep 17 00:00:00 2001 From: John Trowbridge Date: Tue, 30 Jun 2015 10:26:42 -0400 Subject: RHEL registration shouldn't use attach with activation key In the case of using portal registration with an activation key, the RHEL registration script 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. Change-Id: I2907bede28a9b7bef71cedeea69c876eb4949df0 --- extraconfig/post_deploy/rhel-registration/scripts/rhel-registration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extraconfig/post_deploy') diff --git a/extraconfig/post_deploy/rhel-registration/scripts/rhel-registration b/extraconfig/post_deploy/rhel-registration/scripts/rhel-registration index c2bf1894..cbbd6a1d 100644 --- a/extraconfig/post_deploy/rhel-registration/scripts/rhel-registration +++ b/extraconfig/post_deploy/rhel-registration/scripts/rhel-registration @@ -94,7 +94,7 @@ fi case "${REG_METHOD:-}" in portal) subscription-manager register $opts - if [ -z "${REG_AUTO_ATTACH:-}" ]; then + if [ -z "${REG_AUTO_ATTACH:-}" -a -z "${REG_ACTIVATION_KEY:-}" ]; then subscription-manager attach $attach_opts fi subscription-manager $repos -- cgit 1.2.3-korg