[node-patches] Change in ovirt-node[master]: cleanup cim from post

[mburns at redhat.com]

Michael Burns has uploaded a new change for review.

Change subject: cleanup cim from post
......................................................................

cleanup cim from post

missed when cim was moved to a plugin

Change-Id: I09f87a526f05b13cb8b73b497ce1fc8c3f24d130
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M ovirt-node.spec.in
M recipe/centos6-install.ks
M recipe/common-minimizer.ks
M recipe/common-post.ks
M recipe/ovirt17-install.ks
5 files changed, 7 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/39/16939/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index e3f7700..dde7c54 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -190,16 +190,21 @@
 useradd -g cim -G sfcb -s /sbin/nologin cim
 %if ! %{is_systemd}
 /sbin/chkconfig --add ovirt-cim
+/sbin/chkconfig ovirt-cim on
 %else
 if [ $1 -eq 1 ] ; then
     # Initial installation
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+    /bin/systemctl enable ovirt-cim >/dev/null 2>&1 || :
 fi
 %endif
 #CIM related changes
 # set read-only
 echo "readonly = true;" > /etc/libvirt-cim.conf
 
+#cleanup tmp directory from cim setup
+rm -rf /tmp/cim_schema*
+
 
 #
 # SELinux subpackage
diff --git a/recipe/centos6-install.ks b/recipe/centos6-install.ks
index 17279a5..b0fbc3d 100644
--- a/recipe/centos6-install.ks
+++ b/recipe/centos6-install.ks
@@ -1 +1 @@
-services --enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt-post,ovirt-cim,cgconfig,tuned --disabled=netfs,ovirt-awake,libvirt-guests,libvirtd
+services --enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt-post,cgconfig,tuned --disabled=netfs,ovirt-awake,libvirt-guests,libvirtd
diff --git a/recipe/common-minimizer.ks b/recipe/common-minimizer.ks
index 2b61724..43e95e9 100644
--- a/recipe/common-minimizer.ks
+++ b/recipe/common-minimizer.ks
@@ -315,11 +315,6 @@
 
 # drop net-snmp
 droprpm net-snmp
-#cim
-droprpm tog-pegasus
-droprpm tog-pegasus-libs
-droprpm mailcap
-droprpm openslp
 
 #remove rpms added by dmraid
 droprpm ConsoleKit
diff --git a/recipe/common-post.ks b/recipe/common-post.ks
index 622bf2a..4862ddb 100644
--- a/recipe/common-post.ks
+++ b/recipe/common-post.ks
@@ -228,8 +228,5 @@
 # cleanup yum directories
 rm -rf /var/lib/yum/*
 
-#cleanup tmp directory from cim setup
-rm -rf /tmp/cim_schema*
-
 # enable strong random number generation
 sed -i '/SSH_USE_STRONG_RNG/d' /etc/sysconfig/sshd
diff --git a/recipe/ovirt17-install.ks b/recipe/ovirt17-install.ks
index 60e9018..258cbdd 100644
--- a/recipe/ovirt17-install.ks
+++ b/recipe/ovirt17-install.ks
@@ -1 +1 @@
-services --enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt,ovirt-post,ovirt-cim,ovirt-kdump,anyterm,collectd,libvirtd,cgconfig,mcelog,tuned --disabled=kdump
+services --enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt,ovirt-post,ovirt-kdump,anyterm,collectd,libvirtd,cgconfig,mcelog,tuned --disabled=kdump


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

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