Skip to content

Commit ff87ef8

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

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

environments/common/inventory/groups

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
[login]
1+
[login:children]
22
# All Slurm login nodes. Combined control/login nodes are not supported.
3+
fatimage
34

4-
[control]
5+
[control:children]
56
# A single Slurm control node. Multiple (high availability) control nodes are not supported.
7+
fatimage
68

7-
[compute]
9+
[compute:children]
810
# All Slurm compute nodes (in all partitions).
11+
fatimage
912

1013
[openhpc:children]
1114
# All Slurm nodes.
@@ -224,8 +227,5 @@ doca
224227
[raid]
225228
# Add `builder` to configure image for software raid
226229

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

environments/site/inventory/groups

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ slurm_stats
3131
# NB: [rebuild] not defined here as likely to need features not currently supported
3232

3333
[update:children]
34+
fatimage
3435

3536
[fail2ban:children]
3637
# Hosts to install fail2ban on to protect SSH
@@ -102,18 +103,21 @@ openhpc
102103
login
103104
openondemand
104105

105-
[squid]
106+
[squid:children]
106107
# Hosts to run squid proxy
108+
fatimage
107109

108110
[tuned:children]
109111
# Hosts to run TuneD configuration
112+
fatimage
110113

111114
[ansible_init:children]
112115
# Hosts to run linux-ansible-init
113116
cluster
114117

115-
[sssd]
118+
[sssd:children]
116119
# Hosts to configure sssd on
120+
fatimage
117121

118122
[sshd]
119123
# Hosts where the OpenSSH server daemon should be configured
@@ -151,6 +155,7 @@ cluster
151155

152156
[gateway:children]
153157
# Add builder to this group to install gateway ansible-init playbook into image
158+
fatimage
154159

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

174-
[raid]
179+
[raid:children]
175180
# 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
181+
fatimage

0 commit comments

Comments
 (0)