openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Add option to specify the NovaHWMachineType"

This commit is contained in:
Zuul 2022-07-29 04:36:04 +00:00 committed by Gerrit Code Review
parent ecfc3c8873 bb07f124fb
commit cf338f21b6
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/overcloud-deploy/templates/config-download.yaml.j2
View File

@ -18,6 +18,11 @@ parameter_defaults:
{% if release not in ['train', 'ussuri', 'victoria'] %}
NovaLibvirtNumPciePorts: 12
{% endif %}
# Set machine type if default is not supported on current OS
# see https://bugzilla.redhat.com/show_bug.cgi?id=2110535
{% if nova_hw_machine_type is defined and nova_hw_machine_type %}
NovaHWMachineType: {{ nova_hw_machine_type }}
{% endif %}
DeployedServerPortMap:
{% for subnode in groups['overcloud'] %}

5
roles/standalone/templates/standalone_config.yaml.j2
View File

@ -35,6 +35,11 @@ parameter_defaults:
MasqueradeNetworks:
{{ standalone_network }}.0/{{ standalone_network_prefix }}:
- {{ standalone_network }}.0/{{ standalone_network_prefix }}
# Set machine type if default is not supported on current OS
# see https://bugzilla.redhat.com/show_bug.cgi?id=2110535
{% if nova_hw_machine_type is defined and nova_hw_machine_type %}
NovaHWMachineType: {{ nova_hw_machine_type }}
{% endif %}
NeutronPublicInterface: {{ standalone_interface }}
{% if standalone_neutron_bridge_mappings is defined and standalone_neutron_bridge_mappings %}
NeutronBridgeMappings: {{ standalone_neutron_bridge_mappings }}