Merge lp:~1chb1n/charms/trusty/percona-cluster/vivid-fixup into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[Ryan Beisner]

Fix for Vivid installation.

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

charm_lint_check #6627 percona-cluster-next for 1chb1n mp265555
    LINT OK: passed

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

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

charm_unit_test #6254 percona-cluster-next for 1chb1n mp265555
    UNIT OK: passed

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

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

charm_lint_check #6628 percona-cluster-next for 1chb1n mp265555
    LINT OK: passed

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

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

charm_unit_test #6255 percona-cluster-next for 1chb1n mp265555
    UNIT OK: passed

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

[lp:~1chb1n/charms/trusty/percona-cluster/vivid-fixup]

66. By Edward Hope-Morley on 2015-07-22

[hopem,r=thedac,james-page]

Add min-cluster-size config option. This allows the charm to wait
for a minimum number of peers to join before bootstrapping
percona and allowing relations to access the database.

Closes-Bug: 1475585

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

charm_amulet_test #5257 percona-cluster-next for 1chb1n mp265555
    AMULET OK: passed

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

[lp:~1chb1n/charms/trusty/percona-cluster/vivid-fixup]

67. By Ryan Beisner on 2015-07-22

fix up pxc56 server package selection on vivid, with mysql56 client

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

charm_unit_test #6260 percona-cluster-next for 1chb1n mp265555
    UNIT OK: passed

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

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

charm_lint_check #6633 percona-cluster-next for 1chb1n mp265555
    LINT OK: passed

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

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

charm_amulet_test #5263 percona-cluster-next for 1chb1n mp265555
    AMULET OK: passed

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

[lp:~1chb1n/charms/trusty/percona-cluster/vivid-fixup]

68. By Ryan Beisner on 2015-07-22

update

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

charm_lint_check #6636 percona-cluster-next for 1chb1n mp265555
    LINT OK: passed

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

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

charm_unit_test #6263 percona-cluster-next for 1chb1n mp265555
    UNIT OK: passed

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

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

charm_amulet_test #5266 percona-cluster-next for 1chb1n mp265555
    AMULET OK: passed

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

[Billy Olsen (billy-olsen)]

Minor nit. See inline

[Ryan Beisner (1chb1n)]

Yes that would work now, but there will be a point in time where > Utopic will fail, presuming we will eventually have an Ubuntu "Z" followed by an "A".

I've not raised that as a "future-bug" yet to raise awareness or propose a shift in logic, but in the uosci and amulet code, we already use different logic which should be future-proof, so long as python-distro-info is maintained.

Ubuntu release list: ['warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid', 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic', 'vivid']

[Ryan Beisner (1chb1n)]

^ The alternate method is to use distro-info's ordered list for comparison.

[Ryan Beisner (1chb1n)]

Anyhoo, I'm happy to switch it to > Utopic to be consistent with the other os-charms. Just let me know.

=== modified file 'hooks/percona_utils.py'
--- hooks/percona_utils.py	2015-07-22 11:17:09 +0000
+++ hooks/percona_utils.py	2015-07-22 19:36:30 +0000
@@ -48,10 +48,18 @@
     OperationalError
 )
 
-PACKAGES = [
-    'percona-xtradb-cluster-server-5.5',
-    'percona-xtradb-cluster-client-5.5',
-]
+if lsb_release()['DISTRIB_CODENAME'] in ['vivid', 'wily']:
+    # NOTE(beisner): pxc 5.6 client package is not available in Vivid, install
+    # mysql 5.6 client instead per https://launchpad.net/bugs/1476845.
+    PACKAGES = [
+        'percona-xtradb-cluster-server-5.6',
+        'mysql-client-5.6'
+    ]
+else:
+    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