Skip to content

Commit 57d352b

Browse files
committed
add fatimage inventory group
1 parent e3a1d4f commit 57d352b

File tree

4 files changed

+18
-20
lines changed

4 files changed

+18
-20
lines changed

.github/workflows/fatimage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
build:
3030
- image_name: openhpc-RL8
3131
source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.raw
32-
inventory_groups: control,compute,login,update
32+
inventory_groups: fatimage
3333
- image_name: openhpc-RL9
3434
source_image_name: Rocky-9-GenericCloud-Base-9.6-20250531.0.x86_64.qcow2
35-
inventory_groups: control,compute,login,update
35+
inventory_groups: fatimage
3636
env:
3737
ANSIBLE_FORCE_COLOR: True
3838
OS_CLOUD: openstack

environments/.stackhpc/inventory/extra_groups

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,9 @@ compute
2828
cluster
2929

3030
[tuned:children]
31-
# Install tuned into fat image
32-
# NB: builder has tuned_enabled and tuned_started false so does not configure it
33-
builder
34-
# Also test tuned during site playbook
31+
# Test tuned during site playbook
3532
cluster
3633

37-
[squid:children]
38-
# Install squid into fat image
39-
builder
40-
41-
[sssd:children]
42-
# Install sssd into fat image
43-
builder
44-
4534
[rebuild:children]
4635
control
4736

@@ -51,10 +40,6 @@ cluster
5140
[compute_init:children]
5241
compute
5342

54-
[raid:children]
55-
# Configure fatimage for raid
56-
builder
57-
5843
[gateway:children]
5944
# Install gateway ansible-init playbook into image
6045
builder

environments/common/inventory/groups

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ k3s_agent
196196

197197
[dnf_repos:children]
198198
# Hosts to replace system repos with Pulp repos
199-
# Warning: when using Ark directly rather than a local Pulp server, adding hosts other than `builder` will leak Ark creds to users
200199
extra_packages
201200
cuda
202201
doca
@@ -224,3 +223,9 @@ doca
224223

225224
[raid]
226225
# Add `builder` to configure image for software raid
226+
227+
[fatimage:children]
228+
# Minimal configuration for fat image build
229+
control
230+
login
231+
compute

environments/site/inventory/groups

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ cluster
142142

143143
[dnf_repos]
144144
# Hosts to replace system repos with Pulp repos
145-
# Warning: when using Ark directly rather than a local Pulp server, adding hosts other than `builder` will leak Ark creds to users
146145

147146
[cacerts]
148147
# Hosts to configure CA certificates and trusts on
@@ -174,3 +173,12 @@ compute
174173

175174
[raid]
176175
# Add `builder` to configure image for software raid
176+
177+
[fatimage:children]
178+
# Standard additional functionality for fat image build, as used by StackHPC CI images:
179+
gateway
180+
raid
181+
squid
182+
sssd
183+
tuned
184+
update

0 commit comments

Comments
 (0)