diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 09:48:03 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-09 22:09:17 +0000 |
| commit | 7cb17d63f1bd317abc5cacd6d77e7ca810ccc346 (patch) | |
| tree | 9c633aafbfe7446be208737232f627c0922d25e4 /nova/image | |
| parent | 562b5a452db7208b53022aba0e8b6a8f70150587 (diff) | |
Move global service networking opts to new module
The my_ip, host and use_ipv6 options are used all over the codebase
and they're pretty well related to each other. Create a new netconf
module for them to live in.
There are now no options registered globally in nova.config!
blueprint: scope-config-opts
Change-Id: Ifde37839ae6f38e6bf99dff1e80b8e25fd68ed25
Diffstat (limited to 'nova/image')
| -rw-r--r-- | nova/image/glance.py | 2 | ||||
| -rw-r--r-- | nova/image/s3.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 6a5406d9e..5a5c187cb 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -64,7 +64,7 @@ LOG = logging.getLogger(__name__) CONF = cfg.CONF CONF.register_opts(glance_opts) CONF.import_opt('auth_strategy', 'nova.api.auth') -CONF.import_opt('my_ip', 'nova.config') +CONF.import_opt('my_ip', 'nova.netconf') def generate_glance_url(): diff --git a/nova/image/s3.py b/nova/image/s3.py index 6cb5e74ac..31ab6b1fc 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -68,7 +68,7 @@ s3_opts = [ CONF = cfg.CONF CONF.register_opts(s3_opts) -CONF.import_opt('my_ip', 'nova.config') +CONF.import_opt('my_ip', 'nova.netconf') class S3ImageService(object): |