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-mysql%2F0003-puppet-mysqltuner-adjust-path.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-mysql%2F0003-puppet-mysqltuner-adjust-path.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=2900583eb997073f588259322684fc4d5906b69b;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-mysql/0003-puppet-mysqltuner-adjust-path.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-mysql/0003-puppet-mysqltuner-adjust-path.patch
deleted file mode 100644
index 2900583..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-mysql/0003-puppet-mysqltuner-adjust-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/manifests/server/mysqltuner.pp b/manifests/server/mysqltuner.pp
-index ae91e63..4857c0c 100644
---- a/manifests/server/mysqltuner.pp
-+++ b/manifests/server/mysqltuner.pp
-@@ -40,14 +40,14 @@ class mysql::server::mysqltuner(
-       source      => $_source,
-       environment => $environment,
-     }
--    file { '/usr/local/bin/mysqltuner':
-+    file { '/usr/bin/mysqltuner':
-       ensure  => $ensure,
-       mode    => '0550',
-       source  => "${::staging::path}/mysql/mysqltuner-${_version}",
-       require => Staging::File["mysqltuner-${_version}"],
-     }
-   } else {
--    file { '/usr/local/bin/mysqltuner':
-+    file { '/usr/bin/mysqltuner':
-       ensure => $ensure,
-     }
-   }
-diff --git a/spec/classes/mysql_server_mysqltuner_spec.rb b/spec/classes/mysql_server_mysqltuner_spec.rb
-index 4fef3d5..c9cf5f0 100644
---- a/spec/classes/mysql_server_mysqltuner_spec.rb
-+++ b/spec/classes/mysql_server_mysqltuner_spec.rb
-@@ -21,7 +21,7 @@ describe 'mysql::server::mysqltuner' do
-       context 'ensure => absent' do
-         let(:params) {{ :ensure => 'absent' }}
-         it { is_expected.to compile }
--        it { is_expected.to contain_file('/usr/local/bin/mysqltuner').with(:ensure => 'absent') }
-+        it { is_expected.to contain_file('/usr/bin/mysqltuner').with(:ensure => 'absent') }
-       end
- 
-       context 'custom version' do