From 3360256d57a30a307ac072284057b4cb4203f525 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 1 Aug 2013 16:10:17 -0700 Subject: [PATCH] Document CONF.default_flavor is for EC2 only CONF.default_flavor is only used in the EC2 API, so update the help message to reflect that. Partial-Bug: #1207553 Change-Id: I3f263c564b619a32a69f5170ab07eddfba77f60b --- etc/nova/nova.conf.sample | 3 ++- nova/compute/flavors.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index 62eb53510a..c46fb37726 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -647,7 +647,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 diff --git a/nova/compute/flavors.py b/nova/compute/flavors.py index 73bd88ae32..1efa563946 100644 --- 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