Skip to content

Commit b7670e9

Browse files
committed
moved config into builder and .stackhpc
1 parent b0558b9 commit b7670e9

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
openhpc_config_extra:
22
SlurmctldDebug: debug
33
SlurmdDebug: debug
4+
5+
ohpc_default_extra_repos:
6+
"9": [] #overriding to ensure doesn't overwrite ark epel repo
7+
"8":
8+
- name: epel
9+
file: epel
10+
description: "Extra Packages for Enterprise Linux 8 - $basearch"
11+
metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir"
12+
gpgcheck: true
13+
gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"

environments/common/inventory/group_vars/all/openhpc.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,3 @@ openhpc_config_default:
3838
openhpc_config_extra: {}
3939
openhpc_config: "{{ openhpc_config_default | combine(openhpc_config_extra, list_merge='append') }}"
4040
openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if appliances_state_dir is defined else '/var/spool' }}"
41-
42-
ohpc_default_extra_repos:
43-
"9": [] #overriding to ensure doesn't overwrite ark epel repo
44-
"8":
45-
- name: epel
46-
file: epel
47-
description: "Extra Packages for Enterprise Linux 8 - $basearch"
48-
metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir"
49-
gpgcheck: true
50-
gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ squid_cache_disk: 0 # just needs to be defined
2222
squid_cache_mem: 0
2323
tuned_started: false
2424
tuned_enabled: false
25+
appliances_mode: build

packer/openhpc_extravars.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
workaround_ansible_issue_61497: yes # extravars files can't be empty
2-
appliances_mode: "build"

0 commit comments

Comments
 (0)