Skip to content

Commit 8abd753

Browse files
authored
Merge pull request #1039 from hunner/rhsc_paths
(MODULES-4794) Add paths for RHSC
2 parents 4d4b678 + 57a8a19 commit 8abd753

File tree

1 file changed

+20
-1
lines changed
  • lib/puppet/provider/mysql_datadir

1 file changed

+20
-1
lines changed

lib/puppet/provider/mysql_datadir/mysql.rb

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,26 @@
55
initvars
66

77
# Make sure we find mysqld on CentOS and mysql_install_db on Gentoo and Solaris 11
8-
ENV['PATH'] = ENV['PATH'] + ':/usr/libexec:/usr/share/mysql/scripts:/opt/rh/mysql55/root/usr/bin:/opt/rh/mysql55/root/usr/libexec:/usr/mysql/5.5/bin:/usr/mysql/5.6/bin:/usr/mysql/5.7/bin'
8+
ENV['PATH'] = [
9+
ENV['PATH'],
10+
'/usr/libexec',
11+
'/usr/share/mysql/scripts',
12+
'/opt/rh/rh-mysql57/root/usr/bin',
13+
'/opt/rh/rh-mysql57/root/usr/libexec',
14+
'/opt/rh/rh-mysql56/root/usr/bin',
15+
'/opt/rh/rh-mysql56/root/usr/libexec',
16+
'/opt/rh/rh-mariadb101/root/usr/bin',
17+
'/opt/rh/rh-mariadb101/root/usr/libexec',
18+
'/opt/rh/rh-mariadb100/root/usr/bin',
19+
'/opt/rh/rh-mariadb100/root/usr/libexec',
20+
'/opt/rh/mysql55/root/usr/bin',
21+
'/opt/rh/mysql55/root/usr/libexec',
22+
'/opt/rh/mariadb55/root/usr/bin',
23+
'/opt/rh/mariadb55/root/usr/libexec',
24+
'/usr/mysql/5.5/bin',
25+
'/usr/mysql/5.6/bin',
26+
'/usr/mysql/5.7/bin',
27+
].join(':')
928

1029
commands mysqld: 'mysqld'
1130
optional_commands mysql_install_db: 'mysql_install_db'

0 commit comments

Comments
 (0)