--- a/components/openstack/nova/patches/03-Solaris-flavors.patch Fri Mar 20 03:13:26 2015 -0700
+++ b/components/openstack/nova/patches/03-Solaris-flavors.patch Thu Mar 19 14:41:20 2015 -0700
@@ -1,10 +1,9 @@
In-house patch to update the default flavors for use with Solaris.
This patch has not yet been submitted upstream.
---- nova-2013.2.3/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py.~1~ 2014-04-03 11:49:46.000000000 -0700
-+++ nova-2013.2.3/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py 2014-05-19 04:14:17.367917095 -0700
-@@ -2,6 +2,8 @@
-
+--- nova-2014.2.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.~1~ 2014-10-16 04:52:25.000000000 -0700
++++ nova-2014.2.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py 2014-10-21 15:34:50.909529171 -0700
+@@ -1,5 +1,7 @@
# Copyright 2012 OpenStack Foundation
#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -12,8 +11,8 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
-@@ -37,17 +39,45 @@
- return Text().with_variant(dialects.mysql.MEDIUMTEXT(), 'mysql')
+@@ -85,17 +87,45 @@ def _create_shadow_tables(migrate_engine
+ raise
-def _populate_instance_types(instance_types_table):
@@ -63,8 +62,8 @@
+ index = 1
for name, values in default_inst_types.iteritems():
i.execute({'name': name, 'memory_mb': values["mem"],
- 'vcpus': values["vcpus"], 'deleted': False,
-@@ -58,6 +88,10 @@
+ 'vcpus': values["vcpus"], 'deleted': 0,
+@@ -106,6 +136,10 @@ def _populate_instance_types(instance_ty
'flavorid': values["flavid"],
'disabled': False,
'is_public': True})
@@ -75,12 +74,12 @@
except Exception:
LOG.info(repr(instance_types_table))
LOG.exception(_('Exception while seeding instance_types table'))
-@@ -1219,7 +1253,7 @@
- name='instance_info_caches_instance_id_key').create()
+@@ -1548,7 +1582,7 @@ def upgrade(migrate_engine):
+ _create_shadow_tables(migrate_engine)
# populate initial instance types
- _populate_instance_types(instance_types)
+ _populate_instance_types(instance_types, instance_type_extra_specs)
+ _create_dump_tables(migrate_engine)
- def downgrade(migrate_engine):