summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJasper Capel <capel@stone-it.com>2009-02-02 13:53:34 +0100
committerJasper Capel <capel@stone-it.com>2009-02-02 13:53:34 +0100
commit535672dad60c02971781b6ca35a9ea54409481c9 (patch)
tree31addd921d9e597bfff62ec9518798a8a13a347c
parenta3d14d61861e3bab13b2582fc90b2e7635831401 (diff)
downloadfunc-535672dad60c02971781b6ca35a9ea54409481c9.tar.gz
func-535672dad60c02971781b6ca35a9ea54409481c9.tar.xz
func-535672dad60c02971781b6ca35a9ea54409481c9.zip
bridge module: imported the required modules for the configfile stuff
-rw-r--r--func/minion/modules/bridge.py17
1 files changed, 7 insertions, 10 deletions
diff --git a/func/minion/modules/bridge.py b/func/minion/modules/bridge.py
index 3c23649..3563f1d 100644
--- a/func/minion/modules/bridge.py
+++ b/func/minion/modules/bridge.py
@@ -20,23 +20,20 @@
import func_module
import os, re
+from certmaster.config import BaseConfig, Option, ListOption
-class Config(BaseConfig):
- ignorebridges = ListOption()
- brctl = Option("/usr/sbin/brctl")
- ip = Option("/sbin/ip")
- ifup = Option("/sbin/ifup")
- ifdown = Option("/sbin/ifdown")
class Bridge(func_module.FuncModule):
version = "0.0.3"
api_version = "0.0.2"
description = "Func module for Bridge management"
- # A list of bridge names that should be ignored. You can use this if you
- # have bridges that should never be touched by func.
- # Will ignore virbr0 by default, as it's managed by libvirtd, it's probably
- # a bad idea to touch it.
+ class Config(BaseConfig):
+ ignorebridges = ListOption()
+ brctl = Option("/usr/sbin/brctl")
+ ip = Option("/sbin/ip")
+ ifup = Option("/sbin/ifup")
+ ifdown = Option("/sbin/ifdown")
def list(self, listvif=True):
# Returns a dictionary. Elements look like this: