[node-patches] Change in ovirt-node[master]: relocate cim and snmp plugins into subdirectories

mburns at redhat.com mburns at redhat.com
Thu Feb 14 17:21:17 UTC 2013


Michael Burns has uploaded a new change for review.

Change subject: relocate cim and snmp plugins into subdirectories
......................................................................

relocate cim and snmp plugins into subdirectories

To make separating logic for multiple plugins easier to manage

Also, rename cim to sfcb-cim

Change-Id: I2cbee9341252f0aad1261f8a3d7dbf921e39c584
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M configure.ac
M ovirt-node.spec.in
M plugins/Makefile.am
A plugins/sfcb_cim/Makefile.am
R plugins/sfcb_cim/sfcb_cim.minimize
R plugins/sfcb_cim/sfcb_cim.py
A plugins/snmp/Makefile.am
R plugins/snmp/snmp.minimize
R plugins/snmp/snmp.py
R plugins/snmp/snmp_autoinstall.py
10 files changed, 70 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/83/12083/1

diff --git a/configure.ac b/configure.ac
index 2af27d8..6167e53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,8 @@
                 logrotate/Makefile
                 modules/Makefile
                 plugins/Makefile
+                plugins/sfcb_cim/Makefile
+                plugins/snmp/Makefile
                 $MAIN_KS
                 recipe/image-minimizer.ks
                 scripts/ovirt-functions
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 3eb8de2..5f774f4 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -128,16 +128,17 @@
 EOF_snmpd
 
 
-%package plugin-cim
-Summary:        CIM plugin for %{product_family} image
+%package plugin-sfcb-cim
+Summary:        SFCB CIM plugin for %{product_family} image
 Group:          Applications/System
 Requires:       libvirt-cim
 Requires:       sblim-sfcb
+obsoletes:      ovirt-node-plugin-cim <= 0:2.6.0
 
-%description plugin-cim
+%description plugin-sfcb-cim
 This package provides a cim plugin for use with%{product_family} image.
 
-%post plugin-cim
+%post plugin-sfcb-cim
 groupadd cim
 useradd -g cim -G sfcb -s /sbin/nologin cim
 %if ! %{is_systemd}
@@ -264,7 +265,7 @@
 fi
 %endif
 
-%preun plugin-cim
+%preun plugin-sfcb-cim
 %if ! %{is_systemd}
 if [ $1 = 0 ] ; then
     /sbin/service ovirt-cim stop >/dev/null 2>&1
@@ -296,9 +297,9 @@
 %{_sysconfdir}/ovirt-plugins.d/snmp.minimize
 %{_sysconfdir}/ovirt-config-boot.d/snmp_autoinstall.py
 
-%files plugin-cim
-%{python_sitelib}/ovirt_config_setup/cim.py
-%{_sysconfdir}/ovirt-plugins.d/cim.minimize
+%files plugin-sfcb-cim
+%{python_sitelib}/ovirt_config_setup/sfcb_cim.py
+%{_sysconfdir}/ovirt-plugins.d/sfcb_cim.minimize
 %if %{is_systemd}
 %{_unitdir}/ovirt-cim.service
 %else
@@ -357,7 +358,7 @@
 %{_sbindir}/persist
 %{_sbindir}/unpersist
 %{python_sitelib}/ovirt_config_setup
-%exclude %{python_sitelib}/ovirt_config_setup/cim.py*
+%exclude %{python_sitelib}/ovirt_config_setup/sfcb_cim.py*
 %exclude %{python_sitelib}/ovirt_config_setup/snmp.py*
 %{python_sitelib}/ovirtnode
 %{python_sitelib}/augeas*
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a44f0fa..b668309 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -15,17 +15,7 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-pluginsdir = $(sysconfdir)/ovirt-plugins.d
-pyovirtconfigsetupdir =$(pythondir)/ovirt_config_setup
-pyovirtconfigbootdir = $(sysconfdir)/ovirt-config-boot.d
+SUBDIRS =    \
+    snmp     \
+	sfcb_cim
 
-dist_pyovirtconfigsetup_SCRIPTS = \
-  snmp.py \
-  cim.py
-
-dist_plugins_DATA = \
-  snmp.minimize \
-  cim.minimize
-
-dist_pyovirtconfigboot_SCRIPTS = \
-  snmp_autoinstall.py
diff --git a/plugins/sfcb_cim/Makefile.am b/plugins/sfcb_cim/Makefile.am
new file mode 100644
index 0000000..5a51267
--- /dev/null
+++ b/plugins/sfcb_cim/Makefile.am
@@ -0,0 +1,26 @@
+# Copyright (C) 2012 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+pluginsdir = $(sysconfdir)/ovirt-plugins.d
+pyovirtconfigsetupdir =$(pythondir)/ovirt_config_setup
+pyovirtconfigbootdir = $(sysconfdir)/ovirt-config-boot.d
+
+dist_pyovirtconfigsetup_SCRIPTS = \
+  sfcb_cim.py
+
+dist_plugins_DATA = \
+  sfcb_cim.minimize
diff --git a/plugins/cim.minimize b/plugins/sfcb_cim/sfcb_cim.minimize
similarity index 100%
rename from plugins/cim.minimize
rename to plugins/sfcb_cim/sfcb_cim.minimize
diff --git a/plugins/cim.py b/plugins/sfcb_cim/sfcb_cim.py
similarity index 100%
rename from plugins/cim.py
rename to plugins/sfcb_cim/sfcb_cim.py
diff --git a/plugins/snmp/Makefile.am b/plugins/snmp/Makefile.am
new file mode 100644
index 0000000..845b2b4
--- /dev/null
+++ b/plugins/snmp/Makefile.am
@@ -0,0 +1,29 @@
+# Copyright (C) 2012 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+pluginsdir = $(sysconfdir)/ovirt-plugins.d
+pyovirtconfigsetupdir =$(pythondir)/ovirt_config_setup
+pyovirtconfigbootdir = $(sysconfdir)/ovirt-config-boot.d
+
+dist_pyovirtconfigsetup_SCRIPTS = \
+  snmp.py
+
+dist_plugins_DATA = \
+  snmp.minimize
+
+dist_pyovirtconfigboot_SCRIPTS = \
+  snmp_autoinstall.py
diff --git a/plugins/snmp.minimize b/plugins/snmp/snmp.minimize
similarity index 100%
rename from plugins/snmp.minimize
rename to plugins/snmp/snmp.minimize
diff --git a/plugins/snmp.py b/plugins/snmp/snmp.py
similarity index 100%
rename from plugins/snmp.py
rename to plugins/snmp/snmp.py
diff --git a/plugins/snmp_autoinstall.py b/plugins/snmp/snmp_autoinstall.py
similarity index 100%
rename from plugins/snmp_autoinstall.py
rename to plugins/snmp/snmp_autoinstall.py


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

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



More information about the node-patches mailing list