diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-19 10:41:30 -0500 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-19 10:41:30 -0500 |
| commit | ea812e66a4d2d84af8c63281c35c4109be1f67db (patch) | |
| tree | 6e34fd2cead93cd689c3d60f615a3aba30d46704 /nova/service.py | |
| parent | c4ecab260bed2118b119c7e415c2682e689fca3b (diff) | |
| parent | 7d7fbf5dfd8a8e10f584df5d27d3479c4b2b4d3a (diff) | |
| download | nova-ea812e66a4d2d84af8c63281c35c4109be1f67db.tar.gz nova-ea812e66a4d2d84af8c63281c35c4109be1f67db.tar.xz nova-ea812e66a4d2d84af8c63281c35c4109be1f67db.zip | |
merged trunk changes
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/nova/service.py b/nova/service.py index 98485bcac..705bed7fc 100644 --- a/nova/service.py +++ b/nova/service.py @@ -209,20 +209,6 @@ class Service(object): self.model_disconnected = True logging.exception(_("model server went away")) - try: - # NOTE(vish): This is late-loaded to make sure that the - # database is not created before flags have - # been loaded. - from nova.db.sqlalchemy import models - models.register_models() - except OperationalError: - fl_conn = FLAGS.sql_connection - fl_intv = FLAGS.sql_retry_interval - logging.exception(_("Data store %(fl_conn)s is" - " unreachable. Trying again in %(fl_intv)d" - " seconds.") % locals()) - time.sleep(FLAGS.sql_retry_interval) - def serve(*services): FLAGS(sys.argv) |