From 721f6514f00b2abd565521e91b1a8c1a065116c6 Mon Sep 17 00:00:00 2001
From: Hui Xiang <hui.xiang@canonical.com>
Date: Thu, 18 Sep 2014 22:48:05 +0800
Subject: [PATCH] Do IPv6 check for supported version.

---
 config.yaml            |  1 -
 hooks/mysql.py         |  1 +
 hooks/percona_hooks.py |  9 ++++++++-
 hooks/percona_utils.py | 16 ++++++++++++----
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/config.yaml b/config.yaml
index 001aa38..bf76d65 100644
--- a/config.yaml
+++ b/config.yaml
@@ -47,4 +47,3 @@ options:
     default: false
     type: boolean
     description: "Enable IPv6."
-
diff --git a/hooks/mysql.py b/hooks/mysql.py
index eaa567e..7814df1 100644
--- a/hooks/mysql.py
+++ b/hooks/mysql.py
@@ -184,6 +184,7 @@ def configure_db(hostname,
                  username,
                  admin=False):
     ''' Configure access to database for username from hostname '''
+
     if config_get('prefer-ipv6'):
         remote_ip = hostname
     elif hostname != unit_get('private-address'):
diff --git a/hooks/percona_hooks.py b/hooks/percona_hooks.py
index d969f7f..6306d1e 100755
--- a/hooks/percona_hooks.py
+++ b/hooks/percona_hooks.py
@@ -46,6 +46,7 @@ from percona_utils import (
     seeded, mark_seeded,
     configure_mysql_root_password,
     relation_clear,
+    setup_ipv6
 )
 from mysql import (
     get_mysql_password,
@@ -64,7 +65,7 @@ from charmhelpers.contrib.network.ip import (
     is_address_in_network,
     get_address_in_network,
     get_netmask_for_address,
-    get_ipv6_addr,
+    get_ipv6_addr
 )
 
 hooks = Hooks()
@@ -83,6 +84,9 @@ def install():
     apt_update(fatal=True)
     apt_install(PACKAGES, fatal=True)
     configure_sstuser(config('sst-password'))
+    
+    if config('prefer-ipv6'):
+        setup_ipv6()
 
 
 def render_config(clustered=False, hosts=[]):
@@ -110,6 +114,9 @@ def render_config(clustered=False, hosts=[]):
 @hooks.hook('upgrade-charm')
 @hooks.hook('config-changed')
 def config_changed():
+    if config('prefer-ipv6'):
+        setup_ipv6()
+
     hosts = get_cluster_hosts()
     clustered = len(hosts) > 1
     pre_hash = file_hash(MY_CNF)
diff --git a/hooks/percona_utils.py b/hooks/percona_utils.py
index 4bf78d0..c86b6d3 100644
--- a/hooks/percona_utils.py
+++ b/hooks/percona_utils.py
@@ -4,7 +4,7 @@ from subprocess import Popen, PIPE
 import socket
 import os
 from charmhelpers.core.host import (
-    lsb_release,
+    lsb_release
 )
 from charmhelpers.core.hookenv import (
     unit_get,
@@ -13,17 +13,18 @@ from charmhelpers.core.hookenv import (
     relation_get,
     relation_set,
     local_unit,
-    config,
+    config
 )
 from charmhelpers.fetch import (
     apt_install,
-    filter_installed_packages,
+    filter_installed_packages
 )
 from charmhelpers.contrib.network.ip import (
-    get_ipv6_addr,
+    get_ipv6_addr
 )
 from mysql import get_mysql_root_password, MySQLHelper
 
+
 try:
     import jinja2
 except ImportError:
@@ -106,6 +107,7 @@ def get_cluster_hosts():
     for relid in relation_ids('cluster'):
         for unit in related_units(relid):
             private_address = relation_get('private-address', unit, relid)
+
             if config('prefer-ipv6'):
                 hostname = relation_get('hostname', unit, relid)
                 if not hostname or hostname in hosts:
@@ -175,3 +177,9 @@ def render_hosts(map):
         for line in lines:
             hosts.write(line)
 
+
+def setup_ipv6():
+    ubuntu_rel = float(lsb_release()['DISTRIB_RELEASE'])
+    if ubuntu_rel < 14.04:
+        raise Exception("IPv6 is not supported for Ubuntu "
+                        "versions less than Trusty 14.04")