This makes us depend on n-api being enabled, which should avoid running
this on subnodes, where it fails because of no credentials.
Change-Id: I209bd59cd57be27c3375f5a2074361307abcafe9
Closes-Bug: #1567065
... | ... |
@@ -934,21 +934,23 @@ function stop_nova { |
934 | 934 |
|
935 | 935 |
# create_instance_types(): Create default flavors |
936 | 936 |
function create_flavors { |
937 |
- if ! openstack flavor list | grep -q ds512M; then |
|
938 |
- # Note that danms hates these flavors and apologizes for sdague |
|
939 |
- openstack flavor create --id c1 --ram 256 --disk 0 --vcpus 1 cirros256 |
|
940 |
- openstack flavor create --id d1 --ram 512 --disk 5 --vcpus 1 ds512M |
|
941 |
- openstack flavor create --id d2 --ram 1024 --disk 10 --vcpus 1 ds1G |
|
942 |
- openstack flavor create --id d3 --ram 2048 --disk 10 --vcpus 2 ds2G |
|
943 |
- openstack flavor create --id d4 --ram 4096 --disk 20 --vcpus 4 ds4G |
|
944 |
- fi |
|
945 |
- |
|
946 |
- if ! openstack flavor list | grep -q m1.tiny; then |
|
947 |
- openstack flavor create --id 1 --ram 512 --disk 1 --vcpus 1 m1.tiny |
|
948 |
- openstack flavor create --id 2 --ram 2048 --disk 20 --vcpus 1 m1.small |
|
949 |
- openstack flavor create --id 3 --ram 4096 --disk 40 --vcpus 2 m1.medium |
|
950 |
- openstack flavor create --id 4 --ram 8192 --disk 80 --vcpus 4 m1.large |
|
951 |
- openstack flavor create --id 5 --ram 16384 --disk 160 --vcpus 8 m1.xlarge |
|
937 |
+ if is_service_enabled n-api; then |
|
938 |
+ if ! openstack flavor list | grep -q ds512M; then |
|
939 |
+ # Note that danms hates these flavors and apologizes for sdague |
|
940 |
+ openstack flavor create --id c1 --ram 256 --disk 0 --vcpus 1 cirros256 |
|
941 |
+ openstack flavor create --id d1 --ram 512 --disk 5 --vcpus 1 ds512M |
|
942 |
+ openstack flavor create --id d2 --ram 1024 --disk 10 --vcpus 1 ds1G |
|
943 |
+ openstack flavor create --id d3 --ram 2048 --disk 10 --vcpus 2 ds2G |
|
944 |
+ openstack flavor create --id d4 --ram 4096 --disk 20 --vcpus 4 ds4G |
|
945 |
+ fi |
|
946 |
+ |
|
947 |
+ if ! openstack flavor list | grep -q m1.tiny; then |
|
948 |
+ openstack flavor create --id 1 --ram 512 --disk 1 --vcpus 1 m1.tiny |
|
949 |
+ openstack flavor create --id 2 --ram 2048 --disk 20 --vcpus 1 m1.small |
|
950 |
+ openstack flavor create --id 3 --ram 4096 --disk 40 --vcpus 2 m1.medium |
|
951 |
+ openstack flavor create --id 4 --ram 8192 --disk 80 --vcpus 4 m1.large |
|
952 |
+ openstack flavor create --id 5 --ram 16384 --disk 160 --vcpus 8 m1.xlarge |
|
953 |
+ fi |
|
952 | 954 |
fi |
953 | 955 |
} |
954 | 956 |
|