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-2014.2.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.~1~ 2015-02-05 06:26:50.000000000 -0800 |
4 --- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.~1~ 2015-10-13 07:52:44.000000000 -0700 |
5 +++ nova-2014.2.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py 2015-06-29 21:33:10.982774488 -0700 |
5 +++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py 2015-12-31 20:20:25.580944374 -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): |
63 + 'deleted': 0, 'key': 'zonecfg:brand', |
63 + 'deleted': 0, 'key': 'zonecfg:brand', |
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(_('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 @@ -1548,7 +1580,7 @@ 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) |