From b3c4bc67a0ea6580291d9d7adf36e17f31731280 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Wed, 11 Feb 2009 20:02:36 +0000
Subject: 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
---
 src/lib/Options.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/lib/Options.py')

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'),
-- 
cgit v1.2.3-1-g7c22