openstack
/
fuel-devops
Code Issues Proposed changes

Add ability to disable bootmenu parameter 

Right now there are some kind of bug that prevents VM from booting
when running at virtualized slave on latest xenial qemu packages &
kernel. Disabling whole bootmenu parameter hepls.

Change-Id: I838ee5cb69babc37f19093b2a378e984fcc0b958
This commit is contained in:
Vladimir Khlyunev 2019-03-29 13:13:36 +04:00
parent 17b805acaf
commit db04c122fd
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops/driver/libvirt/libvirt_xml_builder.py
View File

@ -313,7 +313,7 @@ class LibvirtXMLBuilder(object):
if self.driver.reboot_timeout:
node_xml.bios(rebootTimeout='{0}'.format(
self.driver.reboot_timeout))
if node.should_enable_boot_menu:
if node.enable_bootmenu and node.should_enable_boot_menu:
node_xml.bootmenu(enable='yes', timeout='3000')
with node_xml.devices:

2
devops/migrations/0002_add_field_created.py
View File

@ -138,6 +138,8 @@ class Migration(SchemaMigration):
'environment': ('django.db.models.fields.related.ForeignKey', [],
{'to': u"orm['devops.Environment']",
'null': 'True'}),
'enable_bootmenu': ('django.db.models.fields.BooleanField', [],
{'default': 'True'}),
'has_vnc': ('django.db.models.fields.BooleanField', [],
{'default': 'True'}),
'hypervisor': ('django.db.models.fields.CharField', [],

10
devops/models/environment.py
View File

@ -86,14 +86,16 @@ class Environment(DriverModel):
def get_nodes(self, *args, **kwargs):
return self.node_set.filter(*args, **kwargs)
def add_node(self, memory, name, vcpu=1, boot=None, role='fuel_slave'):
def add_node(self, memory, name, vcpu=1, boot=None, role='fuel_slave',
enable_bootmenu=True):
return Node.node_create(
name=name,
memory=memory,
vcpu=vcpu,
environment=self,
role=role,
boot=boot)
boot=boot,
enable_bootmenu=enable_bootmenu)
def add_empty_volume(self, node, name, capacity, device='disk',
bus='virtio', format='qcow2', multipath_count=0):
@ -378,7 +380,9 @@ class Environment(DriverModel):
role=config_node['role'],
memory=int(node_params['memory']),
vcpu=int(node_params['vcpu']),
boot=node_params['boot'])
boot=node_params['boot'],
enable_bootmenu=node_params.get('enable_bootmenu', True)
)
self.create_interfaces(node_params['interfaces'], node)

7
devops/models/node.py
View File

@ -49,6 +49,7 @@ class Node(DriverModel):
os_type = choices('hvm')
architecture = choices('x86_64', 'i686')
boot = models.CharField(max_length=255, null=False, default=json.dumps([]))
enable_bootmenu = models.BooleanField(null=False, default=True)
metadata = models.CharField(max_length=255, null=True)
role = models.CharField(max_length=255, null=True)
vcpu = models.PositiveSmallIntegerField(null=False, default=1)
@ -516,7 +517,8 @@ class Node(DriverModel):
@classmethod
def node_create(cls, name, environment=None, role=None, vcpu=1,
memory=1024, has_vnc=True, metadata=None, hypervisor='kvm',
os_type='hvm', architecture='x86_64', boot=None):
os_type='hvm', architecture='x86_64', boot=None,
enable_bootmenu=True):
"""Create node
:rtype : Node
@ -527,6 +529,7 @@ class Node(DriverModel):
name=name, environment=environment,
role=role, vcpu=vcpu, memory=memory,
has_vnc=has_vnc, metadata=metadata, hypervisor=hypervisor,
os_type=os_type, architecture=architecture, boot=json.dumps(boot)
os_type=os_type, architecture=architecture, boot=json.dumps(boot),
enable_bootmenu=enable_bootmenu
)
return node