Skip to content

Commit 3604bab

Browse files
committed
acceptance/default_parameters_jira_10_spec: use default postgresql version
Use the version of postgresql defined by the puppetlabs-postgresql module rather than reimplementing version selection.
1 parent d04afef commit 3604bab

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

spec/acceptance/default_parameters_jira_10_spec.rb

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
if $facts['os']['family'] == 'RedHat' {
77
$java_package = 'java-17-openjdk'
88
$java_home = '/usr/lib/jvm/jre-17-openjdk'
9-
$postgresql_version = '13'
10-
$pgsql_package_name = 'postgresql-server'
119
$pgsql_data_dir = '/var/lib/pgsql'
1210
1311
$manage_dnf_module = $facts['os']['release']['major'] ? {
@@ -17,22 +15,14 @@
1715
1816
$autoremove_command = 'dnf --exclude="systemd*" autoremove -y'
1917
} elsif $facts['os']['family'] == 'Debian' {
20-
$postgresql_version = $facts['os']['release']['major'] ? {
21-
'11' => '13',
22-
default => '14',
23-
}
24-
2518
$java_package = 'openjdk-17-jre'
2619
$java_home = '/usr/lib/jvm/java-17-openjdk-amd64'
27-
$pgsql_package_name = "postgresql-${postgresql_version}"
28-
$pgsql_data_dir = "/var/lib/postgresql/${postgresql_version}/main/"
20+
$pgsql_data_dir = "/var/lib/postgresql/*/main/"
2921
$manage_dnf_module = false
3022
$autoremove_command = 'apt autoremove -y'
3123
}
3224
3325
$jira_install_dir = '/opt/jira/'
34-
$postgres_service = 'postgresql'
35-
$jira_service = 'jira'
3626
EOS
3727

3828
pp = <<-EOS
@@ -42,7 +32,6 @@
4232
# We don't need the output.
4333
class { 'postgresql::globals':
4434
manage_dnf_module => $manage_dnf_module,
45-
version => $postgresql_version,
4635
}
4736
4837
class { 'postgresql::server':
@@ -92,8 +81,8 @@ class { 'jira':
9281
provider => shell,
9382
}
9483
95-
package { $pgsql_package_name:
96-
ensure => purged,
84+
class { 'postgresql::server':
85+
package_ensure => purged,
9786
}
9887
9988
if $manage_dnf_module {
@@ -114,11 +103,11 @@ class { 'jira':
114103
require => Exec['autoremove cleanup'],
115104
}
116105
117-
service { $postgres_service:
106+
service { 'postgresql':
118107
ensure => stopped,
119108
}
120109
121-
service { $jira_service:
110+
service { 'jira':
122111
ensure => stopped,
123112
}
124113
EOS

0 commit comments

Comments
 (0)