summaryrefslogtreecommitdiffstats
path: root/src/lib/Options.py
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-02-11 20:02:36 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-02-11 20:02:36 +0000
commitb3c4bc67a0ea6580291d9d7adf36e17f31731280 (patch)
tree59c0afa8dc4b8ef99e833132a8705a5a88ee8255 /src/lib/Options.py
parent6cc7242be3e7c82f1ee473a1b85d06a5a23aa172 (diff)
downloadbcfg2-b3c4bc67a0ea6580291d9d7adf36e17f31731280.tar.gz
bcfg2-b3c4bc67a0ea6580291d9d7adf36e17f31731280.tar.bz2
bcfg2-b3c4bc67a0ea6580291d9d7adf36e17f31731280.zip
Update Init.py for new bcfg2.conf layout
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5073 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Options.py')
-rw-r--r--src/lib/Options.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py
index c8716bdeb..3953effee 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -180,12 +180,17 @@ SERVER_REPOSITORY = Option('Server repository path', '/var/lib/bcfg2',
SERVER_VCS = Option('Server vcs support', cf=('server', 'vcs'),
default='default')
SERVER_PLUGINS = Option('Server plugin list', cf=('server', 'plugins'),
- default=[], cook=list_split)
-SERVER_GENERATORS = Option('Server generator list', cf=('server', 'generators'),
- default=['SSHbase', 'Cfg', 'Pkgmgr', 'Rules'],
- cook=list_split)
-SERVER_STRUCTURES = Option('Server structure list', cf=('server', 'structures'),
- default=['Bundler', 'Base'], cook=list_split)
+ # default server plugins
+ default=[
+ 'Base',
+ 'Bundler',
+ 'Cfg',
+ 'Metadata',
+ 'Pkgmgr',
+ 'Rules',
+ 'SSHbase',
+ ],
+ cook=list_split)
SERVER_MCONNECT = Option('Server Metadata Connector list', cook=list_split,
cf=('server', 'connectors'), default=['Probes'], )
SERVER_FILEMONITOR = Option('Server file monitor', cf=('server', 'filemonitor'),