← Back to branch summary

~justin-fathomdb/nova/bug744150

« back to all changes in this revision

Viewing changes to nova/network/manager.py

  • Committer: Andy Smith
  • Date: 2011-01-18 23:51:13 UTC
  • mfrom: (579 nova)
  • mto: This revision was merged to the branch mainline in revision 581.
  • Revision ID: code@term.ie-20110118235113-ivu21efg3h9z6niq
merge from upstream and fix small issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/manager.py
92
92
flags.DEFINE_integer('fixed_ip_disassociate_timeout', 600,
93
93
                     'Seconds after which a deallocated ip is disassociated')
94
94
 
95
 
flags.DEFINE_bool('use_ipv6', True,
 
95
flags.DEFINE_bool('use_ipv6', False,
96
96
                  'use the ipv6')
97
97
flags.DEFINE_string('network_host', socket.gethostname(),
98
98
                    'Network host to use for ip allocation in flat modes')
517
517
            net['vlan'] = vlan
518
518
            net['bridge'] = 'br%s' % vlan
519
519
            if(FLAGS.use_ipv6):
520
 
                cidr_v6 = "%s/%s" % (
521
 
                                     fixed_net_v6[start_v6],
522
 
                                     significant_bits_v6
523
 
                                     )
 
520
                cidr_v6 = "%s/%s" % (fixed_net_v6[start_v6],
 
521
                                     significant_bits_v6)
524
522
                net['cidr_v6'] = cidr_v6
525
523
 
526
524
            # NOTE(vish): This makes ports unique accross the cloud, a more