Skip to content

Commit 6ab7255

Browse files
committed
fixup fatimage group definition
1 parent 60d89d6 commit 6ab7255

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

environments/common/inventory/groups

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,5 @@ doca
224224
[raid]
225225
# Add `builder` to configure image for software raid
226226

227-
[fatimage:children]
228-
# Minimal configuration for fat image build
229-
control
230-
login
231-
compute
227+
[fatimage]
228+
# Add build VM into this group to enable all features with this as child

environments/site/inventory/groups

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
[login:children]
2+
# All Slurm login nodes. Combined control/login nodes are not supported.
3+
fatimage
4+
5+
[control:children]
6+
# A single Slurm control node. Multiple (high availability) control nodes are not supported.
7+
fatimage
8+
9+
[compute:children]
10+
# All Slurm compute nodes (in all partitions).
11+
fatimage
12+
113
[nfs:children]
214
openhpc
315

@@ -31,6 +43,7 @@ slurm_stats
3143
# NB: [rebuild] not defined here as likely to need features not currently supported
3244

3345
[update:children]
46+
fatimage
3447

3548
[fail2ban:children]
3649
# Hosts to install fail2ban on to protect SSH
@@ -102,18 +115,21 @@ openhpc
102115
login
103116
openondemand
104117

105-
[squid]
118+
[squid:children]
106119
# Hosts to run squid proxy
120+
fatimage
107121

108122
[tuned:children]
109123
# Hosts to run TuneD configuration
124+
fatimage
110125

111126
[ansible_init:children]
112127
# Hosts to run linux-ansible-init
113128
cluster
114129

115-
[sssd]
130+
[sssd:children]
116131
# Hosts to configure sssd on
132+
fatimage
117133

118134
[sshd]
119135
# Hosts where the OpenSSH server daemon should be configured
@@ -151,6 +167,7 @@ cluster
151167

152168
[gateway:children]
153169
# Add builder to this group to install gateway ansible-init playbook into image
170+
fatimage
154171

155172
[nhc:children]
156173
# Hosts to configure for node health checks
@@ -171,14 +188,6 @@ compute
171188
# pulp_host ansible_host=<VM-ip-address>
172189
# Note inventory host name cannot conflict with group names i.e can't be called `pulp` or `pulp_server`.
173190

174-
[raid]
191+
[raid:children]
175192
# 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
193+
fatimage

0 commit comments

Comments
 (0)