X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-postgresql%2F0006-adjust_path-remove-refs-to-local-bin.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-postgresql%2F0006-adjust_path-remove-refs-to-local-bin.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=6e1d7f5cfe6b1a7b5d09a95c42ab2ded153b37d4;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0006-adjust_path-remove-refs-to-local-bin.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0006-adjust_path-remove-refs-to-local-bin.patch
deleted file mode 100644
index 6e1d7f5..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-postgresql/0006-adjust_path-remove-refs-to-local-bin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/manifests/params.pp b/manifests/params.pp
-index 20f91ef..a894736 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -298,7 +298,7 @@ class postgresql::params inherits postgresql::globals {
-     }
-   }
- 
--  $validcon_script_path = pick($validcon_script_path, '/usr/local/bin/validate_postgresql_connection.sh')
-+  $validcon_script_path = pick($validcon_script_path, '/usr/bin/validate_postgresql_connection.sh')
-   $initdb_path          = pick($initdb_path, "${bindir}/initdb")
-   $pg_hba_conf_path     = pick($pg_hba_conf_path, "${confdir}/pg_hba.conf")
-   $pg_hba_conf_defaults = pick($pg_hba_conf_defaults, true)
-diff --git a/spec/unit/defines/validate_db_connection_spec.rb b/spec/unit/defines/validate_db_connection_spec.rb
-index c7406dc..02adc04 100644
---- a/spec/unit/defines/validate_db_connection_spec.rb
-+++ b/spec/unit/defines/validate_db_connection_spec.rb
-@@ -34,7 +34,7 @@ describe 'postgresql::validate_db_connection', :type => :define do
- 
-     it 'should have proper path for validate command' do
-       is_expected.to contain_exec('validate postgres connection for test@test:5432/test').with({
--        :unless => %r'^/usr/local/bin/validate_postgresql_connection.sh\s+\d+'
-+        :unless => %r'^/usr/bin/validate_postgresql_connection.sh\s+\d+'
-       })
-     end
-   end