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

[Liam Young]

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

charm_lint_check #2198 mysql for gnuoy mp291339
    LINT OK: passed

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

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

charm_unit_test #1772 mysql for gnuoy mp291339
    UNIT OK: passed

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

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

charm_amulet_test #687 mysql for gnuoy mp291339
    AMULET OK: passed

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

[James Page (james-page)]

review: Approve

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/3586/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/3534/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/3569/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/3621/

review: Needs Fixing (automated testing)

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-12-30 02:25:24 +0000
+++ hooks/config-changed	2016-04-08 08:08:11 +0000
@@ -6,6 +6,7 @@
 import re
 import hashlib
 import os
+import shutil
 import sys
 import platform
 import lib.utils as utils
@@ -111,7 +112,14 @@
     check_call(['add-apt-repository','-y','deb http://%s %s main' % (source, series)])
     check_call(['apt-get','update'])
 
-with open('/var/lib/mysql/mysql.passwd','r') as rpw:
+ROOT_PASSFILE = os.path.join('/root', 'mysql.passwd')
+VAR_PASSFILE = os.path.join('/var', 'lib', 'mysql', 'mysql.passwd')
+if os.path.isfile(ROOT_PASSFILE):
+    PASSFILE = ROOT_PASSFILE
+else:
+    PASSFILE = VAR_PASSFILE
+    
+with open(PASSFILE,'r') as rpw:
     root_pass = rpw.read()
 
 dconf = Popen(['debconf-set-selections'], stdin=PIPE)
@@ -124,6 +132,10 @@
     check_call(['apt-get','-y','remove'] + remove_pkgs)
 apt_install(package)
 
+# mysql.passwd was stored in /root till after pkg install due to Bug #1567778
+if os.path.isfile(ROOT_PASSFILE):
+    shutil.move(ROOT_PASSFILE, VAR_PASSFILE)
+
 # smart-calc stuff in the configs
 dataset_bytes = human_to_bytes(configs['dataset-size'])
 

=== modified file 'hooks/install.real'
--- hooks/install.real	2016-02-26 13:50:59 +0000
+++ hooks/install.real	2016-04-08 08:08:11 +0000
@@ -33,16 +33,16 @@
 
 apt_install(['debconf-utils', 'python-mysqldb', 'uuid', 'pwgen', 'dnsutils'])
 
-PASSFILE = os.path.join('/var', 'lib', 'mysql', 'mysql.passwd')
-if not os.path.isfile(PASSFILE):
-    dirname = os.path.dirname(PASSFILE)
+ROOT_PASSFILE = os.path.join('/root', 'mysql.passwd')
+if not os.path.isfile(ROOT_PASSFILE):
+    dirname = os.path.dirname(ROOT_PASSFILE)
     if not os.path.isdir(dirname):
         os.mkdir(dirname)
-    with open(PASSFILE, 'w'):
+    with open(ROOT_PASSFILE, 'w'):
         pass
 
-os.chmod(PASSFILE, 0600)
-with open(PASSFILE, 'a') as fd:
+os.chmod(ROOT_PASSFILE, 0600)
+with open(ROOT_PASSFILE, 'a') as fd:
     fd.seek(0, os.SEEK_END)
     if fd.tell() == 0:
         fd.seek(0)