X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-mysql%2F0003-puppet-mysqltuner-adjust-path.patch;fp=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-mysql%2F0003-puppet-mysqltuner-adjust-path.patch;h=2900583eb997073f588259322684fc4d5906b69b;hb=57fdea704bd62af847872c40508f00aa1d7cac60;hp=0000000000000000000000000000000000000000;hpb=f23f21bccfb750b9e30141fd9676515215ffbc4e;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-support/puppet/files/puppetlabs-mysql/0003-puppet-mysqltuner-adjust-path.patch b/meta-stx/recipes-support/puppet/files/puppetlabs-mysql/0003-puppet-mysqltuner-adjust-path.patch
new file mode 100644
index 0000000..2900583
--- /dev/null
+++ b/meta-stx/recipes-support/puppet/files/puppetlabs-mysql/0003-puppet-mysqltuner-adjust-path.patch
@@ -0,0 +1,34 @@
+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