01/14: services: Open vSwitch: Provide a default configuration.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit e73ded3c71527412944bb9a97916a096742f695d
Author: Marius Bakke <address@hidden>
Date:   Mon Mar 25 00:17:41 2019 +0100

    services: Open vSwitch: Provide a default configuration.
    
    * gnu/services/networking.scm (openvswitch-service-type): Provide
    OPENVSWITCH-CONFIGURATION as a default value.
    * gnu/tests/networking.scm (%openvswitch-os): Don't configure the service.
---
 gnu/services/networking.scm | 3 ++-
 gnu/tests/networking.scm    | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index cab129e..5fbbf25 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1154,7 +1154,8 @@ implements authentication, key negotiation and more for 
wireless networks.")
    (description
     "Run @uref{http://www.openvswitch.org, Open vSwitch}, a multilayer virtual
 switch designed to enable massive network automation through programmatic
-extension.")))
+extension.")
+   (default-value (openvswitch-configuration))))
 
 ;;;
 ;;; iptables
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index a97b29b..d123444 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -178,9 +178,7 @@ port 7, and a dict service on port 2628."
    (static-networking-service "ovs0" "10.1.1.1"
                               #:netmask "255.255.255.252"
                               #:requirement '(openvswitch-configuration))
-   (service openvswitch-service-type
-            (openvswitch-configuration
-             (package openvswitch)))
+   (service openvswitch-service-type)
    openvswitch-configuration-service))
 
 (define (run-openvswitch-test)