File tree Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Original file line number Diff line number Diff line change 4
4
5
5
# The export_locales method conflicts with our testing when the target system uses MariaDB, therefore it is being disabled for those systems.
6
6
# if os[:family] != 'debian' && os[:family] != 'ubuntu'
7
- # export_locales
7
+ export_locales
8
8
# end
9
9
10
10
describe 'mysql class' do
@@ -60,9 +60,7 @@ class { 'mysql::server':
60
60
class { '::mysql::server':
61
61
override_options => {
62
62
'mysqld' => {
63
- 'log-bin' => '/var/log/mariadb/mariadb-bin.log',},
64
- 'LANG' => 'C',
65
- 'LC_ALL' => 'C'
63
+ 'log-bin' => '/var/log/mariadb/mariadb-bin.log',}
66
64
}
67
65
}
68
66
MANIFEST
Original file line number Diff line number Diff line change @@ -20,15 +20,15 @@ def mysql_version
20
20
end
21
21
22
22
def export_locales
23
- LitmusHelper . instance . run_shell ( 'echo export PATH=" /opt/puppetlabs/bin:$PATH" > ~/.bashrc' )
24
- LitmusHelper . instance . run_shell ( 'echo export LC_ALL="C" > /etc/profile.d/my-custom.lang.sh' )
23
+ LitmusHelper . instance . run_shell ( 'echo export PATH=/opt/puppetlabs/bin:$PATH > ~/.bashrc' )
24
+ LitmusHelper . instance . run_shell ( 'echo export LC_ALL=C > /etc/profile.d/my-custom.lang.sh' )
25
25
LitmusHelper . instance . run_shell ( 'echo "## US English ##" >> /etc/profile.d/my-custom.lang.sh' )
26
- LitmusHelper . instance . run_shell ( 'echo export LANG="en_US.UTF-8" >> /etc/profile.d/my-custom.lang.sh' )
27
- LitmusHelper . instance . run_shell ( 'echo export LANGUAGE="en_US.UTF-8" >> /etc/profile.d/my-custom.lang.sh' )
26
+ LitmusHelper . instance . run_shell ( 'echo export LANG=C >> /etc/profile.d/my-custom.lang.sh' )
27
+ LitmusHelper . instance . run_shell ( 'echo export LANGUAGE=C >> /etc/profile.d/my-custom.lang.sh' )
28
28
LitmusHelper . instance . run_shell ( 'echo export LC_COLLATE=C >> /etc/profile.d/my-custom.lang.sh' )
29
- LitmusHelper . instance . run_shell ( 'echo export LC_CTYPE="en_US.UTF-8" >> /etc/profile.d/my-custom.lang.sh' )
29
+ LitmusHelper . instance . run_shell ( 'echo export LC_CTYPE=C >> /etc/profile.d/my-custom.lang.sh' )
30
30
LitmusHelper . instance . run_shell ( '. /etc/profile.d/my-custom.lang.sh' )
31
- LitmusHelper . instance . run_shell ( 'echo export LC_ALL="C" >> ~/.bashrc' )
31
+ LitmusHelper . instance . run_shell ( 'echo export LC_ALL=C >> ~/.bashrc' )
32
32
LitmusHelper . instance . run_shell ( '. ~/.bashrc' )
33
33
end
34
34
You can’t perform that action at this time.
0 commit comments