Merge "Document CONF.default_flavor is for EC2 only"

2013-08-26 04:07:29 +00:00
parent 3e1e7c2a82 3360256d57
commit ca0aadb1fc
2 changed files with 4 additions and 2 deletions
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -642,7 +642,8 @@
 # Options defined in nova.compute.flavors
 #

-# default flavor to use, testing only (string value)
+# default flavor to use for the EC2 API only. The Nova API
+# does not support a default flavor. (string value)
 #default_flavor=m1.small


--- a/nova/compute/flavors.py
+++ b/nova/compute/flavors.py
@@ -39,7 +39,8 @@ flavor_opts = [
               # Deprecated in Havana
               deprecated_name='default_instance_type',
               default='m1.small',
-               help='default flavor to use, testing only'),
+               help='default flavor to use for the EC2 API only. The Nova API '
+               'does not support a default flavor.'),
 ]

 CONF = cfg.CONF