openstack/nova
Code Issues Proposed changes

Merge "Remove two unused config options in baremetal"

Browse Source
This commit is contained in:
Jenkins 2013-09-23 00:41:04 +00:00 committed by Gerrit Code Review
commit bd6f83df9b
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2930,13 +2930,6 @@
# Options defined in nova.virt.baremetal.driver
#
# Whether baremetal compute injects password or not (boolean
# value)
#inject_password=true
# Template file for injected network (string value)
#injected_network_template=$pybasedir/nova/virt/baremetal/interfaces.template
# Baremetal VIF driver. (string value)
#vif_driver=nova.virt.baremetal.vif_driver.BareMetalVIFDriver

8
nova/virt/baremetal/driver.py
View File

@ -31,7 +31,6 @@ from nova.openstack.common.gettextutils import _
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
from nova import paths
from nova.virt.baremetal import baremetal_states
from nova.virt.baremetal import db
from nova.virt.baremetal import pxe
@ -42,13 +41,6 @@ from nova.virt.libvirt import imagecache
LOG = logging.getLogger(__name__)
opts = [
cfg.BoolOpt('inject_password',
default=True,
help='Whether baremetal compute injects password or not'),
cfg.StrOpt('injected_network_template',
default=paths.basedir_def('nova/virt/'
'baremetal/interfaces.template'),
help='Template file for injected network'),
cfg.StrOpt('vif_driver',
default='nova.virt.baremetal.vif_driver.BareMetalVIFDriver',
help='Baremetal VIF driver.'),