Allow to disable bootmenu for non-template envs

This could be done via ENABLE_BOOTMENU=false env var

Change-Id: Ic44a454e6e2ca04be65afd125e27056d674ef396
This commit is contained in:
Vladimir Khlyunev 2019-04-04 11:31:11 +04:00
parent 75b7035401
commit fe091b662c
4 changed files with 14 additions and 4 deletions

View File

@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/fuel-devops.git
defaultbranch=release/2.9

View File

@ -146,7 +146,8 @@ def create_slave_config(slave_name, slave_role, slave_vcpu, slave_memory,
networks_multiplenetworks=None,
networks_nodegroups=None,
networks_bonding=None,
networks_bondinginterfaces=None):
networks_bondinginterfaces=None,
enable_bootmenu=True):
if networks_multiplenetworks:
nodegroups_idx = 1 - int(slave_name[-2:]) % 2
@ -186,6 +187,7 @@ def create_slave_config(slave_name, slave_role, slave_vcpu, slave_memory,
'vcpu': slave_vcpu,
'memory': slave_memory,
'boot': ['network', 'hd'],
'enable_bootmenu': enable_bootmenu,
'volumes': [
{
'name': 'system',
@ -255,7 +257,8 @@ def create_devops_config(boot_from,
networks_interfaceorder,
networks_pools,
networks_forwarding,
networks_dhcp):
networks_dhcp,
enable_bootmenu):
"""Creates devops config object
This method is used for backward compatibility with old-style
@ -309,7 +312,8 @@ def create_devops_config(boot_from,
networks_multiplenetworks=networks_multiplenetworks,
networks_nodegroups=networks_nodegroups,
networks_bonding=networks_bonding,
networks_bondinginterfaces=networks_bondinginterfaces)
networks_bondinginterfaces=networks_bondinginterfaces,
enable_bootmenu=enable_bootmenu)
config_nodes.append(slave_config)
@ -323,7 +327,8 @@ def create_devops_config(boot_from,
slave_memory=slave_memory,
slave_volume_capacity=slave_volume_capacity,
interfaceorder=['ironic'],
use_all_disks=None)
use_all_disks=None,
enable_bootmenu=enable_bootmenu)
config_nodes.append(ironic_config)

View File

@ -264,6 +264,7 @@ class Environment(DriverModel):
networks_pools=settings.POOLS,
networks_forwarding=settings.FORWARDING,
networks_dhcp=settings.DHCP,
enable_bootmenu=settings.ENABLE_BOOTMENU
)
environment = cls.create_environment(config)

View File

@ -298,3 +298,6 @@ REUSE_NETWORK_POOLS = os.environ.get("REUSE_NETWORK_POOLS", False)
# Enable creating nwfilters for libvirt networks and interfaces
ENABLE_LIBVIRT_NWFILTERS = get_var_as_bool('ENABLE_LIBVIRT_NWFILTERS', False)
# Add "bootmenu" parameter to libvirt node xml
ENABLE_BOOTMENU = get_var_as_bool("ENABLE_BOOTMENU", True)