Skip to content

Commit

Permalink
Fix regression issue found in SLES/SLED/Ubuntu (#414)
Browse files Browse the repository at this point in the history
* Fix regression issue found in SLES/SLED/Ubuntu 

Signed-off-by: Qi Zhang <qiz@vmware.com>
  • Loading branch information
keirazhang authored Jan 17, 2023
1 parent 9cac790 commit 672d88b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions autoinstall/Ubuntu/Server/user-data.j2
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ autoinstall:
geoip: true
packages:
- sg3-utils
{% if ubuntu_version is defined and ubuntu_version is version('22.04', '>=') %}
- ndctl
- rdma-core
- rdmacm-utils
- ibverbs-utils
{% endif %}
late-commands:
- rm -f /etc/cloud/cloud.cfg.d/*-installer.cfg 2>/dev/null
- echo 'Acquire::ForceIPv4 "true";' >>/etc/apt/apt.conf.d/99force-ipv4
Expand Down
12 changes: 6 additions & 6 deletions common/esxi_get_guest_config_options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@
tmp_config_option_file: "{{ tmp_path }}"

- name: "Fetch config option file from ESXi server"
fetch:
ansible.builtin.fetch:
src: "{{ vm_config_option_esx_hw }}"
dest: "{{ tmp_config_option_file }}"
flat: true
delegate_to: "{{ esxi_hostname }}"

- name: "Get default config option from guest OS descriptor for guest id {{ guest_id }}"
xml:
community.general.xml:
path: "{{ tmp_config_option_file }}"
xpath: "{{ guest_config_options_xpath }}/{{ item }}"
content: text
Expand All @@ -171,7 +171,7 @@
with_items: "{{ guest_os_descriptor.results | map(attribute='matches') | select('defined') | flatten | map('dict2items') }}"

- name: "Get default video RAM size in KB for guest id {{ guest_id }}"
xml:
community.general.xml:
path: "{{ tmp_config_option_file }}"
xpath: "{{ guest_config_options_xpath }}/vRAMSizeInKB/defaultValue"
content: text
Expand All @@ -187,7 +187,7 @@
- guest_vram_size.matches | length > 0

- name: "Get supported disk controllers for guest id {{ guest_id }}"
xml:
community.general.xml:
path: "{{ tmp_config_option_file }}"
xpath: "{{ guest_config_options_xpath }}/supportedDiskControllerList/e"
content: text
Expand All @@ -210,7 +210,7 @@
- guest_supported_disk_ctrls.matches | length > 0

- name: "Get supported disk controllers for guest id {{ guest_id }}"
xml:
community.general.xml:
path: "{{ tmp_config_option_file }}"
xpath: "{{ guest_config_options_xpath }}/supportedEthernetCard/e"
content: text
Expand All @@ -233,7 +233,7 @@
- guest_supported_ethernet_card.matches | length > 0

- name: "Get supported USB controllers for guest id {{ guest_id }}"
xml:
community.general.xml:
path: "{{ tmp_config_option_file }}"
xpath: "{{ guest_config_options_xpath }}/supportedUSBControllerList/e"
content: text
Expand Down
2 changes: 1 addition & 1 deletion linux/utils/add_local_dvd_repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
vars:
repo_name: "{{ dvd_repo_name }}-{{ repodata_path | dirname | basename }}"
repo_baseurl: "{{ repodata_path | dirname }}"
gpg_check: true
gpg_check: "{{ guest_os_ansible_distribution == 'RedHat' }}"
with_items: "{{ find_repodata_result.stdout_lines }}"
loop_control:
loop_var: repodata_path
Expand Down

0 comments on commit 672d88b

Please sign in to comment.