← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/db/sqlalchemy/migrate_repo/versions/026_add_agent_table.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Dave Walker (Daviey), Chuck Short
  • Date: 2012-02-17 10:59:59 UTC
  • mfrom: (1.1.45)
  • Revision ID: package-import@ubuntu.com-20120217105959-ut218n638vv7cre0
Tags: 2012.1~e4~20120217.12709-0ubuntu1
https://launchpad.net/bugs/929127
https://launchpad.net/bugs/923681
https://launchpad.net/bugs/932787
[ Dave Walker (Daviey) ]
* New upstream snapshot
* debian/patches/temp_fix_linux_net.patch:
  - Dropped, applied upstream. LP: #929127
* debian/patches/libvirt-use-console-pipe.patch:
  - Rebased against latest trunk

[ Chuck Short ]
* debian/nova.conf: Re-enable default iscsi_helper.
* debian/nova.conf: More fixups.
* debian/control: Dont depend and conflicts on nova-compute-
  hypervisor. (LP: #923681)
* debian/patches/libvirt-us-console-pipe.patch: Refreshed.
* Temporarily disable console patch. (LP: #932787)
* New usptream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/migrate_repo/versions/026_add_agent_table.py
17
17
from sqlalchemy import MetaData, String, Table
18
18
from nova import log as logging
19
19
 
 
20
 
20
21
meta = MetaData()
 
22
LOG = logging.getLogger(__name__)
 
23
 
21
24
 
22
25
#
23
26
# New Tables
64
67
        try:
65
68
            table.create()
66
69
        except Exception:
67
 
            logging.info(repr(table))
 
70
            LOG.info(repr(table))
68
71
 
69
72
    instances = Table('instances', meta, autoload=True,
70
73
                      autoload_with=migrate_engine)