From f7ae12ff655129a76df6eb8333a2c08c088253d0 Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Sat, 20 Apr 2013 16:08:10 +0800
Subject: Update NovaBase model per changes on oslo.db.sqlalchemy

Fixed NovaBase to inherit from models.TimestampMixin
Added metadata attribute
Added db.sqlalchemy to openstack-common.conf

Oslo sync command:
python update.py --modules db.sqlalchemy --base nova --dest-dir ../nova

Change-Id: Ie4ad8e8b235e146ddb946cdf7f15d74e060ee4a3
---
 nova/db/sqlalchemy/models.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 016563c37..85a13c028 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -35,8 +35,10 @@ CONF = cfg.CONF
 BASE = declarative_base()
 
 
-class NovaBase(models.SoftDeleteMixin, models.ModelBase):
-    pass
+class NovaBase(models.SoftDeleteMixin,
+               models.TimestampMixin,
+               models.ModelBase):
+    metadata = None
 
 
 class Service(BASE, NovaBase):
-- 
cgit