- no longer send macs to server when retreiving
net device config. Not necessary as we already
have interface names via host browser
- fixed regression bug where 'return' was remove
from net managent config causing default config
to be applied no matter what
---
scripts/ovirt-early | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/scripts/ovirt-early b/scripts/ovirt-early
index 9ab2981..667452d 100755
--- a/scripts/ovirt-early
+++ b/scripts/ovirt-early
@@ -13,11 +13,6 @@
BONDING_MODCONF_FILE=/etc/modprobe.d/bonding
AUGTOOL_CONFIG=/var/tmp/augtool-config
-get_mac_addresses() {
- macs=$(ifconfig | awk '/HWaddr/ { print $5"="$1 }' \
- | tr '\n' ' ' | sed 's/
/%2C/g;s/:/%3A/g')
-}
-
configure_from_network() {
DEVICE=$1
if [ -n "$DEVICE" ]; then
@@ -37,22 +32,21 @@ configure_from_network() {
if [ -n "$SRV_HOST" -a -n "$SRV_PORT" ];
then
log "oVirt Server found at: $SRV_HOST:$SRV_PORT"
cfgdb=$(mktemp)
- get_mac_addresses
- log "MACs to use: $macs"
wget -O $cfgdb --no-check-certificate \
-
"http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)&macs=$macs"
+
"http://$SRV_HOST:$SRV_PORT/ovirt/managed_node/config?host=$(hostname)"
if [ $? -eq 0 ]; then
log "Remote configuration bundle retrieved to
$cfgdb"
ovirt-process-config $cfgdb $BONDING_MODCONF_FILE
$AUGTOOL_CONFIG
if [ $? -eq 0 ]; then
log "Remote configuration retrieved and applied"
+ rm $cfgdb
+ return
else
log "Failure to retrieve or apply remote configuration"
fi
else
log "Failed to retrieve configuration bundle"
fi
- rm $cfgdb
fi
fi
fi
--
1.6.0.6