[node-patches] Change in ovirt-node[master]: Set rhn_type in rhn_autoinstall if it's None so it works on EL7

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Set rhn_type in rhn_autoinstall if it's None so it works on EL7
......................................................................

Set rhn_type in rhn_autoinstall if it's None so it works on EL7

The EL7 RHN classic v. subscription-manager logic assumes that
rhn_type will be set in order to differentiate. It wasn't. Set it
if it's empty so we correctly run subscription-manager instead of
rhnreg_ks

Change-Id: I3f7e20f4420c0ce87ca6c14e58e15b2e50f0ffab
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1265176
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M plugins/rhn_autoinstall.py
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/37/46537/1

diff --git a/plugins/rhn_autoinstall.py b/plugins/rhn_autoinstall.py
index 9a902af..3e0296a 100644
--- a/plugins/rhn_autoinstall.py
+++ b/plugins/rhn_autoinstall.py
@@ -59,6 +59,8 @@
     rhn_proxypassword = _functions.OVIRT_VARS["OVIRT_RHN_PROXYPASSWORD"] \
                         if "OVIRT_RHN_PROXYPASSWORD" in _functions.OVIRT_VARS \
                         else ""
+
+    cfg['rhntype'] = cfg['rhntype'] or 'rhn'
     effective_model = Changeset({
         "rhn.rhntype": cfg['rhntype'],
         "rhn.url": cfg['url'],


-- 
To view, visit https://gerrit.ovirt.org/46537
To unsubscribe, visit https://gerrit.ovirt.org/settings

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