Merge lp:~hopem/charms/trusty/percona-cluster/fix-peerstore-passwd-lp1451890-stable-backport into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/trunk

[Edward Hope-Morley]

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

charm_unit_test #4138 percona-cluster for hopem mp258416
    UNIT OK: passed

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

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

charm_lint_check #4413 percona-cluster for hopem mp258416
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/10998254/
Build: http://10.245.162.77:8080/job/charm_lint_check/4413/

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

charm_amulet_test #4012 percona-cluster for hopem mp258416
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10998257/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4012/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charm-helpers.yaml'
--- charm-helpers.yaml	2015-04-24 10:07:10 +0000
+++ charm-helpers.yaml	2015-05-06 17:02:00 +0000
@@ -1,4 +1,4 @@
-branch: lp:~openstack-charmers/charm-helpers/stable
+branch: lp:~hopem/charm-helpers/fix-peerstore-passwd-lp1451890-stable-backport
 destination: hooks/charmhelpers
 include:
     - core

=== modified file 'hooks/charmhelpers/contrib/charmsupport/nrpe.py'
--- hooks/charmhelpers/contrib/charmsupport/nrpe.py	2015-02-20 00:30:39 +0000
+++ hooks/charmhelpers/contrib/charmsupport/nrpe.py	2015-05-06 17:02:00 +0000
@@ -247,7 +247,9 @@
 
         service('restart', 'nagios-nrpe-server')
 
-        for rid in relation_ids("local-monitors"):
+        monitor_ids = relation_ids("local-monitors") + \
+            relation_ids("nrpe-external-master")
+        for rid in monitor_ids:
             relation_set(relation_id=rid, monitors=yaml.dump(monitors))
 
 

=== modified file 'hooks/charmhelpers/contrib/database/mysql.py'
--- hooks/charmhelpers/contrib/database/mysql.py	2015-04-21 09:29:08 +0000
+++ hooks/charmhelpers/contrib/database/mysql.py	2015-05-06 17:02:00 +0000
@@ -6,7 +6,7 @@
 import os
 import glob
 
