Fixing upstream my.cnf

They foobarred quite a bit in there

galera/files/my.cnf

@@ -31,9 +31,9 @@ port=3306
 max_connections={{ service.max_connections }}
 default-storage-engine=innodb
 binlog_format=ROW
-collation-server=utf8_general_ci
-init-connect='SET NAMES utf8'
-character-set-server=utf8
+collation-server=utf8mb4_unicode_ci
+init-connect='SET NAMES utf8mb4'
+character-set-server=utf8mb4
 default-storage-engine=innodb
 {%- if service.get('error_log_enabled', False) %}
 log_error = {{ service.get('error_log_path', '/var/log/mysql/error.log') }}
@@ -43,7 +43,6 @@ skip-name-resolve
 socket = /var/run/mysqld/mysqld.sock
 
 myisam_sort_buffer_size=64M
-wait_timeout=1800
 open_files_limit=102400
 table_open_cache=10000
 key_buffer_size=64M
@@ -51,7 +50,10 @@ max_allowed_packet=256M
 query_cache_size=0
 query_cache_type=0
 
-innodb_file_format=Barracuda
+{% for mysqld_option, option_value in service.get('mysqld_options', {}).items() %}
+{{ mysqld_option }}={{ option_value }}
+{% endfor  %}
+
 innodb_file_per_table=1
 innodb_buffer_pool_size={{ service.innodb_buffer_pool_size }}
 innodb_log_file_size=627M
@@ -64,19 +66,17 @@ innodb_doublewrite=0
 innodb_autoinc_lock_mode=2
 innodb_locks_unsafe_for_binlog=1
 wsrep_on=ON
-{%- if service.members|length > 1 %}
+{%- if service.get('members', []) |length > 1 %}
 wsrep_cluster_address="gcomm://{% for member in service.members %}{{ member.host}}:4567{% if not loop.last %},{% endif %}{% endfor %}/?pc.wait_prim=no"
 {%- else %}
 wsrep_cluster_address="gcomm://"
 {%- endif %}
 wsrep_provider={{ service.wsrep_provider }}
-wsrep_cluster_name="openstack"
+wsrep_cluster_name="{{ service.cluster.name }}"
 
 wsrep_slave_threads={{ service.get('wsrep_slave_threads', 8) }}
-{%- if engine == 'mysql' %}
 wsrep_sst_method=xtrabackup-v2
 wsrep_sst_auth={{ service.admin.user }}:{{ service.admin.password }}
-{%- endif %}
 wsrep_node_address={{ service.bind.address }}
 wsrep_provider_options="gcache.size = 256M"
 wsrep_provider_options="gmcast.listen_addr = tcp://{{ service.bind.address }}:4567"