Merge lp:~opnfv-team/charms/trusty/percona-cluster/power8 into lp:~openstack-charmers/charms/trusty/percona-cluster/next

[Narinder Gupta]

[Narinder Gupta (narindergupta)]

this merge proposal is from IBM where percona-cluster charm was failing to install on power8 system. It seems there was no root-password was set during install and even config option did not help. But after doing this modification we are able to install this on Power8 system.

[James Page (james-page)]

Hi Narinder

percona-cluster charm development moved under the openstack project last week; please take a read of https://github.com/openstack-charmers/openstack-community/blob/master/README.dev-charms.md and re-submit your change in the new location.

Thanks!

Unmerged revisions

90. By Narinder Gupta on 2016-03-10

modified to include the power8 changes.

89. By Jill Rouleau on 2016-03-04

Add backup action

Add a new action to backup the pxc database on a unit.

Backups by default are stored in /opt/backups/mysql and can
optionally be compressed and done as incremental backups.

Change-Id: I5c6ab9fd8be7cb6cdb2a26e849ec0b22d8d4f9a6

88. By James Page on 2016-03-02

Add tox support for check/gate

This charm was missed pre-migration to git/gerrit.

Add support for executing pep8 and unit tests using tox.

Change-Id: I5518e870c572ccc292d6fe4e9b7c910c7f3f0260

87. By uosci-testing-bot on 2016-02-29

Adapt imports and metadata for github move

86. By James Page on 2016-02-24

Add gitreview prior to migration to openstack

85. By Liam Young on 2016-01-20

[thedac, r=gnuoy] Charm helpers sync. Make the service_running status check cover percona-cluster's unique status message.

84. By David Ames on 2016-01-15

[jamespage, r=thedac] Fix Bug:1481362 Make datadir dynamic depending on ubuntu version

83. By Liam Young on 2016-01-12

Update test combo definitions, remove Vivid deprecated release tests, update bundletester testplan yaml, update tests README.

82. By Liam Young on 2015-12-01

[hopem, r=gnuoy]
Improve shared-db rel logging and tidy get_db_host
Closes-Bug: 1512293

81. By James Page on 2015-11-18

Update maintainer

=== modified file 'charmhelpers/contrib/database/mysql.py'
--- charmhelpers/contrib/database/mysql.py	2015-09-18 13:38:56 +0000
+++ charmhelpers/contrib/database/mysql.py	2016-03-10 22:58:16 +0000
@@ -58,8 +58,11 @@
 
     def connect(self, user='root', password=None):
         log("Opening db connection for %s@%s" % (user, self.host), level=DEBUG)
-        self.connection = MySQLdb.connect(user=user, host=self.host,
-                                          passwd=password)
+        if password==None:
+            self.connection = MySQLdb.connect(user=user, host=self.host)
+        else:
+            self.connection = MySQLdb.connect(user=user, host=self.host,
+                                              passwd=password)
 
     def database_exists(self, db_name):
         cursor = self.connection.cursor()

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2016-01-15 00:04:57 +0000
+++ hooks/percona_hooks.py	2016-03-10 22:58:16 +0000
@@ -49,6 +49,7 @@
     get_host_ip,
     get_cluster_hosts,
     configure_sstuser,
+    configure_rootpw,
     configure_mysql_root_password,
     relation_clear,
     assert_charm_supports_ipv6,
@@ -109,6 +110,7 @@
     render_config()
     apt_update(fatal=True)
     apt_install(determine_packages(), fatal=True)
+    configure_rootpw(config('root-password'))
     configure_sstuser(config('sst-password'))
 
 

=== modified file 'hooks/percona_utils.py'
--- hooks/percona_utils.py	2016-01-15 00:04:57 +0000
+++ hooks/percona_utils.py	2016-03-10 22:58:16 +0000
@@ -180,6 +180,7 @@
                            "ON *.* TO 'sstuser'@'ip6-localhost' IDENTIFIED "
                            "BY '{}'")
 
+SQL_SET_ROOTPW = ("UPDATE mysql.user SET Password=PASSWORD('{}') WHERE User='root'")
 
 def get_db_helper():
     return MySQLHelper(rpasswdf_template='/var/lib/charm/%s/mysql.passwd' %
@@ -194,6 +195,11 @@
     m_helper.execute(SQL_SST_USER_SETUP.format(sst_password))
     m_helper.execute(SQL_SST_USER_SETUP_IPV6.format(sst_password))
 
+def configure_rootpw(password):
+    m_helper = get_db_helper()
+    m_helper.connect()
+    m_helper.execute(SQL_SET_ROOTPW.format(password))
+    m_helper.execute("FLUSH PRIVILEGES")
 
 # TODO: mysql charmhelper
 def configure_mysql_root_password(password):