openstack
/
nova
Code Issues Proposed changes

Merge "Disable file injection in baremetal by default"

This commit is contained in:
Jenkins 2014-02-10 09:07:03 +00:00 committed by Gerrit Code Review
parent 9f24f0d40f bf2465d40e
commit cb464bcf65
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/nova/nova.conf.sample
View File

@ -2152,7 +2152,7 @@
# If True, enable file injection for network info, files and
# admin password (boolean value)
#use_file_injection=true
#use_file_injection=false
# Timeout for PXE deployments. Default: 0 (unlimited) (integer
# value)

3
nova/tests/virt/baremetal/test_pxe.py
View File

@ -82,6 +82,9 @@ class BareMetalPXETestCase(bm_db_base.BMDBTestCase):
]
def _create_node(self):
# File injection is off by default, but we should continue to test it
# until it is removed.
CONF.set_override('use_file_injection', True, 'baremetal')
self.node = db.bm_node_create(self.context, self.node_info)
for nic in self.nic_info:
db.bm_interface_create(

2
nova/virt/baremetal/pxe.py
View File

@ -56,7 +56,7 @@ pxe_opts = [
cfg.BoolOpt('use_file_injection',
help='If True, enable file injection for network info, '
'files and admin password',
default=True),
default=False),
cfg.IntOpt('pxe_deploy_timeout',
help='Timeout for PXE deployments. Default: 0 (unlimited)',
default=0),