diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-15 17:03:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-15 17:03:55 +0000 |
| commit | 241ea3a0635061589473061dfe36606a63696e05 (patch) | |
| tree | 7a2be1fe9cb90612007e183e9fa7c1b0539d6388 /nova/utils.py | |
| parent | 810e54a1643b7f7835db209791d596351c64cd34 (diff) | |
| parent | b684d651f540fc512ced58acd5ae2ef4d55a885c (diff) | |
| download | nova-241ea3a0635061589473061dfe36606a63696e05.tar.gz nova-241ea3a0635061589473061dfe36606a63696e05.tar.xz nova-241ea3a0635061589473061dfe36606a63696e05.zip | |
Merge "Refix mac change to work around libvirt issue"
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py index 83662dbb0..e375f11e5 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -1567,7 +1567,13 @@ def service_is_up(service): def generate_mac_address(): """Generate an Ethernet MAC address.""" - mac = [0xfe, 0x16, 0x3e, + # NOTE(vish): We would prefer to use 0xfe here to ensure that linux + # bridge mac addresses don't change, but it appears to + # conflict with libvirt, so we use the next highest octet + # that has the unicast and locally administered bits set + # properly: 0xfa. + # Discussion: https://bugs.launchpad.net/nova/+bug/921838 + mac = [0xfa, 0x16, 0x3e, random.randint(0x00, 0x7f), random.randint(0x00, 0xff), random.randint(0x00, 0xff)] |