openstack/ironic
Code Issues Proposed changes

Merge "Load machine type from command-line"

Browse Source
This commit is contained in:
Zuul 2024-04-17 17:31:18 +00:00 committed by Gerrit Code Review
commit c85d9c8326
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/tools/ironic/scripts/configure-vm.py
View File

@ -65,6 +65,8 @@ def main():
help='The virtualization engine to use') help='The virtualization engine to use')
parser.add_argument('--arch', default='i686', parser.add_argument('--arch', default='i686',
help='The architecture to use') help='The architecture to use')
parser.add_argument('--machine_type', default='q35',
help='Machine type based on architecture')
parser.add_argument('--memory', default='2097152', parser.add_argument('--memory', default='2097152',
help="Maximum memory for the VM in KB.") help="Maximum memory for the VM in KB.")
parser.add_argument('--cpus', default='1', parser.add_argument('--cpus', default='1',
@ -104,6 +106,7 @@ def main():
'images': images, 'images': images,
'engine': args.engine, 'engine': args.engine,
'arch': args.arch, 'arch': args.arch,
'machine_type': args.machine_type,
'memory': args.memory, 'memory': args.memory,
'cpus': args.cpus, 'cpus': args.cpus,
'bootdev': args.bootdev, 'bootdev': args.bootdev,

2
devstack/tools/ironic/templates/vm.xml
View File

@ -3,7 +3,7 @@
<memory unit='KiB'>{{ memory }}</memory> <memory unit='KiB'>{{ memory }}</memory>
<vcpu>{{ cpus }}</vcpu> <vcpu>{{ cpus }}</vcpu>
<os> <os>
<type arch='{{ arch }}' machine='q35'>hvm</type> <type arch='{{ arch }}' machine='{{ machine_type }}'>hvm</type>
{% if bootdev == 'network' and not uefi_loader %} {% if bootdev == 'network' and not uefi_loader %}
<boot dev='{{ bootdev }}'/> <boot dev='{{ bootdev }}'/>
{% endif %} {% endif %}