diff options
| author | Todd Willey <xtoddx@gmail.com> | 2011-12-26 13:36:12 -0500 |
|---|---|---|
| committer | Todd Willey <xtoddx@gmail.com> | 2011-12-26 16:49:45 -0500 |
| commit | 6ce042cafbf410a213c5d7937b93784e8f0a1655 (patch) | |
| tree | 6f9c37202ceb3763bffc1549abffe9e091d54d99 | |
| parent | e60dfc1850fdbe6285c938a0637755eaffda250c (diff) | |
| download | nova-6ce042cafbf410a213c5d7937b93784e8f0a1655.tar.gz nova-6ce042cafbf410a213c5d7937b93784e8f0a1655.tar.xz nova-6ce042cafbf410a213c5d7937b93784e8f0a1655.zip | |
Add a DECLARE for dhcp_doamin flag to metadata handler.
Fixes bug 908846
Change-Id: I3d04ebee94cd23666d803987bd691276984d292d
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | nova/api/metadata/handler.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_metadata.py | 1 |
3 files changed, 2 insertions, 1 deletions
@@ -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 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) |