summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorDan Wendlandt <dan@nicira.com>2011-09-08 07:43:11 +0000
committerTarmac <>2011-09-08 07:43:11 +0000
commitbb3b61b61dc4b45fba4bdab7ead69af239eac40a (patch)
treef535a0e3dd6416142e9bfa06b16a592a1c9827f0 /.mailmap
parentede50666215d38f037d9783556647889bc88c6bc (diff)
parent0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc (diff)
downloadnova-bb3b61b61dc4b45fba4bdab7ead69af239eac40a.tar.gz
nova-bb3b61b61dc4b45fba4bdab7ead69af239eac40a.tar.xz
nova-bb3b61b61dc4b45fba4bdab7ead69af239eac40a.zip
This code contains contains a new NetworkManager class that can leverage Quantum + Melange.
Thierry suggested that I merge prop this to get feedback, even though it is too late to get a branch of this size in for D-4. Feedback will help determine whether we can get this code in during the Diablo time frame or not. This branch was developed stacked on top of the melange branch, which is still not merged, but I am merge-propping it without that branch so that the diff is correct. The vast majority of the code is in nova/network/quantum and is only invoked if the network manager is set to nova.network.quantum.QuantumManager In addition to implementing networks with Quantum instead of the linux bridge, the QuantumManager also provides a new, more flexible model of associating vNICs with networks. It supports the creation of networks that are specific to a project and networks that are "global". When a VM is created, it gets a vNIC for each project network, as well as each global network. For example, this could support giving a VM a "public" vNIC on a shared network and a "private" vNIC on a tenant-specific network. The branch also implements Tushar's 'os-create-server-ext' extension, so that the server create API call can indicate the set of networks the VM should be attached to (if this extension is used, it replaces the above mechanism for determining vNICs). QuantumManager can use either the traditional IPAM functionality in nova DB (i.e., the networks, fixed_ips tables) or melange. Similar to FlatManager, QuantumManager does not currently support DHCP, gateway/NAT, or floating IPs. This branch requires additional testing before it is really ready for merge, but we thought it would be best to merge prop as soon as possible to identify any significant concerns people had.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 5c8df80e0..f2f59d81b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,6 +15,7 @@
<code@term.ie> <termie@preciousroy.local>
<corywright@gmail.com> <cory.wright@rackspace.com>
<dan@nicira.com> <danwent@dan-xs3-cs>
+<dan@nicira.com> danwent@gmail.com
<devin.carlen@gmail.com> <devcamcar@illian.local>
<ewan.mellor@citrix.com> <emellor@silver>
<itoumsn@nttdata.co.jp> <itoumsn@shayol>