Skip to content

Commit

Permalink
Merge pull request #715 from jbondpdx/3.4.x
Browse files Browse the repository at this point in the history
DOCS: minor edits to mysql readme
  • Loading branch information
jonnytdevops committed May 19, 2015
2 parents 609a8d0 + 4cd07c0 commit 3ec3d79
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -202,11 +202,11 @@ The MySQL root password. Puppet attempts to set the root password and update `/r

This is required if `create_root_user` or `create_root_my_cnf` are 'true'. If `root_password` is 'UNSET', then `create_root_user` and `create_root_my_cnf` are assumed to be false --- that is, the MySQL root user and `/root/.my.cnf` are not created.

Password changes are supported however the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old password, configured in `/root/my.cnf`, to set the new password in MySQL, then updates `/root/.my.cnf` with the new password.
Password changes are supported; however, the old password must be set in `/root/.my.cnf`. Effectively, Puppet uses the old password, configured in `/root/my.cnf`, to set the new password in MySQL, and then updates `/root/.my.cnf` with the new password.

####`old_root_password`

This parameter no longer does anything. It exists only for backwards compatibility. See the `root_password` parameter for details on changing the root password.
This parameter no longer does anything. It exists only for backwards compatibility. See the `root_password` parameter above for details on changing the root password.

#####`override_options`

Expand Down Expand Up @@ -385,7 +385,7 @@ Whether or not to include routines for each database when doing a `file_per_data

#####`include_triggers`

Whether or not to include triggers for a each database when doing a `file_per_database` backup. Defaults to `false`.
Whether or not to include triggers for each database when doing a `file_per_database` backup. Defaults to `false`.

#####`ensure`

Expand Down Expand Up @@ -786,13 +786,13 @@ The library file name.

#### `mysql_version`

Determines the MySql version by parsing the output from `mysql --version`
Determines the MySQL version by parsing the output from `mysql --version`

#### `mysql_server_id`

Generates a unique id, based on the node's MAC address, which can be used as
`server_id`. This fact will *always* return `0` on all nodes which only have
loopback interfaces. Given those nodes' connectivity that's probably okay.
`server_id`. This fact will *always* return `0` on nodes that have only
loopback interfaces. Because those nodes aren't connected to the outside world, this shouldn't cause any conflicts.

##Limitations

Expand Down

0 comments on commit 3ec3d79

Please sign in to comment.