Skip to content

Commit f343f67

Browse files
committed
moved to later in build/site and moved groups
1 parent 558874b commit f343f67

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

ansible/bootstrap.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,6 @@
216216
msg: "{{ updates.results | length }} changes to packages - see {{ update_log_path }} for details"
217217
when: "update_enable | default('false') | bool"
218218

219-
- hosts: extra_packages
220-
become: yes
221-
tags:
222-
- extra_packages
223-
tasks:
224-
dnf:
225-
- name: "{{ appliances_extra_packages }}"
226-
when: appliances_mode != 'configure' or appliances_packages_during_configure
227-
228219
- hosts:
229220
- selinux
230221
- update

ansible/fatimage.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@
199199
name: cloudalchemy.grafana
200200
tasks_from: install.yml
201201

202+
- ansible.builtin.import_playbook: packages.yml
203+
202204
- name: Run post.yml hook
203205
vars:
204206
appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"

ansible/packages.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
- hosts: extra_packages
3+
become: yes
4+
tags:
5+
- extra_packages
6+
tasks:
7+
- name: Install additional packages
8+
dnf:
9+
name: "{{ appliances_extra_packages }}"
10+
when: appliances_mode != 'configure' or appliances_packages_during_configure

ansible/site.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
- import_playbook: slurm.yml
2828
- import_playbook: portal.yml
2929
- import_playbook: monitoring.yml
30+
- import_playbook: packages.yml
3031

3132
- name: Run post.yml hook
3233
vars:

environments/common/inventory/groups

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,5 @@ freeipa_client
145145
[lustre]
146146
# Hosts to run lustre client
147147

148-
[extra_packages:children]
148+
[extra_packages]
149149
# Hosts to install specified additional packages on
150-
cluster
151-
builder

environments/common/layouts/everything

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,7 @@ control
9292

9393
[lustre]
9494
# Hosts to run lustre client
95+
96+
[extra_packages:children]
97+
# Hosts to install specified additional packages on
98+
cluster

0 commit comments

Comments
 (0)