← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/nova/oneiric-updates

« back to all changes in this revision

Viewing changes to nova/network/linux_net.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short, Scott Moser
  • Date: 2011-09-27 14:56:59 UTC
  • Revision ID: package-import@ubuntu.com-20110927145659-rz5u0ldy09hvwzlg
Tags: 2011.3-0ubuntu3
https://launchpad.net/bugs/856530
https://launchpad.net/bugs/839796
https://launchpad.net/bugs/859587
https://launchpad.net/bugs/854614
[Adam Gandelman]
* debian/nova-common.postinst: Create 'nova' group, add user to it
  (LP: #856530)
* debian/nova.conf, debian/nova-compute.upstart.in: Move reference of
  nova-compute.conf from nova.conf to nova-compute's argv. (LP: #839796)

[Chuck Short]
* debian/patches/backport-recreate-gateway-using-dhcp.patch:
  Makes sure to recreate gateway for moved ip. (LP: #859587)
* debian/control: Update Vcs info.

[ Scott Moser ]
* debian/patches/fqdn-in-local-hostname-of-ec2-metadata.patch
  Make the 'local-hostname' in the EC2 Metadata service contain
  the domainname also. (LP: #854614)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/linux_net.py
42
42
flags.DEFINE_string('dhcpbridge_flagfile',
43
43
                    '/etc/nova/nova-dhcpbridge.conf',
44
44
                    'location of flagfile for dhcpbridge')
45
 
flags.DEFINE_string('dhcp_domain',
46
 
                    'novalocal',
47
 
                    'domain to use for building the hostnames')
48
45
flags.DEFINE_string('networks_path', '$state_path/networks',
49
46
                    'Location to keep network config files')
50
47
flags.DEFINE_string('public_interface', 'eth0',
486
483
            if ip_params[0] != full_ip:
487
484
                new_ip_params.append(ip_params)
488
485
    if not old_ip_params or old_ip_params[0][0] != full_ip:
 
486
        gateway = None
 
487
        out, err = _execute('route', '-n', run_as_root=True)
 
488
        for line in out.split('\n'):
 
489
            fields = line.split()
 
490
            if fields and fields[0] == '0.0.0.0' and \
 
491
                            fields[-1] == dev:
 
492
                gateway = fields[1]
 
493
                _execute('route', 'del', 'default', 'gw', gateway,
 
494
                         'dev', dev, check_exit_code=False,
 
495
                         run_as_root=True)
489
496
        for ip_params in old_ip_params:
490
497
            _execute(*_ip_bridge_cmd('del', ip_params, dev),
491
498
                        run_as_root=True)
492
499
        for ip_params in new_ip_params:
493
500
            _execute(*_ip_bridge_cmd('add', ip_params, dev),
494
501
                        run_as_root=True)
 
502
        if gateway:
 
503
            _execute('route', 'add', 'default', 'gw', gateway,
 
504
                        run_as_root=True)
495
505
        if FLAGS.send_arp_for_ha:
496
506
            _execute('arping', '-U', network_ref['dhcp_server'],
497
507
                      '-A', '-I', dev,