diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-28 17:02:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-28 17:02:51 +0000 |
| commit | 18bc8abd031f294c69941bd0401738b664f14bf0 (patch) | |
| tree | b016d7debf1b6a7790bbfa0e817c2b1ae7e26637 | |
| parent | 82cb8600534e8cf84f2c2ad9bb8d948f04e81b4c (diff) | |
| parent | 4408b6bb43353624b525ff674f5aaad46efc8438 (diff) | |
Merge "Move ec2 config opts to nova.api.ec2.cloud"
| -rw-r--r-- | nova/api/ec2/cloud.py | 28 | ||||
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 4 | ||||
| -rw-r--r-- | nova/config.py | 19 |
3 files changed, 25 insertions, 26 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index ad922118e..df6f17fb0 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -45,13 +45,31 @@ from nova import servicegroup from nova import utils from nova import volume +ec2_opts = [ + cfg.StrOpt('ec2_host', + default='$my_ip', + help='the ip of the ec2 api server'), + cfg.StrOpt('ec2_dmz_host', + default='$my_ip', + help='the internal ip of the ec2 api server'), + cfg.IntOpt('ec2_port', + default=8773, + help='the port of the ec2 api server'), + cfg.StrOpt('ec2_scheme', + default='http', + help='the protocol to use when connecting to the ec2 api ' + 'server (http, https)'), + cfg.StrOpt('ec2_path', + default='/services/Cloud', + help='the path prefix used to call the ec2 api server'), + cfg.ListOpt('region_list', + default=[], + help='list of region=fqdn pairs separated by commas'), +] CONF = cfg.CONF -CONF.import_opt('ec2_host', 'nova.config') -CONF.import_opt('ec2_path', 'nova.config') -CONF.import_opt('ec2_port', 'nova.config') -CONF.import_opt('ec2_scheme', 'nova.config') -CONF.import_opt('region_list', 'nova.config') +CONF.register_opts(ec2_opts) +CONF.import_opt('my_ip', 'nova.config') CONF.import_opt('vpn_image_id', 'nova.config') CONF.import_opt('vpn_key_suffix', 'nova.config') diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 274bdf5b5..8b8ae00c6 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -54,8 +54,8 @@ cloudpipe_opts = [ CONF = cfg.CONF CONF.register_opts(cloudpipe_opts) -CONF.import_opt('ec2_dmz_host', 'nova.config') -CONF.import_opt('ec2_port', 'nova.config') +CONF.import_opt('ec2_dmz_host', 'nova.api.ec2.cloud') +CONF.import_opt('ec2_port', 'nova.api.ec2.cloud') CONF.import_opt('vpn_image_id', 'nova.config') CONF.import_opt('vpn_key_suffix', 'nova.config') CONF.import_opt('pybasedir', 'nova.config') diff --git a/nova/config.py b/nova/config.py index d1878365b..a55a776ae 100644 --- a/nova/config.py +++ b/nova/config.py @@ -71,9 +71,6 @@ global_opts = [ cfg.StrOpt('my_ip', default=_get_my_ip(), help='ip address of this host'), - cfg.ListOpt('region_list', - default=[], - help='list of region=fqdn pairs separated by commas'), cfg.StrOpt('aws_access_key_id', default='admin', help='AWS Access ID'), @@ -130,22 +127,6 @@ global_opts = [ cfg.ListOpt('enabled_apis', default=['ec2', 'osapi_compute', 'metadata'], help='a list of APIs to enable by default'), - cfg.StrOpt('ec2_host', - default='$my_ip', - help='the ip of the ec2 api server'), - cfg.StrOpt('ec2_dmz_host', - default='$my_ip', - help='the internal ip of the ec2 api server'), - cfg.IntOpt('ec2_port', - default=8773, - help='the port of the ec2 api server'), - cfg.StrOpt('ec2_scheme', - default='http', - help='the protocol to use when connecting to the ec2 api ' - 'server (http, https)'), - cfg.StrOpt('ec2_path', - default='/services/Cloud', - help='the path prefix used to call the ec2 api server'), cfg.ListOpt('osapi_compute_ext_list', default=[], help='Specify list of extensions to load when using osapi_' |