diff options
| -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') |