summaryrefslogtreecommitdiffstats
path: root/nova/service.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-01-08 08:05:11 +0000
committerMark McLoughlin <markmc@redhat.com>2013-01-09 08:15:43 +0000
commit41ef13a34c4fa41052ae72cc87e552dfd8ed91ba (patch)
tree7ac2d786036dd22bb94a573b7a33807abdf1f634 /nova/service.py
parent1db4b13d86d748d9619ea9ce37bb4663285468b5 (diff)
downloadnova-41ef13a34c4fa41052ae72cc87e552dfd8ed91ba.tar.gz
nova-41ef13a34c4fa41052ae72cc87e552dfd8ed91ba.tar.xz
nova-41ef13a34c4fa41052ae72cc87e552dfd8ed91ba.zip
Move enabled_apis option into nova.service
The enabled_apis option is only used in nova-api and nova-all but there's no more obvious place to put it than nova.service. At least this location is consistent, since we quite have a number of other options related to the APIs in nova.service. blueprint: scope-config-opts Change-Id: I86e200fa5ad91ac0b7ab6837cc61e5927b2ebeb7
Diffstat (limited to 'nova/service.py')
-rw-r--r--nova/service.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/service.py b/nova/service.py
index 51004982a..fb322b19a 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -57,6 +57,9 @@ service_opts = [
help='range of seconds to randomly delay when starting the'
' periodic task scheduler to reduce stampeding.'
' (Disable by setting to 0)'),
+ cfg.ListOpt('enabled_apis',
+ default=['ec2', 'osapi_compute', 'metadata'],
+ help='a list of APIs to enable by default'),
cfg.StrOpt('ec2_listen',
default="0.0.0.0",
help='IP address for EC2 API to listen'),