-from string import upper
+# from string import upper
 
 from charmhelpers.core.host import (
     mkdir,
@@ -21,6 +21,7 @@
     log,
     DEBUG,
     INFO,
+    WARNING,
 )
 from charmhelpers.fetch import (
     apt_install,
@@ -142,12 +143,13 @@
                 log("Excluding %s from peer migration" % (f), level=DEBUG)
                 continue
 
-            _key = os.path.basename(f)
+            key = os.path.basename(f)
             with open(f, 'r') as passwd:
                 _value = passwd.read().strip()
 
             try:
-                peer_store(_key, _value)
+                peer_store(key, _value)
+
                 if self.delete_ondisk_passwd_file:
                     os.unlink(f)
             except ValueError:
@@ -185,19 +187,38 @@
 
         return _password
 
+    def passwd_keys(self, username):
+        """Generator to return keys used to store passwords in peer store.
+
+        NOTE: we support both legacy and new format to support mysql
+        charm prior to refactor. This is necessary to avoid LP 1451890.
+        """
+        keys = []
+        if username == 'mysql':
+            log("Bad username '%s'" % (username), level=WARNING)
+
+        if username:
+            # IMPORTANT: *newer* format must be returned first
+            keys.append('mysql-%s.passwd' % (username))
+            keys.append('%s.passwd' % (username))
+        else:
+            keys.append('mysql.passwd')
+
+        for key in keys:
+            yield key
+
     def get_mysql_password(self, username=None, password=None):
         """Retrieve, generate or store a mysql password for the provided
         username using peer relation cluster."""
         excludes = []
 
-        # First check peer relation
-        if username:
-            _key = 'mysql-{}.passwd'.format(username)
-        else:
-            _key = 'mysql.passwd'
-
+        # First check peer relation.
         try:
-            _password = peer_retrieve(_key)
+            for key in self.passwd_keys(username):
+                _password = peer_retrieve(key)
+                if _password:
+                    break
+
             # If root password available don't update peer relation from local
             if _password and not username:
                 excludes.append(self.root_passwd_file_template)
@@ -348,7 +369,7 @@
                 key, mem = line.split(':', 2)
                 if key == 'MemTotal':
                     mtot, modifier = mem.strip().split(' ')
-                    return '%s%s' % (mtot, upper(modifier[0]))
+                    return '%s%s' % (mtot, modifier[0].upper())
 
     def parse_config(self):
         """Parse charm configuration and calculate values for config files."""

=== modified file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	2015-02-04 18:56:00 +0000
+++ hooks/charmhelpers/core/hookenv.py	2015-05-06 17:02:00 +0000
@@ -20,11 +20,13 @@
 # Authors:
 #  Charm Helpers Developers <[e-mail]>
 
+from __future__ import print_function
 import os
 import json
 import yaml
 import subprocess
 import sys
+import errno
 from subprocess import CalledProcessError
 
 import six
@@ -87,7 +89,18 @@
     if not isinstance(message, six.string_types):
         message = repr(message)
     command += [message]
-    subprocess.call(command)
+    # Missing juju-log should not cause failures in unit tests
+    # Send log output to stderr
+    try:
+        subprocess.call(command)
+    except OSError as e:
+        if e.errno == errno.ENOENT:
+            if level:
+                message = "{}: {}".format(level, message)
+            message = "juju-log: {}".format(message)
+            print(message, file=sys.stderr)
+        else:
+            raise
 
 
 class Serializable(UserDict):
@@ -566,3 +579,29 @@
 def charm_dir():
     """Return the root directory of the current charm"""
     return os.environ.get('CHARM_DIR')
+
+
+@cached
+def action_get(key=None):
+    """Gets the value of an action parameter, or all key/value param pairs"""
+    cmd = ['action-get']
+    if key is not None:
+        cmd.append(key)
+    cmd.append('--format=json')
+    action_data = json.loads(subprocess.check_output(cmd).decode('UTF-8'))
+    return action_data
+
+
+def action_set(values):
+    """Sets the values to be returned after the action finishes"""
+    cmd = ['action-set']
+    for k, v in list(values.items()):
+        cmd.append('{}={}'.format(k, v))
+    subprocess.check_call(cmd)
+
+
+def action_fail(message):
+    """Sets the action status to failed and sets the error message.
+
+    The results set by action_set are preserved."""
+    subprocess.check_call(['action-fail', message])

=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2015-03-03 02:26:12 +0000
+++ hooks/charmhelpers/core/host.py	2015-05-06 17:02:00 +0000
@@ -339,12 +339,16 @@
 def pwgen(length=None):
     """Generate a random pasword."""
     if length is None:
+        # A random length is ok to use a weak PRNG
         length = random.choice(range(35, 45))
     alphanumeric_chars = [
         l for l in (string.ascii_letters + string.digits)
         if l not in 'l0QD1vAEIOUaeiou']
+    # Use a crypto-friendly PRNG (e.g. /dev/urandom) for making the
+    # actual password
+    random_generator = random.SystemRandom()
     random_chars = [
-        random.choice(alphanumeric_chars) for _ in range(length)]
+        random_generator.choice(alphanumeric_chars) for _ in range(length)]
     return(''.join(random_chars))
 
 

=== modified file 'hooks/charmhelpers/core/services/helpers.py'
--- hooks/charmhelpers/core/services/helpers.py	2015-03-03 02:26:12 +0000
+++ hooks/charmhelpers/core/services/helpers.py	2015-05-06 17:02:00 +0000
@@ -139,7 +139,7 @@
 
     def __init__(self, *args, **kwargs):
         self.required_keys = ['host', 'user', 'password', 'database']
-        super(HttpRelation).__init__(self, *args, **kwargs)
+        RelationContext.__init__(self, *args, **kwargs)
 
 
 class HttpRelation(RelationContext):
@@ -154,7 +154,7 @@
 
     def __init__(self, *args, **kwargs):
         self.required_keys = ['host', 'port']
