Merge lp:~james-page/charms/trusty/percona-cluster/refactored-packages into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[James Page]

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #6411 percona-cluster-next for james-page mp265778
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6411/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #6884 percona-cluster-next for james-page mp265778
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/6884/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5326 percona-cluster-next for james-page mp265778
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5326/

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-07-22 11:17:09 +0000
+++ hooks/percona_hooks.py	2015-07-24 08:09:01 +0000
@@ -44,7 +44,7 @@
     peer_retrieve_by_prefix,
 )
 from percona_utils import (
-    PACKAGES,
+    determine_packages,
     MY_CNF,
     setup_percona_repo,
     get_host_ip,
@@ -105,7 +105,7 @@
     # Render base configuration (no cluster)
     render_config()
     apt_update(fatal=True)
-    apt_install(PACKAGES, fatal=True)
+    apt_install(determine_packages(), fatal=True)
     configure_sstuser(config('sst-password'))
 
 
 
=== modified file 'hooks/percona_utils.py'
--- hooks/percona_utils.py	2015-07-22 11:17:09 +0000
+++ hooks/percona_utils.py	2015-07-24 08:09:01 +0000
@@ -48,11 +48,6 @@
     OperationalError
 )
 
-PACKAGES = [
-    'percona-xtradb-cluster-server-5.5',
-    'percona-xtradb-cluster-client-5.5',
-]
-
 KEY = "keys/repo.percona.com"
 REPO = """deb http://repo.percona.com/apt {release} main
 deb-src http://repo.percona.com/apt {release} main"""
@@ -61,6 +56,22 @@
 HOSTS_FILE = '/etc/hosts'
 
 
+def determine_packages():
+    if lsb_release()['DISTRIB_CODENAME'] > 'utopic':
+        # NOTE(beisner): pxc 5.6 client package is not available
+        # in Vivid, install mysql 5.6 client instead per
+        # https://launchpad.net/bugs/1476845.
+        return [
+            'percona-xtradb-cluster-server-5.6',
+            'mysql-client-5.6'
+        ]
+    else:
+        return [
+            'percona-xtradb-cluster-server-5.5',
+            'percona-xtradb-cluster-client-5.5',
+        ]
+
+
 def seeded():
     ''' Check whether service unit is already seeded '''
     return os.path.exists(SEEDED_MARKER)
 
=== modified file 'unit_tests/test_percona_utils.py'
--- unit_tests/test_percona_utils.py	2015-07-22 11:17:09 +0000
+++ unit_tests/test_percona_utils.py	2015-07-24 08:09:01 +0000
@@ -145,3 +145,17 @@
 
         mock_related_units.return_value = ['test/0', 'test/1']
         self.assertTrue(percona_utils.is_sufficient_peers())
+
+    @mock.patch.object(percona_utils, 'lsb_release')
+    def test_packages_gt_utopic(self, mock_lsb_release):
+        mock_lsb_release.return_value = {'DISTRIB_CODENAME': 'vivid'}
+        self.assertEqual(percona_utils.determine_packages(),
+                         ['percona-xtradb-cluster-server-5.6',
+                          'mysql-client-5.6'])
+
+    @mock.patch.object(percona_utils, 'lsb_release')
+    def test_packages_le_utopic(self, mock_lsb_release):
+        mock_lsb_release.return_value = {'DISTRIB_CODENAME': 'utopic'}
+        self.assertEqual(percona_utils.determine_packages(),
+                         ['percona-xtradb-cluster-server-5.5',
+                          'percona-xtradb-cluster-client-5.5'])