Ryan Barry has uploaded a new change for review. Change subject: Change RHNSM to RHSM now... ......................................................................
Change RHNSM to RHSM now... Initial bug report asked for a change from RHN to RHNSM. Change it to RHSM now. While we're at it, change every instance of RHN to RHSM (except those in rhn_model, which all reference actual RHN classic) Change-Id: I24787c7a3751c0d6d327cd652b718ead025a906d Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1255277 Signed-off-by: Ryan Barry <[email protected]> --- M src/ovirt/node/setup/rhn/rhn_model.py M src/ovirt/node/setup/rhn/rhn_page.py 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/38/51338/1 diff --git a/src/ovirt/node/setup/rhn/rhn_model.py b/src/ovirt/node/setup/rhn/rhn_model.py index a808200..376c686 100644 --- a/src/ovirt/node/setup/rhn/rhn_model.py +++ b/src/ovirt/node/setup/rhn/rhn_model.py @@ -400,7 +400,8 @@ self.logger.debug(cfg) rhntype = cfg["rhntype"] cacert = cfg["ca_cert"] or "" - tx = utils.Transaction("Performing RHN Registration") + _rhn_brand = "RHSM" if system.is_min_el(7) else "RHN" + tx = utils.Transaction("Performing %s Registration" % _rhn_brand) if rhntype == "sam" or cacert.endswith(".pem"): tx.append(ConfigureSAM()) diff --git a/src/ovirt/node/setup/rhn/rhn_page.py b/src/ovirt/node/setup/rhn/rhn_page.py index 1e3c794..98327e4 100644 --- a/src/ovirt/node/setup/rhn/rhn_page.py +++ b/src/ovirt/node/setup/rhn/rhn_page.py @@ -104,11 +104,13 @@ class Plugin(plugins.NodePlugin): _model = None - _rhn_types = [("rhn", "RHN"), + + _rhn_brand = "RHSM" if system.is_min_el(7) else "RHN" + _rhn_types = [("rhn", _rhn_brand), ("satellite", "Satellite"), ("sam", "SAM")] _fields_enabled = False - _type = "RHNSM Registration" if system.is_min_el(7) else \ + _type = "RHSM Registration" if system.is_min_el(7) else \ "RHN Registration" def __init__(self, app): -- To view, visit https://gerrit.ovirt.org/51338 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24787c7a3751c0d6d327cd652b718ead025a906d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ryan Barry <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
