Merge pull request #90 from RonWilliams/master

Fix RedHat MySQL admin root username pillar setup.
This commit is contained in:
Forrest 2015-09-18 10:23:49 -07:00
commit cc600c405b

View file

@ -27,8 +27,8 @@ mysql_debconf:
{% elif os_family == 'RedHat' or 'Suse' %} {% elif os_family == 'RedHat' or 'Suse' %}
mysql_root_password: mysql_root_password:
cmd.run: cmd.run:
- name: mysqladmin --user root password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' - name: mysqladmin --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}'
- unless: mysql --user root --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;" - unless: mysql --user {{ mysql_root_user }} --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;"
- require: - require:
- service: mysqld - service: mysqld