diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 07:02:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 07:02:24 +0000 |
| commit | f9029d36e8a70d85ee31eed673c625b5199030c2 (patch) | |
| tree | a433497f78aa46bfe7e8053d44012a3540def6a2 | |
| parent | 51653257ee911e6d86da187d84a28d3625879111 (diff) | |
| parent | 0778420dcd94b935d7c6dd075e49041e497cf462 (diff) | |
| download | nova-f9029d36e8a70d85ee31eed673c625b5199030c2.tar.gz nova-f9029d36e8a70d85ee31eed673c625b5199030c2.tar.xz nova-f9029d36e8a70d85ee31eed673c625b5199030c2.zip | |
Merge "Move global s3 opts into nova.image.s3"
| -rw-r--r-- | nova/config.py | 7 | ||||
| -rw-r--r-- | nova/image/s3.py | 10 | ||||
| -rw-r--r-- | nova/tests/test_objectstore.py | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/nova/config.py b/nova/config.py index cfa4c9b43..e197757a7 100644 --- a/nova/config.py +++ b/nova/config.py @@ -47,13 +47,6 @@ global_opts = [ cfg.StrOpt('my_ip', default=_get_my_ip(), help='ip address of this host'), - cfg.IntOpt('s3_port', - default=3333, - help='port used when accessing the s3 api'), - cfg.StrOpt('s3_host', - default='$my_ip', - help='hostname or ip for openstack to use when accessing ' - 'the s3 api'), cfg.StrOpt('cert_topic', default='cert', help='the topic cert nodes listen on'), diff --git a/nova/image/s3.py b/nova/image/s3.py index b5bb3436e..6cb5e74ac 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -44,6 +44,13 @@ s3_opts = [ cfg.StrOpt('image_decryption_dir', default='/tmp', help='parent dir for tempdir used for image decryption'), + cfg.StrOpt('s3_host', + default='$my_ip', + help='hostname or ip for openstack to use when accessing ' + 'the s3 api'), + cfg.IntOpt('s3_port', + default=3333, + help='port used when accessing the s3 api'), cfg.StrOpt('s3_access_key', default='notchecked', help='access key to use for s3 server for images'), @@ -61,8 +68,7 @@ s3_opts = [ CONF = cfg.CONF CONF.register_opts(s3_opts) -CONF.import_opt('s3_host', 'nova.config') -CONF.import_opt('s3_port', 'nova.config') +CONF.import_opt('my_ip', 'nova.config') class S3ImageService(object): diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py index 8885b3554..e76a31ee2 100644 --- a/nova/tests/test_objectstore.py +++ b/nova/tests/test_objectstore.py @@ -34,7 +34,7 @@ from nova import test from nova import wsgi CONF = cfg.CONF -CONF.import_opt('s3_host', 'nova.config') +CONF.import_opt('s3_host', 'nova.image.s3') # Create a unique temporary directory. We don't delete after test to # allow checking the contents after running tests. Users and/or tools |