Merge "Add wsrep.galera_check module"
diff --git a/galera/files/my.cnf b/galera/files/my.cnf
index 9700854..b55530f 100644
--- a/galera/files/my.cnf
+++ b/galera/files/my.cnf
@@ -43,7 +43,9 @@
myisam_sort_buffer_size=64M
wait_timeout=1800
open_files_limit=102400
-table_open_cache=10000
+table_open_cache={{ service.get('table_open_cache', 10000) }}
+tmp_table_size={{ service.get('tmp_table_size', 16777216) }}
+max_heap_table_size={{ service.get('max_heap_table_size', 16777216) }}
key_buffer_size=64M
max_allowed_packet=256M
query_cache_size=0
diff --git a/galera/meta/salt.yml b/galera/meta/salt.yml
index 15ebaf4..bff3d2f 100644
--- a/galera/meta/salt.yml
+++ b/galera/meta/salt.yml
@@ -3,4 +3,8 @@
priority: 140
slave:
priority: 150
-
+orchestration:
+ upgrade:
+ applications:
+ galera:
+ priority: 910
diff --git a/tests/pillar/slave_cluster.sls b/tests/pillar/slave_cluster.sls
index 458f09a..72c6dfc 100644
--- a/tests/pillar/slave_cluster.sls
+++ b/tests/pillar/slave_cluster.sls
@@ -162,6 +162,9 @@
key_file: /etc/mysql/ssl/key.pem
cert_file: /etc/mysql/ssl/cert.pem
ca_file: /etc/mysql/ssl/ca.pem
+ table_open_cache: 15000
+ tmp_table_size: 16777216
+ max_heap_table_size: 16777216
clustercheck:
enabled: True
user: clustercheck