Skip to content
Snippets Groups Projects
Commit f56f39b1 authored by Glenn E. Bailey III's avatar Glenn E. Bailey III
Browse files

Made datadir dynamic

parent 5c66c416
Branches
Tags
No related merge requests found
...@@ -12,6 +12,7 @@ include: ...@@ -12,6 +12,7 @@ include:
{% set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} {% set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %}
{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} {% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
{% set mysql_salt_password = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_password) %} {% set mysql_salt_password = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_password) %}
{% set mysql_datadir = salt['pillar.get']('mysql:server:mysqld:datadir', '/var/lib/mysql') %}
{% if mysql_root_password %} {% if mysql_root_password %}
{% if os_family == 'Debian' %} {% if os_family == 'Debian' %}
...@@ -65,12 +66,12 @@ mysql_delete_anonymous_user_{{ host }}: ...@@ -65,12 +66,12 @@ mysql_delete_anonymous_user_{{ host }}:
mysql_install_datadir: mysql_install_datadir:
cmd.run: cmd.run:
{% if mysql.version >= 5.7 %} {% if mysql.version >= 5.7 %}
- name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir=/var/lib/mysql - name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
{% else %} {% else %}
- name: mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql - name: mysql_install_db --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
{% endif %} {% endif %}
- user: root - user: root
- creates: /var/lib/mysql/mysql/user.frm - creates: {{ mysql_datadir }}/mysql/user.frm
- env: - env:
- TMPDIR: '/tmp' - TMPDIR: '/tmp'
- require: - require:
...@@ -92,9 +93,9 @@ mysqld-packages: ...@@ -92,9 +93,9 @@ mysqld-packages:
# Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out. # Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out.
mysql_initialize: mysql_initialize:
cmd.run: cmd.run:
- name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir=/var/lib/mysql - name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
- user: root - user: root
- creates: /var/lib/mysql/mysql/ - creates: {{ mysql_datadir}}/mysql/
- require: - require:
- pkg: {{ mysql.server }} - pkg: {{ mysql.server }}
{% endif %} {% endif %}
......
...@@ -28,6 +28,7 @@ mysql: ...@@ -28,6 +28,7 @@ mysql:
# you can use either underscore or hyphen in param names # you can use either underscore or hyphen in param names
bind-address: 0.0.0.0 bind-address: 0.0.0.0
log_bin: /var/log/mysql/mysql-bin.log log_bin: /var/log/mysql/mysql-bin.log
datadir: /var/lib/mysql
port: 3307 port: 3307
binlog_do_db: foo binlog_do_db: foo
auto_increment_increment: 5 auto_increment_increment: 5
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment