summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Admin/Syncdb.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin/Syncdb.py')
-rw-r--r--src/lib/Bcfg2/Server/Admin/Syncdb.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Syncdb.py b/src/lib/Bcfg2/Server/Admin/Syncdb.py
index bff232b05..1eb953e2a 100644
--- a/src/lib/Bcfg2/Server/Admin/Syncdb.py
+++ b/src/lib/Bcfg2/Server/Admin/Syncdb.py
@@ -8,8 +8,7 @@ class Syncdb(Bcfg2.Server.Admin.Mode):
__shorthelp__ = ("Sync the Django ORM with the configured database")
__longhelp__ = __shorthelp__ + "\n\nbcfg2-admin syncdb"
__usage__ = "bcfg2-admin syncdb"
- options = {'web_configfile': Bcfg2.Options.WEB_CFILE,
- 'repo': Bcfg2.Options.SERVER_REPOSITORY}
+ options = {'configfile': Bcfg2.Options.WEB_CFILE}
def __call__(self, args):
import Bcfg2.Server.Admin
@@ -19,12 +18,6 @@ class Syncdb(Bcfg2.Server.Admin.Mode):
self.opts = Bcfg2.Options.OptionParser(self.options)
self.opts.parse(args)
- # we have to set up the django environment before we import
- # the syncdb command, but we have to wait to set up the
- # environment until we've read the config, which has to wait
- # until we've parsed options. it's a windy, twisting road.
- Bcfg2.settings.read_config(cfile=self.opts['web_configfile'],
- repo=self.opts['repo'])
setup_environ(Bcfg2.settings)
import Bcfg2.Server.models
Bcfg2.Server.models.load_models(cfile=self.opts['configfile'])