diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 08:05:11 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-09 08:15:43 +0000 |
| commit | 41ef13a34c4fa41052ae72cc87e552dfd8ed91ba (patch) | |
| tree | 7ac2d786036dd22bb94a573b7a33807abdf1f634 | |
| parent | 1db4b13d86d748d9619ea9ce37bb4663285468b5 (diff) | |
| download | nova-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
| -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'), |