openstack/devstack
Code Issues Proposed changes

Merge "Fix create_flavors on subnodes"

Browse Source
This commit is contained in:
Jenkins 2016-04-07 00:40:31 +00:00 committed by Gerrit Code Review
commit 6b6d48eaff
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/nova
View File

@ -934,21 +934,23 @@ function stop_nova {
# create_instance_types(): Create default flavors # create_instance_types(): Create default flavors
function create_flavors { function create_flavors {
if ! openstack flavor list | grep -q ds512M; then if is_service_enabled n-api; then
# Note that danms hates these flavors and apologizes for sdague if ! openstack flavor list | grep -q ds512M; then
openstack flavor create --id c1 --ram 256 --disk 0 --vcpus 1 cirros256 # Note that danms hates these flavors and apologizes for sdague
openstack flavor create --id d1 --ram 512 --disk 5 --vcpus 1 ds512M openstack flavor create --id c1 --ram 256 --disk 0 --vcpus 1 cirros256
openstack flavor create --id d2 --ram 1024 --disk 10 --vcpus 1 ds1G openstack flavor create --id d1 --ram 512 --disk 5 --vcpus 1 ds512M
openstack flavor create --id d3 --ram 2048 --disk 10 --vcpus 2 ds2G openstack flavor create --id d2 --ram 1024 --disk 10 --vcpus 1 ds1G
openstack flavor create --id d4 --ram 4096 --disk 20 --vcpus 4 ds4G openstack flavor create --id d3 --ram 2048 --disk 10 --vcpus 2 ds2G
fi openstack flavor create --id d4 --ram 4096 --disk 20 --vcpus 4 ds4G
fi
if ! openstack flavor list | grep -q m1.tiny; then if ! openstack flavor list | grep -q m1.tiny; then
openstack flavor create --id 1 --ram 512 --disk 1 --vcpus 1 m1.tiny openstack flavor create --id 1 --ram 512 --disk 1 --vcpus 1 m1.tiny
openstack flavor create --id 2 --ram 2048 --disk 20 --vcpus 1 m1.small openstack flavor create --id 2 --ram 2048 --disk 20 --vcpus 1 m1.small
openstack flavor create --id 3 --ram 4096 --disk 40 --vcpus 2 m1.medium openstack flavor create --id 3 --ram 4096 --disk 40 --vcpus 2 m1.medium
openstack flavor create --id 4 --ram 8192 --disk 80 --vcpus 4 m1.large openstack flavor create --id 4 --ram 8192 --disk 80 --vcpus 4 m1.large
openstack flavor create --id 5 --ram 16384 --disk 160 --vcpus 8 m1.xlarge openstack flavor create --id 5 --ram 16384 --disk 160 --vcpus 8 m1.xlarge
fi
fi fi
} }