Skip to content

Commit 06bd941

Browse files
committed
Fix EL10 and postgresql acceptance
1 parent cc6837f commit 06bd941

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

spec/spec_helper_acceptance_setup.rb

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
data_hash: yaml_data
3939
hierarchy:
4040
- name: 'os family major release'
41-
path: "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
41+
path: "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
4242
- name: "Common"
4343
path: "common.yaml"
4444
HIERA_YAML
@@ -56,6 +56,16 @@
5656
postgresql::server::service_status: 'service postgresql status 2>/dev/null 1>/dev/null'
5757
COMMON_YAML
5858

59+
# Remove logic once merged and released:
60+
# https://github.com/puppetlabs/puppetlabs-postgresql/pull/1650
61+
el10_yaml = <<-EL10_YAML
62+
---
63+
postgresql::globals::version: '16'
64+
postgresql::globals::manage_package_repo: true
65+
EL10_YAML
66+
5967
create_remote_file(hosts, File.join(puppet_dir, 'hiera.yaml'), hiera_yaml)
6068
on hosts, "mkdir -p #{File.join(puppet_dir, 'data')}"
6169
create_remote_file(hosts, File.join(puppet_dir, 'data/common.yaml'), common_yaml)
70+
on hosts, "mkdir -p #{File.join(puppet_dir, 'data/os/RedHat')}"
71+
create_remote_file(hosts, File.join(puppet_dir, 'data/os/RedHat/10.yaml'), el10_yaml)

0 commit comments

Comments
 (0)