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

2
lib/nova
View File

@ -934,6 +934,7 @@ function stop_nova {
# create_instance_types(): Create default flavors # create_instance_types(): Create default flavors
function create_flavors { function create_flavors {
if is_service_enabled n-api; then
if ! openstack flavor list | grep -q ds512M; then if ! openstack flavor list | grep -q ds512M; then
# Note that danms hates these flavors and apologizes for sdague # Note that danms hates these flavors and apologizes for sdague
openstack flavor create --id c1 --ram 256 --disk 0 --vcpus 1 cirros256 openstack flavor create --id c1 --ram 256 --disk 0 --vcpus 1 cirros256
@ -950,6 +951,7 @@ function create_flavors {
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
} }
# Restore xtrace # Restore xtrace