Skip to content

Commit 8741411

Browse files
committed
fix build groups
1 parent 6ab7255 commit 8741411

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

environments/.stackhpc/inventory/extra_groups

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Unless noted otherwise features enabled here are tested by CI site.yml playbook
2+
13
[basic_users:children]
24
cluster
35

@@ -20,15 +22,14 @@ cluster
2022
# --- end of FreeIPA example ---
2123

2224
[manila:children]
23-
# Allows demo; also installs manila client in fat image
25+
# Not actully tested but allows demo using this environment
2426
login
2527
compute
2628

2729
[chrony:children]
2830
cluster
2931

3032
[tuned:children]
31-
# Test tuned during site playbook
3233
cluster
3334

3435
[rebuild:children]
@@ -39,7 +40,3 @@ cluster
3940

4041
[compute_init:children]
4142
compute
42-
43-
[gateway:children]
44-
# Install gateway ansible-init playbook into image
45-
builder

environments/common/inventory/groups

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# This file
2+
# 1. Ensures all groups in the appliance are always defined - even if empty
3+
# 2. Defines dependencies between groups - child groups require & enables parent
4+
#
5+
# IMPORTANT
6+
# ---------
7+
# All groups and child groups here MUST be empty, as other environments cannot
8+
# remove hosts/groups.
9+
110
[login]
211
# All Slurm login nodes. Combined control/login nodes are not supported.
312

@@ -196,10 +205,12 @@ k3s_agent
196205

197206
[dnf_repos:children]
198207
# Hosts to replace system repos with Pulp repos
208+
# Roles/groups listed here *always* do installs:
199209
extra_packages
200-
cuda
201210
doca
202211

212+
# what we want to say is if cuda and build, add dnf_repos
213+
203214
[pulp_site]
204215
# Add builder to this group to automatically sync pulp during image build
205216

environments/site/inventory/groups

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,11 @@ fatimage
156156
[extra_packages:children]
157157
# Hosts to install specified additional packages on
158158

159-
[dnf_repos]
159+
[dnf_repos:children]
160160
# Hosts to replace system repos with Pulp repos
161+
# Some roles do installs when in install mode/on build VM only:
162+
fatimage
163+
builder
161164

162165
[cacerts]
163166
# Hosts to configure CA certificates and trusts on

0 commit comments

Comments
 (0)