Skip to content

Commit af83055

Browse files
Address review comments
1 parent 39f74db commit af83055

File tree

6 files changed

+13
-16
lines changed

6 files changed

+13
-16
lines changed

.github/workflows/package-build-ofed.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,15 @@ jobs:
189189
run: |
190190
source venvs/kayobe/bin/activate &&
191191
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
192-
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/growroot.yml \
193-
-e seed_bootstrap_user="cloud-user" \
194-
-e controller_bootstrap_user="cloud-user" \
192+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/growroot.yml
195193
env:
196194
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
197195

198196
- name: Configure the seed host (Builder VM)
199197
run: |
200198
source venvs/kayobe/bin/activate &&
201199
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
202-
kayobe seed host configure \
203-
--skip-tags network,docker,docker-registry
200+
kayobe seed host configure --skip-tags network
204201
env:
205202
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
206203

doc/source/contributor/ofed.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Install process
5454
Release Train configuration
5555
---------------------------
5656

57-
The DOCA kernel module repository will need to be synced to the local Pulp service. This can be enabled
57+
DOCA repositories will need to be synced to the local Pulp service. This can be enabled
5858
in ``ofed.yml``:
5959

6060
.. code-block:: yaml

etc/kayobe/environments/ci-doca-builder/controllers.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,3 @@ controller_bootstrap_user: cloud-user
1313
# format.
1414
controller_lvm_groups:
1515
- "{{ stackhpc_lvm_group_rootvg }}"
16-
17-
###############################################################################
18-
# Dummy variable to allow Ansible to accept this file.
19-
workaround_ansible_issue_8743: yes

etc/kayobe/environments/ci-doca-builder/seed.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,9 @@ seed_lvm_groups:
1515
- "{{ stackhpc_lvm_group_rootvg }}"
1616

1717
###############################################################################
18-
# Dummy variable to allow Ansible to accept this file.
19-
workaround_ansible_issue_8743: yes
18+
# Seed node additional containers configuration
19+
20+
# Seed container running a "Pulp in one" service.
21+
# https://pulpproject.org/pulp-in-one-container/
22+
# This can be used as a package mirror, and container image registry.
23+
seed_pulp_container_enabled: false

etc/kayobe/ofed.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ stackhpc_pulp_doca_version: 2.9.1
88
###############################################################################
99
# Pulp configuration for DOCA OFED
1010

11-
# Whether to sync OFED kernel module packages into the local Pulp service
12-
stackhpc_pulp_sync_ofed_modules: false
11+
# Whether to sync OFED repositories into the local Pulp service
12+
stackhpc_pulp_sync_ofed: false
1313

1414
# DOCA Snapshot versions. The defaults use the appropriate version from
1515
# pulp-repo-versions.yml

etc/kayobe/pulp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,13 @@ stackhpc_pulp_rpm_repos:
377377
url: "{{ stackhpc_release_pulp_content_url }}/doca/{{ stackhpc_pulp_doca_version }}/rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/x86_64/{{ stackhpc_pulp_repo_rhel9_doca_version }}"
378378
distribution_name: "doca-{{ stackhpc_pulp_doca_version }}-rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}-"
379379
base_path: "doca/{{ stackhpc_pulp_doca_version }}/rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/x86_64/"
380-
required: "{{ stackhpc_pulp_sync_el_9 }}"
380+
required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_9 | bool }}"
381381

382382
- name: OFED Kernel modules for DOCA {{ stackhpc_pulp_doca_version }} - RHEL 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
383383
url: "{{ stackhpc_release_pulp_content_url }}/doca-modules/{{ stackhpc_pulp_doca_version }}/rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/x86_64/{{ stackhpc_pulp_repo_rhel9_doca_modules_version }}"
384384
distribution_name: "doca-modules-{{ stackhpc_pulp_doca_version }}-rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}-"
385385
base_path: "doca-modules/{{ stackhpc_pulp_doca_version }}/rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/x86_64/"
386-
required: "{{ stackhpc_pulp_sync_ofed_modules | bool and stackhpc_pulp_sync_el_9 | bool }}"
386+
required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_9 | bool }}"
387387

388388
# RPM repositories
389389
stackhpc_pulp_repository_rpm_repos: >-

0 commit comments

Comments
 (0)