summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Admin/Init.py
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2011-09-10 20:34:23 +0300
committerSol Jerome <sol.jerome@gmail.com>2011-09-10 13:31:43 -0500
commitafce508db22c0028ef108cd636fbc82f4cc2f52d (patch)
tree00589fde5eedec18c4549c9374202fcc03e44ce6 /src/lib/Server/Admin/Init.py
parent9584ab6df8498eea40929801a680d66559199a0f (diff)
downloadbcfg2-afce508db22c0028ef108cd636fbc82f4cc2f52d.tar.gz
bcfg2-afce508db22c0028ef108cd636fbc82f4cc2f52d.tar.bz2
bcfg2-afce508db22c0028ef108cd636fbc82f4cc2f52d.zip
make it clear that default list of plugins is taken from Options.SERVER_PLUGINS.default
Diffstat (limited to 'src/lib/Server/Admin/Init.py')
-rw-r--r--src/lib/Server/Admin/Init.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index 9a6ad9de9..9abf67a09 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -103,12 +103,7 @@ plugin_list = ['Account',
'TGenshi']
# Default list of plugins to use
-default_plugins = ['Bundler',
- 'Cfg',
- 'Metadata',
- 'Pkgmgr',
- 'Rules',
- 'SSHbase']
+default_plugins = Bcfg2.Options.SERVER_PLUGINS.default
def gen_password(length):
@@ -391,7 +386,7 @@ class Init(Bcfg2.Server.Admin.Mode):
"""Setup a new repo and create the content of the configuration file."""
keypath = os.path.dirname(os.path.abspath(self.configfile))
confdata = config % (self.repopath,
- ','.join(self.opts['plugins']),
+ ','.join(self.plugins),
self.opts['sendmail'],
self.opts['proto'],
self.password,