Skip to content

Commit d7ca6eb

Browse files
committed
fix openhpc & grafana states for control image build
1 parent 6b24f5d commit d7ca6eb

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

ansible/roles/grafana-dashboards/tasks/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,5 @@
107107
state: present
108108
overwrite: true
109109
#no_log: true
110-
with_items: "{{ grafana_dashboards }}"
110+
with_items: "{{ grafana_dashboards }}"
111+
when: grafana_state | default('started') != 'stopped'

environments/common/inventory/group_vars/builder/defaults.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ block_devices_partition_state: skip
1010
block_devices_filesystem_state: skip
1111
block_devices_mount_state: present
1212
basic_users_manage_homedir: false
13+
grafana_state: stopped # as it tries to listen on the "real" grafana node
14+
grafana_datasources: [] # as grafana won't be up - NB also dashboards are downloaded but not imported
15+
openhpc_slurm_partitions: [] # as no compute nodes will be in play, but partition definition might exist in inventory

requirements.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ roles:
33
- src: stackhpc.nfs
44
version: v21.2.1
55
- src: https://github.com/stackhpc/ansible-role-openhpc.git
6-
version: v0.12.0
6+
version: no-partitions
77
name: stackhpc.openhpc
88
- src: https://github.com/stackhpc/ansible-node-exporter.git
99
version: support-rhel-clones
@@ -15,7 +15,9 @@ roles:
1515
name: cloudalchemy.prometheus
1616
- src: cloudalchemy.alertmanager
1717
version: 0.19.1
18-
- src: cloudalchemy.grafana
18+
- src: https://github.com/stackhpc/ansible-grafana.git
19+
name: cloudalchemy.grafana
20+
version: service-state
1921
version: 0.18.0
2022
- src: geerlingguy.mysql
2123
version: 3.3.2

0 commit comments

Comments
 (0)