diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-29 20:37:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-29 20:37:50 +0000 |
| commit | 5a6e934b4b8d6fab7b899c368fb82321e1a0cbe3 (patch) | |
| tree | 5292dafd8f768a4306348984e7b1f264ffd94ba9 | |
| parent | 53ed88a19ae5b57a1fc8bd9a31e7b7f1526bf7bb (diff) | |
| parent | b4eea799ef8c116fd5d5e2af42016cbd4a0abe7f (diff) | |
Merge "RHEL registration shouldn't use attach with activation key"
| -rw-r--r-- | extraconfig/post_deploy/rhel-registration/scripts/rhel-registration | 2 |
1 files changed, 1 insertions, 1 deletions
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 |