diff options
| author |   carey.xu <carey.xuhan@huawei.com> | 2016-03-01 17:50:10 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2016-03-14 03:09:02 +0000 |
| commit | 9710824c31c7e3b41d482e68ae790b46dc0513bb (patch) | |
| tree | 94fc7da83d99ff33e6325265be04754d2d1de6f9 /deploy/adapters/ansible/roles/database/templates | |
| parent | 9418c59bf42d7f7c0348580e372a7ca5ddbbb1d8 (diff) | |
maker mariadb playbook reentrant
JIRA: COMPASS-329
Change-Id: I02680fe271f3896dc901a67c043570449fd3d64e
Signei-off-by: carey.xu <carey.xuhan@huawei.com>
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/database/templates')
3 files changed, 1 insertions, 119 deletions
diff --git a/deploy/adapters/ansible/roles/database/templates/my.cnf b/deploy/adapters/ansible/roles/database/templates/my.cnf index 68e0fca2..f1170ece 100644 --- a/deploy/adapters/ansible/roles/database/templates/my.cnf +++ b/deploy/adapters/ansible/roles/database/templates/my.cnf @@ -56,4 +56,4 @@ quote-names max_allowed_packet = 16M -!includedir /etc/my.cnf.d/ +!includedir {{ mysql_config_dir }} diff --git a/deploy/adapters/ansible/roles/database/templates/my_debian.cnf b/deploy/adapters/ansible/roles/database/templates/my_debian.cnf deleted file mode 100644 index b8016849..00000000 --- a/deploy/adapters/ansible/roles/database/templates/my_debian.cnf +++ /dev/null @@ -1,59 +0,0 @@ -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - - -[mysqld_safe] -socket = /var/run/mysqld/mysqld.sock -nice = 0 - - -[mysql] -default-character-set = utf8 - -[mysqld] -user = mysql -collation-server = utf8_unicode_ci -init-connect = 'SET NAMES utf8' -character-set-server = utf8 -datadir = /var/lib/mysql -bind-address = {{ internal_ip }} - -max-allowed-packet = 16M -max-connect-errors = 1000000 - -max_connections = {{ ansible_processor_vcpus * 100 }} - -wait_timeout = 28800 -tmp-table-size = 32M -max-heap-table-size = 32M -query-cache-type = 0 -query-cache-size = 0M -thread-cache-size = 50 -open-files-limit = 65535 -table-definition-cache = 4096 -table-open-cache = 10240 - -innodb-flush-method = O_DIRECT -innodb-additional-mem-pool-size = 24M -innodb-log-file-size = 1024M -innodb-file-per-table = 1 -innodb-buffer-pool-size = 4096M - -innodb-read-io-threads = 4 -innodb-write-io-threads = 4 -innodb-doublewrite = 1 -innodb-log-buffer-size = 1024M -innodb-buffer-pool-instances = 8 -innodb-log-files-in-group = 2 -innodb-thread-concurrency = {{ ansible_processor_vcpus * 2 }} - -innodb_stats_on_metadata = 0 - -[mysqldump] -quick -quote-names -max_allowed_packet = 16M - - -!includedir /etc/mysql/conf.d/ diff --git a/deploy/adapters/ansible/roles/database/templates/my_redhat.cnf b/deploy/adapters/ansible/roles/database/templates/my_redhat.cnf deleted file mode 100644 index 68e0fca2..00000000 --- a/deploy/adapters/ansible/roles/database/templates/my_redhat.cnf +++ /dev/null @@ -1,59 +0,0 @@ -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - - -[mysqld_safe] -socket = /var/run/mysqld/mysqld.sock -nice = 0 - - -[mysql] -default-character-set = utf8 - -[mysqld] -user = mysql -collation-server = utf8_unicode_ci -init-connect = 'SET NAMES utf8' -character-set-server = utf8 -datadir = /var/lib/mysql -bind-address = {{ internal_ip }} - -max-allowed-packet = 16M -max-connect-errors = 1000000 - -max_connections = {{ ansible_processor_vcpus * 100 }} - -wait_timeout = 28800 -tmp-table-size = 32M -max-heap-table-size = 32M -query-cache-type = 0 -query-cache-size = 0M -thread-cache-size = 50 -open-files-limit = 65535 -table-definition-cache = 4096 -table-open-cache = 10240 - -innodb-flush-method = O_DIRECT -innodb-additional-mem-pool-size = 24M -innodb-log-file-size = 1024M -innodb-file-per-table = 1 -innodb-buffer-pool-size = 4096M - -innodb-read-io-threads = 4 -innodb-write-io-threads = 4 -innodb-doublewrite = 1 -innodb-log-buffer-size = 1024M -innodb-buffer-pool-instances = 8 -innodb-log-files-in-group = 2 -innodb-thread-concurrency = {{ ansible_processor_vcpus * 2 }} - -innodb_stats_on_metadata = 0 - -[mysqldump] -quick -quote-names -max_allowed_packet = 16M - - -!includedir /etc/my.cnf.d/ |