Set NovaHWMachineType: x86_64=q35 for fs001,020 and 035
As we are currently facing ovb job failure on rhos17.1 on rhel8 due to tempest tests failure because of recently changed in the value of NovaHWMachineType [1] so setting that value to NovaHWMachineType: x86_64=q35 for ovb job (fs001, fs020 and fs035). [1]: https://code.engineering.redhat.com/gerrit/c/openstack-tripleo-heat-templates/+/417307/4/deployment/nova/nova-compute-container-puppet.yaml#436 Related-bz: #2110535 (https://bugzilla.redhat.com/show_bug.cgi?id=2110535) Change-Id: I7851674a3dbb6b7ea99d70a8cc4854fc965acdba
This commit is contained in:
parent
dc26b84901
commit
29518eebcd
|
@ -51,6 +51,9 @@ telemetry_args: >-
|
|||
{% endif %}
|
||||
|
||||
extra_args: >-
|
||||
{% if ansible_distribution in ["RedHat"] and osp_release|default('') in ['rhos-17.1'] and ansible_distribution_major_version|int == 8 -%}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha-parameter-for-rhel8.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% if release not in ['train'] -%}
|
||||
--disable-validations
|
||||
|
|
|
@ -107,6 +107,10 @@ extra_args: >-
|
|||
{% if release not in ['train','wallaby'] %}
|
||||
-e {{ working_dir }}/ci_custom_firewall_rules.yaml
|
||||
{% endif %}
|
||||
{% if ansible_distribution in ["RedHat"] and osp_release|default('') in ['rhos-17.1'] and ansible_distribution_major_version|int == 8 -%}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha-parameter-for-rhel8.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{%- if release not in ['train','ussuri','victoria'] -%}
|
||||
--disable-protected-resource-types
|
||||
{%- endif -%}
|
||||
|
|
|
@ -81,12 +81,13 @@ extra_args: >-
|
|||
-e {{ working_dir }}/ci_custom_firewall_rules.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/environments/memcached-use-ips.yaml
|
||||
{% if release not in ['newton', 'ocata', 'pike'] %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{% endif %}
|
||||
{% if release not in ['newton','ocata','pike','queens','stein','train'] -%}
|
||||
--disable-validations
|
||||
{% endif %}
|
||||
{% if ansible_distribution in ["RedHat"] and osp_release|default('') in ['rhos-17.1'] and ansible_distribution_major_version|int == 8 -%}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha-parameter-for-rhel8.yaml
|
||||
{% endif %}
|
||||
-e {{ overcloud_templates_path }}/ci/environments/ovb-ha.yaml
|
||||
{%- if release not in ['train','ussuri','victoria'] -%}
|
||||
--disable-protected-resource-types
|
||||
{%- endif -%}
|
||||
|
|
Loading…
Reference in New Issue