[node-patches] Change in ovirt-node[ovirt-3.6]: RHN: start rhsmcertd in the right place

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: RHN: start rhsmcertd in the right place
......................................................................

RHN: start rhsmcertd in the right place

Configure...() is only called if a URL is passed (for satellite or
something similar).

Restart rhsmcertd after registration to Satellite or RHSM

Change-Id: Ib74be30ce61e6e55182b3cf82620135439a7ee6a
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1269752
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
M src/ovirt/node/setup/rhn/rhn_page.py
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/53/53853/1

diff --git a/src/ovirt/node/setup/rhn/rhn_model.py b/src/ovirt/node/setup/rhn/rhn_model.py
index 683ecfd..df73b83 100755
--- a/src/ovirt/node/setup/rhn/rhn_model.py
+++ b/src/ovirt/node/setup/rhn/rhn_model.py
@@ -370,7 +370,6 @@
                 try:
                     process.check_call(ab.get_commandlist())
                     Config().persist("/etc/rhsm/rhsm.conf")
-                    system.service("rhsmcertd", "start")
                 except process.CalledProcessError:
                     self.logger.debug("Calling subscription-manager with "
                                       "'%s' failed!" % ab.get_commandlist(
@@ -470,6 +469,7 @@
 
                 # If we made it down here, we registered successfully
                 else:
+                    system.service("rhsmcertd", "start")
                     configs = ["/var/lib/rhsm/cache/installed_products.json",
                                "/var/lib/rhsm/facts/facts.json"]
 
diff --git a/src/ovirt/node/setup/rhn/rhn_page.py b/src/ovirt/node/setup/rhn/rhn_page.py
index 26e1732..9b547da 100755
--- a/src/ovirt/node/setup/rhn/rhn_page.py
+++ b/src/ovirt/node/setup/rhn/rhn_page.py
@@ -250,7 +250,7 @@
         try:
             cmd = ["subscription-manager", "status"]
             output = process.check_output(cmd)
-            if not "Status: Unknown" in output:
+            if "Status: Unknown" not in output:
                 rhn_msg = "RHSM Registration\n\nRegistration Status: %s" \
                           % rhntype
 


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

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