Title: [opsview] [11845] Extra mode for db_opsview, to confirm if clashes occur in opspacks when
- Revision
- 11845
- Author
- tvoon
- Date
- 2013-03-18 15:16:49 +0000 (Mon, 18 Mar 2013)
Log Message
Extra mode for db_opsview, to confirm if clashes occur in opspacks when
testing new opspacks
Modified Paths
Modified: trunk/opsview-core/Makefile
===================================================================
--- trunk/opsview-core/Makefile 2013-03-18 15:13:37 UTC (rev 11844)
+++ trunk/opsview-core/Makefile 2013-03-18 15:16:49 UTC (rev 11845)
@@ -74,7 +74,7 @@
test-opspacks:
rm -fr import/opspacks
make opspacks
- bin/db_opsview db_install
+ bin/db_opsview -n db_install
# See opsview-base's notes
solpkg:
Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview 2013-03-18 15:13:37 UTC (rev 11844)
+++ trunk/opsview-core/bin/db_opsview 2013-03-18 15:16:49 UTC (rev 11845)
@@ -1292,7 +1292,11 @@
if [ $NOPACKS -eq 0 ] ; then
# install opspacks
- install_all_opspacks --force --dir $topdir/../import/opspacks || die "Cannot install all opspacks - check log"
+ extra_args="--force"
+ if [ $NOFORCEOPSPACKS -eq 1 ] ; then
+ extra_args=""
+ fi
+ install_all_opspacks $extra_args --dir $topdir/../import/opspacks || die "Cannot install all opspacks - check log"
if [ $TEST -eq 0 ] ; then
PERL5LIB="/usr/local/nagios/lib:/usr/local/nagios/perl/lib:/opt/opsview/perl/lib/perl5" $topdir/../import/opsview_master_post_opspacks $topdir/../import/opsview_master.def;
fi
@@ -1361,11 +1365,13 @@
TEST=0
NOPACKS=0
+NOFORCEOPSPACKS=0
PATH=$PATH:$topdir:.
-while getopts ":toh:" c ; do
+while getopts ":tonh:" c ; do
case $c in
t) TEST=1;;
o) NOPACKS=1;;
+ n) NOFORCEOPSPACKS=1;;
h) host=$OPTARG;;
\*) die "Error: unexpected option $c";;
esac
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
