Merge lp:~gnuoy/charms/trusty/mysql/1567971 into lp:charms/trusty/mysql

[Liam Young]

[lp:~gnuoy/charms/trusty/mysql/1567971]

159. By Liam Young on 2016-04-08

tests/021-basic-xenial-mitaka was enabled in error

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

charm_lint_check #2202 mysql for gnuoy mp291388
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2202/

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

charm_unit_test #1774 mysql for gnuoy mp291388
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1774/

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

charm_lint_check #2203 mysql for gnuoy mp291388
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2203/

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

charm_unit_test #1775 mysql for gnuoy mp291388
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1775/

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

charm_amulet_test #691 mysql for gnuoy mp291388
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/691/

[Ryan Beisner (1chb1n)]

Thanks for the test update.

review: Approve

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-01-13 18:29:37 +0000
+++ tests/basic_deployment.py	2016-04-08 16:02:51 +0000
@@ -86,6 +86,9 @@
             self.mysql_sentry: ['mysql'],
             self.keystone_sentry: ['keystone']
         }
+        if self._get_openstack_release() >= self.trusty_liberty:
+            services[self.keystone_sentry] = ['apache2']
+
         ret = u.validate_services_by_name(services)
         if ret:
             amulet.raise_status(amulet.FAIL, msg=ret)
@@ -94,9 +97,14 @@
         """Verify that the user table in the keystone mysql database
            contains an admin user with a specific email address."""
 
-        cmd = ("export FOO=$(sudo cat /var/lib/mysql/mysql.passwd);"
-               "mysql -u root -p$FOO -e "
-               "\"SELECT extra FROM keystone.user WHERE name='admin';\"")
+        if self._get_openstack_release() >= self.trusty_mitaka:
+            query = ("SELECT extra FROM local_user, user WHERE "
+                     "local_user.user_id = user.id;")
+        else:
+            query = ("SELECT extra FROM user WHERE name='admin'")
+
+        cmd = ('export FOO=$(sudo cat /var/lib/mysql/mysql.passwd);'
+               'mysql -u root -p$FOO -D keystone -e "{}"').format(query)
 
         output, retcode = self.mysql_sentry.run(cmd)
         u.log.debug('command: `{}` returned {}'.format(cmd, retcode))