[node-patches] Change in ovirt-node[ovirt-3.5]: ovirt-init-functions: remove rhel 69.pem

[dougsland at redhat.com]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: ovirt-init-functions: remove rhel 69.pem
......................................................................

ovirt-init-functions: remove rhel 69.pem

We should avoid the RHEL 69.pem in the Node distro.
The users must have only the RHEV pem.

Change-Id: I681965d7f391247c9634eb075c94fca643fe43f4
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1348860
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M scripts/ovirt-init-functions.sh.in
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/67/60367/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index 12d354e..075e511 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -1045,6 +1045,11 @@
         fi
     done
 
+    #BZ1348860 - We should not ship RHEL pem
+    if [ -f /etc/pki/product-default/69.pem ]; then
+        rm -f /etc/pki/product-default/69.pem
+    fi
+
     # fix logrotate syntax between 6.4 -> 6.5 upgrades
     unmount_config /etc/logrotate.d/ovirt-node
     sed -i 's/log{/log {/g' /etc/logrotate.d/ovirt-node


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I681965d7f391247c9634eb075c94fca643fe43f4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>