diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-26 22:44:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-26 22:44:20 +0000 |
| commit | db7414235e14545cacf3701b85bf4b5cbb8b925a (patch) | |
| tree | 475f3b2399727b3f5b29892fa103021f5b4c899b /nova | |
| parent | 686ec45dfd9dc7b1a830ec32accd3b68ab7adbbe (diff) | |
| parent | 6ce042cafbf410a213c5d7937b93784e8f0a1655 (diff) | |
Merge "Add a DECLARE for dhcp_doamin flag to metadata handler."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/metadata/handler.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_metadata.py | 1 |
2 files changed, 1 insertions, 1 deletions
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) |