summaryrefslogtreecommitdiffstats
path: root/nova/config.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-09 19:55:50 +0000
committerGerrit Code Review <review@openstack.org>2013-01-09 19:55:50 +0000
commitf61b8216ecf61d20dd88d410a640331b192c30de (patch)
tree4f50c8f2fb6da4cef2869c6fe4291e4efc02eddd /nova/config.py
parent5eff7109b46e61c7193c76ef5ee97538fabba977 (diff)
parent41ef13a34c4fa41052ae72cc87e552dfd8ed91ba (diff)
downloadnova-f61b8216ecf61d20dd88d410a640331b192c30de.tar.gz
nova-f61b8216ecf61d20dd88d410a640331b192c30de.tar.xz
nova-f61b8216ecf61d20dd88d410a640331b192c30de.zip
Merge "Move enabled_apis option into nova.service"
Diffstat (limited to 'nova/config.py')
-rw-r--r--nova/config.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/config.py b/nova/config.py
index 172e772ae..f50c9065f 100644
--- a/nova/config.py
+++ b/nova/config.py
@@ -47,9 +47,6 @@ global_opts = [
cfg.StrOpt('my_ip',
default=_get_my_ip(),
help='ip address of this host'),
- cfg.ListOpt('enabled_apis',
- default=['ec2', 'osapi_compute', 'metadata'],
- help='a list of APIs to enable by default'),
cfg.StrOpt('vpn_image_id',
default='0',
help='image id used when starting up a cloudpipe vpn server'),