Ovirt devel - Sep 2009 - [PATCH node] Fix SRV_SERVER for SRV_HOST to work with /etc/init.d/ovirt-functions

From: root <root at linagora-ovirt.netaktiv.com>

---
 scripts/ovirt-config-collectd |    6 +++---
 scripts/ovirt-config-logging  |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/ovirt-config-collectd b/scripts/ovirt-config-collectd
index 4ad877e..1474bf5 100755
--- a/scripts/ovirt-config-collectd
+++ b/scripts/ovirt-config-collectd
@@ -98,9 +98,9 @@ if [ "$1" = "AUTO" ]; then
     if [ -z "$OVIRT_COLLECTD_SERVER" -o -z
"$OVIRT_COLLECTD_PORT" ]; then
         printf "\nAttempting to locate remote collectd server..."
         find_srv collectd udp
-        if [ -n "$SRV_SERVER" -a -n "$SRV_PORT" ]; then
-            printf "found! Using collectd server
'$SRV_SERVER:$SRV_PORT'.\n"
-            ovirt_collectd $SRV_SERVER $SRV_PORT
+        if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
+            printf "found! Using collectd server
'$SRV_HOST:$SRV_PORT'.\n"
+            ovirt_collectd $SRV_HOST $SRV_PORT
         else
             printf "not found!\n"
         fi
diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging
index 464dfcb..d8e5c95 100755
--- a/scripts/ovirt-config-logging
+++ b/scripts/ovirt-config-logging
@@ -179,9 +179,9 @@ if [ "$1" = "AUTO" ]; then
     if [ -z "$OVIRT_SYSLOG_SERVER" -o -z
"$OVIRT_SYSLOG_PORT" ]; then
         printf "\nAttempting to locate remote syslog server..."
         find_srv syslog udp
-        if [ -n "$SRV_SERVER" -a -n "$SRV_PORT" ]; then
-            printf "found! Using syslog server
'$SRV_SERVER:$SRV_PORT'.\n"
-            ovirt_rsyslog $SRV_SERVER $SRV_PORT udp
+        if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ]; then
+            printf "found! Using syslog server
'$SRV_HOST:$SRV_PORT'.\n"
+            ovirt_rsyslog $SRV_HOST $SRV_PORT udp
         else
             printf "not found!\n"
         fi
-- 
1.6.2.5

ACK and pushed to next

Thanks for spotting this mistake! Obviously, oVirt Node stand-alone mode is not
much used at the moment, but new functionally like node-admin by Darryl should
make this mode more useful and hopefully more tested.
Thanks,
Alan