Add a DECLARE for dhcp_doamin flag to metadata handler.
Fixes bug 908846 Change-Id: I3d04ebee94cd23666d803987bd691276984d292d
This commit is contained in:
parent
e60dfc1850
commit
6ce042cafb
1
.mailmap
1
.mailmap
|
@ -52,6 +52,7 @@
|
||||||
<throughnothing@gmail.com> <will.wolf@rackspace.com>
|
<throughnothing@gmail.com> <will.wolf@rackspace.com>
|
||||||
<todd@ansolabs.com> <todd@lapex>
|
<todd@ansolabs.com> <todd@lapex>
|
||||||
<todd@ansolabs.com> <todd@rubidine.com>
|
<todd@ansolabs.com> <todd@rubidine.com>
|
||||||
|
<todd@ansolabs.com> <xtoddx@gmail.com>
|
||||||
<trey.morris@rackspace.com> <treyemorris@gmail.com>
|
<trey.morris@rackspace.com> <treyemorris@gmail.com>
|
||||||
<tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in>
|
<tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in>
|
||||||
<ueno.nachi@lab.ntt.co.jp> <nati.ueno@gmail.com>
|
<ueno.nachi@lab.ntt.co.jp> <nati.ueno@gmail.com>
|
||||||
|
|
|
@ -39,6 +39,7 @@ from nova import wsgi
|
||||||
LOG = logging.getLogger('nova.api.metadata')
|
LOG = logging.getLogger('nova.api.metadata')
|
||||||
FLAGS = flags.FLAGS
|
FLAGS = flags.FLAGS
|
||||||
flags.DECLARE('use_forwarded_for', 'nova.api.auth')
|
flags.DECLARE('use_forwarded_for', 'nova.api.auth')
|
||||||
|
flags.DECLARE('dhcp_domain', 'nova.network.manager')
|
||||||
|
|
||||||
_DEFAULT_MAPPINGS = {'ami': 'sda1',
|
_DEFAULT_MAPPINGS = {'ami': 'sda1',
|
||||||
'ephemeral0': 'sda2',
|
'ephemeral0': 'sda2',
|
||||||
|
|
|
@ -32,7 +32,6 @@ from nova.tests import fake_network
|
||||||
|
|
||||||
|
|
||||||
FLAGS = flags.FLAGS
|
FLAGS = flags.FLAGS
|
||||||
flags.DECLARE('dhcp_domain', 'nova.network.manager')
|
|
||||||
|
|
||||||
USER_DATA_STRING = ("This is an encoded string")
|
USER_DATA_STRING = ("This is an encoded string")
|
||||||
ENCODE_USER_DATA_STRING = base64.b64encode(USER_DATA_STRING)
|
ENCODE_USER_DATA_STRING = base64.b64encode(USER_DATA_STRING)
|
||||||
|
|
Loading…
Reference in New Issue