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 | |
| 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"
| -rwxr-xr-x | bin/nova-all | 2 | ||||
| -rwxr-xr-x | bin/nova-api | 2 | ||||
| -rw-r--r-- | nova/config.py | 3 | ||||
| -rw-r--r-- | nova/service.py | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bin/nova-all b/bin/nova-all index 88b92a4c6..2553f6487 100755 --- a/bin/nova-all +++ b/bin/nova-all @@ -50,7 +50,7 @@ from nova.vnc import xvp_proxy CONF = cfg.CONF -CONF.import_opt('enabled_apis', 'nova.config') +CONF.import_opt('enabled_apis', 'nova.service') LOG = logging.getLogger('nova.all') if __name__ == '__main__': diff --git a/bin/nova-api b/bin/nova-api index ceb7ca496..8457ea43d 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -43,7 +43,7 @@ from nova import service from nova import utils CONF = cfg.CONF -CONF.import_opt('enabled_apis', 'nova.config') +CONF.import_opt('enabled_apis', 'nova.service') if __name__ == '__main__': config.parse_args(sys.argv) 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'), 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'), |