Resync charmhelpers

Some previously applied changes to charm-helpers where lost
due to the way that changes get merged into the master branch.

Perform a fresh sync and restore lost changes.

Change-Id: Ib2370a50e2e1d8d51c7d8b7952ced0991edf33b8

charmhelpers/contrib/hahelpers/cluster.py

@@ -278,14 +278,14 @@ def get_hacluster_config(exclude_keys=None):
     for initiating a relation to hacluster:
 
         ha-bindiface, ha-mcastport, vip, os-internal-hostname,
-        os-admin-hostname, os-public-hostname
+        os-admin-hostname, os-public-hostname, os-access-hostname
 
     param: exclude_keys: list of setting key(s) to be excluded.
     returns: dict: A dict containing settings keyed by setting name.
     raises: HAIncompleteConfig if settings are missing or incorrect.
     '''
     settings = ['ha-bindiface', 'ha-mcastport', 'vip', 'os-internal-hostname',
-                'os-admin-hostname', 'os-public-hostname']
+                'os-admin-hostname', 'os-public-hostname', 'os-access-hostname']
     conf = {}
     for setting in settings:
         if exclude_keys and setting in exclude_keys:
@@ -322,7 +322,7 @@ def valid_hacluster_config():
     # If dns-ha then one of os-*-hostname must be set
     if dns:
         dns_settings = ['os-internal-hostname', 'os-admin-hostname',
-                        'os-public-hostname']
+                        'os-public-hostname', 'os-access-hostname']
         # At this point it is unknown if one or all of the possible
         # network spaces are in HA. Validate at least one is set which is
         # the minimum required.

charmhelpers/contrib/openstack/amulet/deployment.py

@@ -71,7 +71,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
         base_charms = {
             'mysql': ['precise', 'trusty'],
             'mongodb': ['precise', 'trusty'],
-            'nrpe': ['trusty'],
+            'nrpe': ['precise', 'trusty'],
         }
 
         for svc in other_services:

charmhelpers/contrib/openstack/ha/utils.py

@@ -34,6 +34,10 @@ from charmhelpers.core.hookenv import (
     DEBUG,
 )
 
+from charmhelpers.core.host import (
+    lsb_release
+)
+
 from charmhelpers.contrib.openstack.ip import (
     resolve_address,
 )
@@ -61,8 +65,11 @@ def update_dns_ha_resource_params(resources, resource_params,
                     DNS HA
     """
 
+    # Validate the charm environment for DNS HA
+    assert_charm_supports_dns_ha()
+
     settings = ['os-admin-hostname', 'os-internal-hostname',
-                'os-public-hostname']
+                'os-public-hostname', 'os-access-hostname']
 
     # Check which DNS settings are set and update dictionaries
     hostname_group = []
@@ -107,3 +114,15 @@ def update_dns_ha_resource_params(resources, resource_params,
         msg = 'DNS HA: Hostname group has no members.'
         status_set('blocked', msg)
         raise DNSHAException(msg)
+
+
+def assert_charm_supports_dns_ha():
+    """Validate prerequisites for DNS HA
+    The MAAS client is only available on Xenial or greater
+    """
+    if lsb_release().get('DISTRIB_RELEASE') < '16.04':
+        msg = ('DNS HA is only supported on 16.04 and greater '
+               'versions of Ubuntu.')
+        status_set('blocked', msg)
+        raise DNSHAException(msg)
+    return True

charmhelpers/core/hookenv.py

@@ -1004,4 +1004,4 @@ def network_get_primary_address(binding):
     :raise: NotImplementedError if run on Juju < 2.0
     '''
     cmd = ['network-get', '--primary-address', binding]
-    return subprocess.check_output(cmd).strip()
+    return subprocess.check_output(cmd).decode('UTF-8').strip()

tests/charmhelpers/contrib/openstack/amulet/deployment.py

@@ -71,7 +71,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
         base_charms = {
             'mysql': ['precise', 'trusty'],
             'mongodb': ['precise', 'trusty'],
-            'nrpe': ['trusty'],
+            'nrpe': ['precise', 'trusty'],
         }
 
         for svc in other_services: