| author | saurabh.vyas@oracle.com |
| Tue, 15 Dec 2015 00:08:40 -0800 | |
| branch | s11u3-sru |
| changeset 5408 | e633765b4751 |
| parent 4072 | db0cec748ec0 |
| child 5405 | 66fd59fecd68 |
| permissions | -rw-r--r-- |
|
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to update the default flavors for use with Solaris. |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
This patch has not yet been submitted upstream. |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
4 |
--- nova-2014.2.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.~1~ 2015-02-05 06:26:50.000000000 -0800 |
|
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
5 |
+++ nova-2014.2.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py 2015-06-29 21:33:10.982774488 -0700 |
|
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
6 |
@@ -85,17 +85,45 @@ def _create_shadow_tables(migrate_engine |
|
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
7 |
raise |
|
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
|
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
|
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
-def _populate_instance_types(instance_types_table): |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
+def _populate_instance_types(instance_types_table, instance_type_extra_specs): |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
default_inst_types = {
|
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
13 |
- 'm1.tiny': dict(mem=512, vcpus=1, root_gb=1, eph_gb=0, flavid=1), |
|
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
- 'm1.small': dict(mem=2048, vcpus=1, root_gb=20, eph_gb=0, flavid=2), |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
- 'm1.medium': dict(mem=4096, vcpus=2, root_gb=40, eph_gb=0, flavid=3), |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
- 'm1.large': dict(mem=8192, vcpus=4, root_gb=80, eph_gb=0, flavid=4), |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
- 'm1.xlarge': dict(mem=16384, vcpus=8, root_gb=160, eph_gb=0, flavid=5) |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
18 |
+ 'Oracle Solaris kernel zone - tiny': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
19 |
+ mem=2048, vcpus=1, root_gb=20, eph_gb=0, flavid=1, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
20 |
+ extra='solaris-kz'), |
|
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
21 |
+ 'Oracle Solaris kernel zone - small': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
22 |
+ mem=4096, vcpus=4, root_gb=40, eph_gb=0, flavid=2, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
23 |
+ extra='solaris-kz'), |
|
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
24 |
+ 'Oracle Solaris kernel zone - medium': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
25 |
+ mem=8192, vcpus=8, root_gb=80, eph_gb=0, flavid=3, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
26 |
+ extra='solaris-kz'), |
|
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
27 |
+ 'Oracle Solaris kernel zone - large': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
28 |
+ mem=16384, vcpus=16, root_gb=160, eph_gb=0, flavid=4, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
29 |
+ extra='solaris-kz'), |
|
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
30 |
+ 'Oracle Solaris kernel zone - xlarge': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
31 |
+ mem=32768, vcpus=32, root_gb=320, eph_gb=0, flavid=5, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
32 |
+ extra='solaris-kz'), |
|
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
+ |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
34 |
+ 'Oracle Solaris non-global zone - tiny': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
35 |
+ mem=1024, vcpus=1, root_gb=20, eph_gb=0, flavid=6, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
36 |
+ extra='solaris'), |
|
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
37 |
+ 'Oracle Solaris non-global zone - small': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
38 |
+ mem=2048, vcpus=4, root_gb=40, eph_gb=0, flavid=7, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
39 |
+ extra='solaris'), |
|
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
40 |
+ 'Oracle Solaris non-global zone - medium': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
41 |
+ mem=4096, vcpus=8, root_gb=80, eph_gb=0, flavid=8, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
42 |
+ extra='solaris'), |
|
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
43 |
+ 'Oracle Solaris non-global zone - large': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
44 |
+ mem=8192, vcpus=16, root_gb=160, eph_gb=0, flavid=9, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
45 |
+ extra='solaris'), |
|
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
46 |
+ 'Oracle Solaris non-global zone - xlarge': dict( |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
47 |
+ mem=16384, vcpus=32, root_gb=320, eph_gb=0, flavid=10, |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3028
diff
changeset
|
48 |
+ extra='solaris') |
|
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
49 |
} |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
50 |
|
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
51 |
try: |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
52 |
i = instance_types_table.insert() |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
53 |
+ e = instance_type_extra_specs.insert() |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
54 |
+ index = 1 |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
55 |
for name, values in default_inst_types.iteritems(): |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
56 |
i.execute({'name': name, 'memory_mb': values["mem"],
|
|
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
57 |
'vcpus': values["vcpus"], 'deleted': 0, |
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
58 |
@@ -106,6 +134,10 @@ def _populate_instance_types(instance_ty |
|
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
59 |
'flavorid': values["flavid"], |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
60 |
'disabled': False, |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
61 |
'is_public': True}) |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
62 |
+ e.execute({'instance_type_id': index,
|
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
63 |
+ 'deleted': 0, 'key': 'zonecfg:brand', |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
64 |
+ 'value': values['extra']}) |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
65 |
+ index += 1 |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
66 |
except Exception: |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
67 |
LOG.info(repr(instance_types_table)) |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
68 |
LOG.exception(_('Exception while seeding instance_types table'))
|
|
5408
e633765b4751
20531298 tiny flavor needs more storage
saurabh.vyas@oracle.com
parents:
4072
diff
changeset
|
69 |
@@ -1548,7 +1580,7 @@ def upgrade(migrate_engine): |
|
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
70 |
_create_shadow_tables(migrate_engine) |
|
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
71 |
|
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
72 |
# populate initial instance types |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
73 |
- _populate_instance_types(instance_types) |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
74 |
+ _populate_instance_types(instance_types, instance_type_extra_specs) |
|
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
75 |
|
|
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
76 |
_create_dump_tables(migrate_engine) |
|
3028
5e73a3a3f66a
PSARC/2013/350 OpenStack for Solaris (Umbrella)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
77 |