diff --git a/.mailmap b/.mailmap
index 4fad253df803..c427c16681a5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -52,6 +52,7 @@
 <throughnothing@gmail.com> <will.wolf@rackspace.com>
 <todd@ansolabs.com> <todd@lapex>
 <todd@ansolabs.com> <todd@rubidine.com>
+<todd@ansolabs.com> <xtoddx@gmail.com>
 <trey.morris@rackspace.com> <treyemorris@gmail.com>
 <tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in>
 <ueno.nachi@lab.ntt.co.jp> <nati.ueno@gmail.com>
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index 059ef8ec2fcb..04e64bd573a1 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -39,6 +39,7 @@ from nova import wsgi
 LOG = logging.getLogger('nova.api.metadata')
 FLAGS = flags.FLAGS
 flags.DECLARE('use_forwarded_for', 'nova.api.auth')
+flags.DECLARE('dhcp_domain', 'nova.network.manager')
 
 _DEFAULT_MAPPINGS = {'ami': 'sda1',
                      'ephemeral0': 'sda2',
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py
index b3884c06e6f0..257bc28c8f56 100644
--- a/nova/tests/test_metadata.py
+++ b/nova/tests/test_metadata.py
@@ -32,7 +32,6 @@ from nova.tests import fake_network
 
 
 FLAGS = flags.FLAGS
-flags.DECLARE('dhcp_domain', 'nova.network.manager')
 
 USER_DATA_STRING = ("This is an encoded string")
 ENCODE_USER_DATA_STRING = base64.b64encode(USER_DATA_STRING)