aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-03-25 00:17:41 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-03-31 21:26:15 +0200
commite73ded3c71527412944bb9a97916a096742f695d (patch)
tree298a33a27eee0bd65a262bddebc698b73dd9a67b /gnu
parentd7d3bdca890e1a39c7e3dde3fe11dad9e14cf875 (diff)
downloadguix-e73ded3c71527412944bb9a97916a096742f695d.tar
guix-e73ded3c71527412944bb9a97916a096742f695d.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/networking.scm3
-rw-r--r--gnu/tests/networking.scm4
2 files changed, 3 insertions, 4 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index cab129e0c3..5fbbf25789 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 a97b29bc4b..d1234442bb 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)