[node-patches] Change in ovirt-node[master]: Don't catch satellite with subscription-manager

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Don't catch satellite with subscription-manager
......................................................................

Don't catch satellite with subscription-manager

Use rhnreg_ks for registering to satellite even on EL7 as long as
the certificate name doesn't end with .pem

Change-Id: I7d59dc07855da8b99e742b6ed3f8482d5cd5e5fa
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1166110
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/84/35484/1

diff --git a/src/ovirt/node/setup/rhn/rhn_model.py b/src/ovirt/node/setup/rhn/rhn_model.py
index c9728cb..e7aad86 100644
--- a/src/ovirt/node/setup/rhn/rhn_model.py
+++ b/src/ovirt/node/setup/rhn/rhn_model.py
@@ -381,7 +381,7 @@
 
         if rhntype == "sam" or cacert.endswith(".pem"):
             tx.append(ConfigureSAM())
-        elif system.is_min_el(7):
+        elif system.is_min_el(7) and rhntype == "rhn":
             tx.append(ConfigureSAM())
         else:
             tx.append(ConfigureRHNClassic())


-- 
To view, visit http://gerrit.ovirt.org/35484
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d59dc07855da8b99e742b6ed3f8482d5cd5e5fa
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>