diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-04-07 10:37:40 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-04-07 10:37:40 -0700 |
| commit | 8da3e6c19b97ab7cd08e69fb0df114653c0b90db (patch) | |
| tree | 83957ab022875c7c2437ec03be46aa8ced45c627 | |
| parent | 3831008b4e8aeec08b58afb49e40428ad5ece5b1 (diff) | |
| download | nova-8da3e6c19b97ab7cd08e69fb0df114653c0b90db.tar.gz nova-8da3e6c19b97ab7cd08e69fb0df114653c0b90db.tar.xz nova-8da3e6c19b97ab7cd08e69fb0df114653c0b90db.zip | |
Simplify by always adding to loopback
| -rw-r--r-- | nova/network/linux_net.py | 5 | ||||
| -rw-r--r-- | nova/network/manager.py | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index a4d312f02..ed6c943c7 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -391,11 +391,10 @@ def unbind_floating_ip(floating_ip): 'dev', FLAGS.public_interface) -def ensure_metadata_ip(interface): +def ensure_metadata_ip(): """Sets up local metadata ip""" _execute('sudo', 'ip', 'addr', 'add', '169.254.169.254/32', - 'scope', 'link', 'dev', interface, - check_exit_code=False) + 'scope', 'link', 'dev', 'lo', check_exit_code=False) def ensure_vlan_forward(public_ip, port, private_ip): diff --git a/nova/network/manager.py b/nova/network/manager.py index b80560bdf..0dd7f2360 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -100,8 +100,6 @@ flags.DEFINE_string('network_host', socket.gethostname(), 'Network host to use for ip allocation in flat modes') flags.DEFINE_bool('fake_call', False, 'If True, skip using the queue and make local calls') -flags.DEFINE_string('metadata_interface', 'eth0', - 'interface to add the metadata ip to') class AddressAlreadyAllocated(exception.Error): @@ -128,7 +126,7 @@ class NetworkManager(manager.SchedulerDependentManager): standalone service. """ self.driver.init_host() - self.driver.ensure_metadata_ip(FLAGS.metadata_interface) + self.driver.ensure_metadata_ip() # Set up networking for the projects for which we're already # the designated network host. ctxt = context.get_admin_context() |