fix broken test for for running OVS daemon

openstack · be49bd301f6649950d9cc5bb08ee68a293d7058a · iawells committed Jan 15, 2013 · Jan 15, 2013 · be49bd3
1 parent ccef47d
commit be49bd301f6649950d9cc5bb08ee68a293d7058a
Unified Split

Showing with 3 additions and 2 deletions.

+3 −2 manifests/ovs.pp
diff --git a/manifests/ovs.pp b/manifests/ovs.pp
@@ -17,8 +17,9 @@
   service {"openvswitch-switch":
     ensure      => true,
     enable      => true,
-    hasstatus   => true,
-    status      => "/etc/init.d/openvswitch-switch status",
+    hasstatus   => false, # the supplied command returns true even if it's not running
+    # Not perfect - should spot if either service is not running - but it'll do
+    status      => "/etc/init.d/openvswitch-switch status | fgrep 'is running'",
   }
 
   Service['openvswitch-switch'] -> Vs_port<||>