Added mising template code, removed shutil, cleanup

hooks/percona_hooks.py

@@ -48,8 +48,7 @@ from percona_utils import (
     configure_mysql_root_password,
     relation_clear,
     assert_charm_supports_ipv6,
-    unit_sorted,
-    install_xtrabackup_ipv6_plugin
+    unit_sorted
 )
 from mysql import (
     get_allowed_units,
@@ -109,12 +108,11 @@ def render_config(clustered=False, hosts=[]):
         # NOTE(hopem): this is a kludge to get percona working with ipv6.
         # See lp 1380747 for more info. This is intended as a stop gap until
         # percona package is fixed to support ipv6.
-        install_xtrabackup_ipv6_plugin()
-        context['sst_method'] = 'xtrabackup-v2-ipv6'
         context['bind_address'] = '::'
         context['wsrep_provider_options'] = 'gmcast.listen_addr=tcp://:::4567;'
+        context['ipv6'] = True
     else:
-        context['sst_method'] = 'xtrabackup'
+        context['ipv6'] = False
 
     context.update(parse_config())
     write_file(path=MY_CNF,

hooks/percona_utils.py

@@ -4,7 +4,6 @@ from subprocess import Popen, PIPE
 import socket
 import tempfile
 import os
-import shutil
 from charmhelpers.core.host import (
     lsb_release
 )

templates/my.cnf

@@ -58,4 +58,10 @@ max_allowed_packet = 16M
 # query cache is not supported with Active/Active configuration
 innodb_buffer_pool_size = {{ dataset_bytes }}
 
+{% if ipv6 %}
+[sst]
+sockopt=,pf=ip6
+{% endif %}
+
+
 !includedir /etc/mysql/conf.d/