-        super(HttpRelation).__init__(self, *args, **kwargs)
+        RelationContext.__init__(self, *args, **kwargs)
 
     def provide_data(self):
         return {

=== modified file 'hooks/charmhelpers/core/strutils.py'
--- hooks/charmhelpers/core/strutils.py	2015-02-25 17:29:36 +0000
+++ hooks/charmhelpers/core/strutils.py	2015-05-06 17:02:00 +0000
@@ -33,9 +33,9 @@
 
     value = value.strip().lower()
 
-    if value in ['y', 'yes', 'true', 't']:
+    if value in ['y', 'yes', 'true', 't', 'on']:
         return True
-    elif value in ['n', 'no', 'false', 'f']:
+    elif value in ['n', 'no', 'false', 'f', 'off']:
         return False
 
     msg = "Unable to interpret string value '%s' as boolean" % (value)

=== modified file 'hooks/charmhelpers/core/unitdata.py'
--- hooks/charmhelpers/core/unitdata.py	2015-02-25 17:29:36 +0000
+++ hooks/charmhelpers/core/unitdata.py	2015-05-06 17:02:00 +0000
@@ -443,7 +443,7 @@
         data = hookenv.execution_environment()
         self.conf = conf_delta = self.kv.delta(data['conf'], 'config')
         self.rels = rels_delta = self.kv.delta(data['rels'], 'rels')
-        self.kv.set('env', data['env'])
+        self.kv.set('env', dict(data['env']))
         self.kv.set('unit', data['unit'])
         self.kv.set('relid', data.get('relid'))
         return conf_delta, rels_delta

=== modified file 'tests/charmhelpers/contrib/amulet/utils.py'
--- tests/charmhelpers/contrib/amulet/utils.py	2015-04-15 14:23:37 +0000
+++ tests/charmhelpers/contrib/amulet/utils.py	2015-05-06 17:02:00 +0000
@@ -79,6 +79,9 @@
         for k, v in six.iteritems(commands):
             for cmd in v:
                 output, code = k.run(cmd)
+                self.log.debug('{} `{}` returned '
+                               '{}'.format(k.info['unit_name'],
+                                           cmd, code))
                 if code != 0:
                     return "command `{}` returned {}".format(cmd, str(code))
         return None
@@ -86,7 +89,11 @@
     def _get_config(self, unit, filename):
         """Get a ConfigParser object for parsing a unit's config file."""
         file_contents = unit.file_contents(filename)
-        config = ConfigParser.ConfigParser()
+
+        # NOTE(beisner):  by default, ConfigParser does not handle options
+        # with no value, such as the flags used in the mysql my.cnf file.
+        # https://bugs.python.org/issue7005
+        config = ConfigParser.ConfigParser(allow_no_value=True)
         config.readfp(io.StringIO(file_contents))
         return config
 

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-04-17 10:04:59 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-05-06 17:02:00 +0000
@@ -46,15 +46,22 @@
            stable or next branches for the other_services."""
         base_charms = ['mysql', 'mongodb']
 
+        if self.series in ['precise', 'trusty']:
+            base_series = self.series
+        else:
+            base_series = self.current_next
+
         if self.stable:
             for svc in other_services:
-                temp = 'lp:charms/{}'
-                svc['location'] = temp.format(svc['name'])
+                temp = 'lp:charms/{}/{}'
+                svc['location'] = temp.format(base_series,
+                                              svc['name'])
         else:
             for svc in other_services:
                 if svc['name'] in base_charms:
-                    temp = 'lp:charms/{}'
-                    svc['location'] = temp.format(svc['name'])
+                    temp = 'lp:charms/{}/{}'
+                    svc['location'] = temp.format(base_series,
+                                                  svc['name'])
                 else:
                     temp = 'lp:~openstack-charmers/charms/{}/{}/next'
                     svc['location'] = temp.format(self.current_next,
@@ -99,10 +106,12 @@
            Return an integer representing the enum value of the openstack
            release.
            """
+        # Must be ordered by OpenStack release (not by Ubuntu release):
         (self.precise_essex, self.precise_folsom, self.precise_grizzly,
          self.precise_havana, self.precise_icehouse,
-         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
-         self.utopic_juno, self.vivid_kilo) = range(10)
+         self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
+         self.trusty_kilo, self.vivid_kilo) = range(10)
+
         releases = {
             ('precise', None): self.precise_essex,
             ('precise', 'cloud:precise-folsom'): self.precise_folsom,