diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 19:55:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 19:55:50 +0000 |
| commit | f61b8216ecf61d20dd88d410a640331b192c30de (patch) | |
| tree | 4f50c8f2fb6da4cef2869c6fe4291e4efc02eddd /nova/service.py | |
| parent | 5eff7109b46e61c7193c76ef5ee97538fabba977 (diff) | |
| parent | 41ef13a34c4fa41052ae72cc87e552dfd8ed91ba (diff) | |
| download | nova-f61b8216ecf61d20dd88d410a640331b192c30de.tar.gz nova-f61b8216ecf61d20dd88d410a640331b192c30de.tar.xz nova-f61b8216ecf61d20dd88d410a640331b192c30de.zip | |
Merge "Move enabled_apis option into nova.service"
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 3 |
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'), |