equal
deleted
inserted
replaced
1 In-house patch to update the default flavors for use with Solaris. |
1 In-house patch to update the default flavors for use with Solaris. |
2 This patch has not yet been submitted upstream. |
2 This patch has not yet been submitted upstream. |
3 |
3 |
4 --- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.~1~ 2015-10-13 07:52:44.000000000 -0700 |
4 --- nova-7e41c2cbb243b444bf275c46ea21169bbc08b2da/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.~1~ 2016-01-05 16:04:30.000000000 -0800 |
5 +++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py 2015-12-31 20:20:25.580944374 -0800 |
5 +++ nova-7e41c2cbb243b444bf275c46ea21169bbc08b2da/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py 2016-01-27 03:24:35.303852343 -0800 |
6 @@ -85,17 +85,45 @@ def _create_shadow_tables(migrate_engine |
6 @@ -85,17 +85,45 @@ def _create_shadow_tables(migrate_engine |
7 raise |
7 raise |
8 |
8 |
9 |
9 |
10 -def _populate_instance_types(instance_types_table): |
10 -def _populate_instance_types(instance_types_table): |
50 |
50 |
51 try: |
51 try: |
52 i = instance_types_table.insert() |
52 i = instance_types_table.insert() |
53 + e = instance_type_extra_specs.insert() |
53 + e = instance_type_extra_specs.insert() |
54 + index = 1 |
54 + index = 1 |
55 for name, values in default_inst_types.iteritems(): |
55 for name, values in default_inst_types.items(): |
56 i.execute({'name': name, 'memory_mb': values["mem"], |
56 i.execute({'name': name, 'memory_mb': values["mem"], |
57 'vcpus': values["vcpus"], 'deleted': 0, |
57 'vcpus': values["vcpus"], 'deleted': 0, |
58 @@ -106,6 +134,10 @@ def _populate_instance_types(instance_ty |
58 @@ -106,6 +134,10 @@ def _populate_instance_types(instance_ty |
59 'flavorid': values["flavid"], |
59 'flavorid': values["flavid"], |
60 'disabled': False, |
60 'disabled': False, |
64 + 'value': values['extra']}) |
64 + 'value': values['extra']}) |
65 + index += 1 |
65 + index += 1 |
66 except Exception: |
66 except Exception: |
67 LOG.info(repr(instance_types_table)) |
67 LOG.info(repr(instance_types_table)) |
68 LOG.exception(_LE('Exception while seeding instance_types table')) |
68 LOG.exception(_LE('Exception while seeding instance_types table')) |
69 @@ -1548,7 +1580,7 @@ def upgrade(migrate_engine): |
69 @@ -1575,6 +1607,6 @@ def upgrade(migrate_engine): |
70 _create_shadow_tables(migrate_engine) |
70 _create_shadow_tables(migrate_engine) |
71 |
71 |
72 # populate initial instance types |
72 # populate initial instance types |
73 - _populate_instance_types(instance_types) |
73 - _populate_instance_types(instance_types) |
74 + _populate_instance_types(instance_types, instance_type_extra_specs) |
74 + _populate_instance_types(instance_types, instance_type_extra_specs) |
75 |
75 |
76 _create_dump_tables(migrate_engine) |
76 _create_dump_tables(migrate_engine) |
77 |
|