Revert "Revert "oran-shell-release: release image for F""
[pti/rtp.git] / meta-starlingx / meta-stx-cloud / recipes-support / puppet / files / puppetlabs-mysql / 0003-puppet-mysqltuner-adjust-path.patch
1 diff --git a/manifests/server/mysqltuner.pp b/manifests/server/mysqltuner.pp
2 index ae91e63..4857c0c 100644
3 --- a/manifests/server/mysqltuner.pp
4 +++ b/manifests/server/mysqltuner.pp
5 @@ -40,14 +40,14 @@ class mysql::server::mysqltuner(
6        source      => $_source,
7        environment => $environment,
8      }
9 -    file { '/usr/local/bin/mysqltuner':
10 +    file { '/usr/bin/mysqltuner':
11        ensure  => $ensure,
12        mode    => '0550',
13        source  => "${::staging::path}/mysql/mysqltuner-${_version}",
14        require => Staging::File["mysqltuner-${_version}"],
15      }
16    } else {
17 -    file { '/usr/local/bin/mysqltuner':
18 +    file { '/usr/bin/mysqltuner':
19        ensure => $ensure,
20      }
21    }
22 diff --git a/spec/classes/mysql_server_mysqltuner_spec.rb b/spec/classes/mysql_server_mysqltuner_spec.rb
23 index 4fef3d5..c9cf5f0 100644
24 --- a/spec/classes/mysql_server_mysqltuner_spec.rb
25 +++ b/spec/classes/mysql_server_mysqltuner_spec.rb
26 @@ -21,7 +21,7 @@ describe 'mysql::server::mysqltuner' do
27        context 'ensure => absent' do
28          let(:params) {{ :ensure => 'absent' }}
29          it { is_expected.to compile }
30 -        it { is_expected.to contain_file('/usr/local/bin/mysqltuner').with(:ensure => 'absent') }
31 +        it { is_expected.to contain_file('/usr/bin/mysqltuner').with(:ensure => 'absent') }
32        end
33  
34        context 'custom version' do