Skip to content
This repository was archived by the owner on Nov 5, 2024. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/gc.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
$user = $stash::user,
$homedir = $stash::homedir,
) {
if $::stash_version {
if versioncmp($::stash_version, '3.2') < 0 {
if $stash_version {
if versioncmp($stash_version, '3.2') < 0 {
$shared = ''
} else {
$shared = '/shared'
Expand Down
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@
) inherits stash::params {
Exec { path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/'] }

if $::stash_version {
if $stash_version {
# If the running version of stash is less than the expected version of stash
# Shut it down in preparation for upgrade.
if versioncmp($version, $::stash_version) > 0 {
if versioncmp($version, $stash_version) > 0 {
notify { 'Attempting to upgrade stash': }
exec { $stop_stash: }
if versioncmp($version, '3.2.0') > 0 {
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/1_installs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class { 'stash':
context_path => '/stash1',
backupclient_url => #{download_url},
}
include ::stash::facts
include stash::facts
EOS
apply_manifest(pp, catch_failures: true)
sleep 180
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/2_upgrades_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class { 'stash':
javahome => $jh,
context_path => '/stash1',
}
include ::stash::facts
include stash::facts
EOS
apply_manifest(pp_update, catch_failures: true)
shell 'wget -q --tries=20 --retry-connrefused --read-timeout=10 localhost:7990/stash1'
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/stash_facts_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

describe 'stash::facts', type: :class do
context 'supported operating systems' do
let(:pre_condition) { "class{'::stash': javahome => '/opt/java', }" }
let(:pre_condition) { "class{'stash': javahome => '/opt/java', }" }

on_supported_os.each do |os, facts|
context "on #{os} #{facts}" do
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/stash_gc_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

describe 'stash::gc', type: :class do
context 'supported operating systems' do
let(:pre_condition) { "class{'::stash': javahome => '/opt/java', }" }
let(:pre_condition) { "class{'stash': javahome => '/opt/java', }" }

on_supported_os.each do |os, facts|
context "on #{os} #{facts}" do
Expand Down