openstack
/
nova
Code Issues Proposed changes

Add a DECLARE for dhcp_doamin flag to metadata handler. 

Fixes bug 908846

Change-Id: I3d04ebee94cd23666d803987bd691276984d292d
This commit is contained in:
Todd Willey 2011-12-26 13:36:12 -05:00
parent e60dfc1850
commit 6ce042cafb
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -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>

1
nova/api/metadata/handler.py
View File

@ -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',

1
nova/tests/test_metadata.py
View File

@ -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)