diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-12-12 07:46:50 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-12-12 08:27:03 +0000 |
| commit | e67a27bbfde21f5086076a43ac9cd84ca30871d1 (patch) | |
| tree | 613c2c1b87adb53ff664ecd3e8f52e3774554e30 | |
| parent | 6808becda11a7682c6c56cd3b2afd55601cf1590 (diff) | |
| download | nova-e67a27bbfde21f5086076a43ac9cd84ca30871d1.tar.gz nova-e67a27bbfde21f5086076a43ac9cd84ca30871d1.tar.xz nova-e67a27bbfde21f5086076a43ac9cd84ca30871d1.zip | |
Move metadata_{host,port} to network.linux_net
These options are only used within nova.network.linux_net.
blueprint: scope-config-opts
Change-Id: Id8a64a83b6c6e069a5594c128792d8abf1d81180
| -rw-r--r-- | nova/config.py | 6 | ||||
| -rw-r--r-- | nova/network/linux_net.py | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/nova/config.py b/nova/config.py index baaafe081..000640440 100644 --- a/nova/config.py +++ b/nova/config.py @@ -117,12 +117,6 @@ global_opts = [ cfg.StrOpt('osapi_path', default='/v1.1/', help='the path prefix used to call the openstack api server'), - cfg.StrOpt('metadata_host', - default='$my_ip', - help='the ip for the metadata api server'), - cfg.IntOpt('metadata_port', - default=8775, - help='the port for the metadata api port'), cfg.StrOpt('default_instance_type', default='m1.small', help='default instance type to use, testing only'), diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 7929c235c..04896004a 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -84,6 +84,12 @@ linux_net_opts = [ default=False, help='Use single default gateway. Only first nic of vm will ' 'get default gateway from dhcp server'), + cfg.StrOpt('metadata_host', + default='$my_ip', + help='the ip for the metadata api server'), + cfg.IntOpt('metadata_port', + default=8775, + help='the port for the metadata api port'), ] CONF = cfg.CONF @@ -91,8 +97,6 @@ CONF.register_opts(linux_net_opts) CONF.import_opt('bindir', 'nova.config') CONF.import_opt('fake_network', 'nova.config') CONF.import_opt('host', 'nova.config') -CONF.import_opt('metadata_host', 'nova.config') -CONF.import_opt('metadata_port', 'nova.config') CONF.import_opt('use_ipv6', 'nova.config') CONF.import_opt('my_ip', 'nova.config') CONF.import_opt('state_path', 'nova.config') |