[node-patches] Change in ovirt-node[master]: don't do anything with productid.js

[mburns at redhat.com]

Michael Burns has uploaded a new change for review.

Change subject: don't do anything with productid.js
......................................................................

don't do anything with productid.js

It's not necessary to persist it and doesn't exist on the system

rhbz#866283

Change-Id: I31cabf265afcec66a603fd69a8a21899f8909fc3
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M scripts/ovirt-config-rhn
M scripts/rhn.py
2 files changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/65/8565/1

diff --git a/scripts/ovirt-config-rhn b/scripts/ovirt-config-rhn
index a4b2fee..ff14f6c 100644
--- a/scripts/ovirt-config-rhn
+++ b/scripts/ovirt-config-rhn
@@ -213,8 +213,8 @@
     log "Registering to RHN account....."
 
     unmount_config /etc/pki/consumer/*pem
-    unmount_config /var/lib/rhsm/productid.js /var/lib/rhsm/cache/installed_products.json /var/lib/rhsm/facts/facts.json
-    rm -rf /var/lib/rhsm/productid.js /var/lib/rhsm/cache/installed_products.json /var/lib/rhsm/facts/facts.json
+    unmount_config /var/lib/rhsm/cache/installed_products.json /var/lib/rhsm/facts/facts.json
+    rm -rf /var/lib/rhsm/cache/installed_products.json /var/lib/rhsm/facts/facts.json
     args="subscription-manager register ${args}"
     # cant rely on return code in RHEVH's case
     eval $args
@@ -223,7 +223,6 @@
     if [ $rc -eq 0 ]; then
         ovirt_store_config \
             /etc/pki/consumer/*pem \
-            /var/lib/rhsm/productid.js \
             /var/lib/rhsm/cache/installed_products.json \
             /var/lib/rhsm/facts/facts.json
         log "System "$profileName" successfully registered "$serverUrl""
diff --git a/scripts/rhn.py b/scripts/rhn.py
index c95c271..f090b5b 100755
--- a/scripts/rhn.py
+++ b/scripts/rhn.py
@@ -240,8 +240,7 @@
     log("Registering to RHN account.....")
 
     import glob
-    all_rhsm_configs = (["/var/lib/rhsm/productid.js ",
-                        "/var/lib/rhsm/cache/installed_products.json ",
+    all_rhsm_configs = (["/var/lib/rhsm/cache/installed_products.json",
                         "/var/lib/rhsm/facts/facts.json"])
     unmount_config(all_rhsm_configs)
     unmount_config(glob.glob("/etc/pki/consumer/*pem"))


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31cabf265afcec66a603fd69a8a21899f8909fc3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Michael Burns <mburns at redhat.com>