meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0006-adjust_path-remove-refs-to-local-bin.patch

   1 diff --git a/manifests/params.pp b/manifests/params.pp
   2 index 20f91ef..a894736 100644
   3 --- a/manifests/params.pp
   4 +++ b/manifests/params.pp
   5 @@ -298,7 +298,7 @@ class postgresql::params inherits postgresql::globals {
   6      }
   7    }
   8
   9 -  $validcon_script_path = pick($validcon_script_path, '/usr/local/bin/validate_postgresql_connection.sh')
  10 +  $validcon_script_path = pick($validcon_script_path, '/usr/bin/validate_postgresql_connection.sh')
  11    $initdb_path          = pick($initdb_path, "${bindir}/initdb")
  12    $pg_hba_conf_path     = pick($pg_hba_conf_path, "${confdir}/pg_hba.conf")
  13    $pg_hba_conf_defaults = pick($pg_hba_conf_defaults, true)
  14 diff --git a/spec/unit/defines/validate_db_connection_spec.rb b/spec/unit/defines/validate_db_connection_spec.rb
  15 index c7406dc..02adc04 100644
  16 --- a/spec/unit/defines/validate_db_connection_spec.rb
  17 +++ b/spec/unit/defines/validate_db_connection_spec.rb
  18 @@ -34,7 +34,7 @@ describe 'postgresql::validate_db_connection', :type => :define do
  19
  20      it 'should have proper path for validate command' do
  21        is_expected.to contain_exec('validate postgres connection for test@test:5432/test').with({
  22 -        :unless => %r'^/usr/local/bin/validate_postgresql_connection.sh\s+\d+'
  23 +        :unless => %r'^/usr/bin/validate_postgresql_connection.sh\s+\d+'
  24        })
  25      end
  26    end