From f8631abe754f7927ee8ef0d2652b80350851d4e4 Mon Sep 17 00:00:00 2001 From: Christophe Fontaine Date: Tue, 1 Dec 2020 19:13:36 +0100 Subject: [PATCH] Derived parameters: Add AMD iommu support Change-Id: Ia6e9124c8a17ac77af31be347ab2426c82dbace4 Signed-off-by: Christophe Fontaine --- .../tasks/derive-host-parameters.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tripleo_ansible/roles/tripleo_derived_parameters/tasks/derive-host-parameters.yml b/tripleo_ansible/roles/tripleo_derived_parameters/tasks/derive-host-parameters.yml index 5d90592a2..56b8bbfd7 100644 --- a/tripleo_ansible/roles/tripleo_derived_parameters/tasks/derive-host-parameters.yml +++ b/tripleo_ansible/roles/tripleo_derived_parameters/tasks/derive-host-parameters.yml @@ -78,13 +78,14 @@ set_fact: hugepages: "{{ (((total_memory | int)/1024)-4)*((huge_page_allocation_percentage|float)/100) }}" -- name: Get cpu modal +- name: Get cpu model set_fact: - intel_cpu_modal: "{{ 'Intel' in hw_data.get('inventory', {}).get('cpu', {}).get('model_name', '') }}" + intel_cpu_model: "{{ 'Intel' in hw_data.get('inventory', {}).get('cpu', {}).get('model_name', '') }}" + amd_cpu_model: "{{ 'AMD' in hw_data.get('inventory', {}).get('cpu', {}).get('model_name', '') }}" - name: Get iommu info set_fact: - iommu_info: "{% if intel_cpu_modal %}intel_iommu=on iommu=pt{% else %}{% endif %}" + iommu_info: "{% if intel_cpu_model %}intel_iommu=on iommu=pt{% elif amd_cpu_model %}amd_iommu=on iommu=pt{% else %}{% endif %}" - name: Get kernel args set_fact: