components/openstack/nova/patches/03-Solaris-flavors.patch
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 5408 e633765b4751
child 6854 52081f923019
--- a/components/openstack/nova/patches/03-Solaris-flavors.patch	Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/nova/patches/03-Solaris-flavors.patch	Fri May 20 17:42:29 2016 -0400
@@ -1,8 +1,8 @@
 In-house patch to update the default flavors for use with Solaris.
 This patch has not yet been submitted upstream.
 
---- nova-2014.2.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.~1~	2015-02-05 06:26:50.000000000 -0800
-+++ nova-2014.2.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py	2015-06-29 21:33:10.982774488 -0700
+--- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.~1~	2015-10-13 07:52:44.000000000 -0700
++++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py	2015-12-31 20:20:25.580944374 -0800
 @@ -85,17 +85,45 @@ def _create_shadow_tables(migrate_engine
              raise
  
@@ -65,7 +65,7 @@
 +            index += 1
      except Exception:
          LOG.info(repr(instance_types_table))
-         LOG.exception(_('Exception while seeding instance_types table'))
+         LOG.exception(_LE('Exception while seeding instance_types table'))
 @@ -1548,7 +1580,7 @@ def upgrade(migrate_engine):
      _create_shadow_tables(migrate_engine)