From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Wed, 3 Oct 2012 09:47:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
X-Git-Tag: sliver-openvswitch-1.8.90-5~27
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=eeec419708b0d85114a831ce6d442b97ed2449cd

Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
---

eeec419708b0d85114a831ce6d442b97ed2449cd
diff --cc planetlab/exp-tool/Makefile
index bf66afb1d,606d54dfd..728e260e7
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@@ -118,15 -124,15 +124,18 @@@ CONTROLLERS=$(foreach id,$(ALL_NODE_IDS
  controllers: $(CONTROLLERS)
  .PHONY: controllers
  
 +del-controllers: $(foreach id,$(ALL_NODE_IDS),del-controller-$(id))
 +.PHONY: del-controllers
 +
  ### node-oriented targets
  # check ssh connectivity
- cache/sshcheck.%: FORCE
- 	@if $(SSH) $(HOST_$*) hostname 2> /dev/null; then echo "ssh on" $(call display,$*) "OK" ; \
+ sshcheck-%: FORCE
+ 	@if $(SSH) $(HOST_$*) hostname &> /dev/null; then echo "ssh on" $(call display,$*) "OK" ; \
  	 else echo "ssh on" $(call display,$*) "KO !!!"; fi
  
+ ovsversion-%: FORCE
+ 	@OVSVERSION=$$($(SSH) $(HOST_$*) rpm -q sliver-openvswitch); echo $(call display,$*) has $$OVSVERSION
+ 
  # should probably replace sshcheck
  cache/status.%: FORCE
  	@echo "=== DB and SWITCH processes on $(call display,$*)"