From 6ce042cafbf410a213c5d7937b93784e8f0a1655 Mon Sep 17 00:00:00 2001
From: Todd Willey <xtoddx@gmail.com>
Date: Mon, 26 Dec 2011 13:36:12 -0500
Subject: Add a DECLARE for dhcp_doamin flag to metadata handler.

Fixes bug 908846

Change-Id: I3d04ebee94cd23666d803987bd691276984d292d
---
 nova/api/metadata/handler.py | 1 +
 nova/tests/test_metadata.py  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index 059ef8ec2..04e64bd57 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 b3884c06e..257bc28c8 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)
-- 
cgit