| author | Patrick Einheber <patrick.einheber@oracle.com> |
| Wed, 27 Apr 2016 14:55:10 -0700 | |
| changeset 5860 | afd31ba91ee9 |
| parent 5605 | adcc02ac2427 |
| permissions | -rw-r--r-- |
|
5605
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
Patch to correctly set the MySQL basedir parameter. This bug has not |
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
yet been submitted upstream. |
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
4 |
--- puppetlabs-mysql-3.6.2/manifests/params.pp.orig 2016-04-20 13:31:03.825840809 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
5 |
+++ puppetlabs-mysql-3.6.2/manifests/params.pp 2016-04-20 13:31:46.763615238 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
6 |
@@ -1,3 +1,7 @@ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
7 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
8 |
+# Oracle has modified the originally distributed contents of this file. |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
9 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
10 |
+ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
11 |
# Private class: See README.md. |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
12 |
class mysql::params {
|
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
13 |
|
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5605
diff
changeset
|
14 |
@@ -288,7 +292,7 @@ |
|
5605
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
'Solaris': {
|
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
$client_package_name = 'database/mysql-55/client' |
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
$server_package_name = 'database/mysql-55' |
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
- $basedir = undef |
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
+ $basedir = '/usr/mysql/5.5/' |
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
$config_file = '/etc/mysql/5.5/my.cnf' |
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
$datadir = '/var/mysql/5.5/data' |
|
adcc02ac2427
22935198 puppetlabs-mysql should define basedir in params.pp
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
$log_error = "/var/mysql/5.5/data/${::hostname}.err"
|