Skip to content

Commit 07128e6

Browse files
authored
Merge pull request #1691 from stackhpc/remove-old-ofed-method
Remove old OFED method
2 parents 9576517 + 43aa6e1 commit 07128e6

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

etc/kayobe/ansible/pulp-host-image-download.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@
77
# password in the get_url task of this playbook
88
stackhpc_overcloud_host_image_url_no_auth: "{{ stackhpc_release_pulp_content_url }}/kayobe-images/\
99
{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}/\
10-
{{ 'ofed/' if stackhpc_overcloud_host_image_is_ofed else '' }}\
1110
{{ stackhpc_overcloud_host_image_version }}/\
12-
overcloud-{{ os_distribution }}-{{ os_release }}\
13-
{{ '-ofed' if stackhpc_overcloud_host_image_is_ofed else '' }}.qcow2"
11+
overcloud-{{ os_distribution }}-{{ os_release }}.qcow2"
1412
tasks:
1513
- name: Print image information
1614
ansible.builtin.debug:
1715
msg: |
1816
OS Distribution: {{ os_distribution }}
1917
OS Release: {{ os_release }}
2018
Image tag: {{ stackhpc_overcloud_host_image_version }}
21-
OFED: {{ stackhpc_overcloud_host_image_is_ofed }}
2219
2320
# TODO: Add checksum support
2421
- name: Download image artifact

etc/kayobe/stackhpc-overcloud-host-images.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,12 @@
55
# Whether or not to download overcloud host images from Ark
66
stackhpc_download_overcloud_host_images: false
77

8-
# Whether or not to use images with MLNX_OFED installed (for deployment using
9-
# mellanox/Nvidia NICs). Only available for Ubuntu Jammy and Rocky Linux 9
10-
# OFED images are currently WIP and this variable is a placeholder
11-
stackhpc_overcloud_host_image_is_ofed: false
12-
138
# The overcloud host image source, defined by os_distribution, os_release,
14-
# stackhpc_overcloud_host_image_is_ofed, and the current stable version.
9+
# and the current stable version.
1510
stackhpc_overcloud_host_image_url: "{{ stackhpc_release_pulp_content_url_with_auth }}/kayobe-images/\
1611
{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}/\
17-
{{ 'ofed/' if stackhpc_overcloud_host_image_is_ofed else '' }}\
1812
{{ stackhpc_overcloud_host_image_version }}/\
19-
overcloud-{{ os_distribution }}-{{ os_release }}\
20-
{{ '-ofed' if stackhpc_overcloud_host_image_is_ofed else '' }}.qcow2"
13+
overcloud-{{ os_distribution }}-{{ os_release }}.qcow2"
2114

2215
# Overcloud host image version tag selection
2316
stackhpc_overcloud_host_image_version: >-

0 commit comments

Comments
 (0)