Merge lp:~thedac/charms/trusty/hacluster/workload-status into lp:~openstack-charmers/charms/trusty/hacluster/next

[David Ames]

Workload Status

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

charm_lint_check #11546 hacluster-next for thedac mp273889
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11546/

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

charm_unit_test #10738 hacluster-next for thedac mp273889
    UNIT OK: passed

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

[Corey Bryant (corey.bryant)]

This looks good to me but I'm going to defer to someone with more hacluster expertise to take a look and land it.

review: Approve

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

charm_amulet_test #7247 hacluster-next for thedac mp273889
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7247/

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-06-03 12:18:49 +0000
+++ hooks/hooks.py	2015-10-08 17:53:13 +0000
@@ -22,6 +22,7 @@
     Hooks,
     UnregisteredHookError,
     local_unit,
+    status_set,
 )
 
 from charmhelpers.core.host import (
@@ -84,6 +85,7 @@
 def install():
     # NOTE(dosaboy): we currently disallow upgrades due to bug #1382842. This
     # should be removed once the pacemaker package is fixed.
+    status_set('maintenance', 'Installing apt packages')
     apt_install(filter_installed_packages(PACKAGES), fatal=True)
     # NOTE(adam_g) rbd OCF only included with newer versions of
     # ceph-resource-agents. Bundle /w charm until we figure out a
@@ -99,6 +101,7 @@
     if val not in ['udp', 'udpu']:
         msg = ("Unsupported corosync_transport type '%s' - supported "
                "types are: %s" % (transport, ', '.join(SUPPORTED_TRANSPORTS)))
+        status_set('blocked', msg)
         raise ValueError(msg)
     return val
 
@@ -122,7 +125,9 @@
 
     corosync_key = config('corosync_key')
     if not corosync_key:
-        raise Exception('No Corosync key supplied, cannot proceed')
+        message = 'No Corosync key supplied, cannot proceed'
+        status_set('blocked', message)
+        raise Exception(message)
 
     enable_lsb_services('pacemaker')
 
@@ -130,6 +135,7 @@
         for rid in relation_ids('hanode'):
             ensure_ipv6_requirements(rid)
 
+    status_set('maintenance', "Setting up corosync")
     if configure_corosync():
         pcmk.wait_for_pcmk()
         configure_cluster_global()
@@ -400,8 +406,22 @@
     nrpe_setup.write()
 
 
+def assess_status():
+    '''Assess status of current unit'''
+    node_count = int(config('cluster_count'))
+    # not enough peers
+    for relid in relation_ids('hanode'):
+        if len(related_units(relid)) + 1 < node_count:
+            status_set('blocked', 'Insufficient peer units for ha cluster '
+                                  '(require {})'.format(node_count))
+            return
+
+    status_set('active', 'Unit is ready and clustered')
+
+
 if __name__ == '__main__':
     try:
         hooks.execute(sys.argv)
     except UnregisteredHookError as e:
         log('Unknown hook {} - skipping.'.format(e), level=DEBUG)
+    assess_status()

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2015-09-04 00:30:23 +0000
+++ hooks/utils.py	2015-10-08 17:53:13 +0000
@@ -21,6 +21,7 @@
     relation_ids,
     config,
     unit_get,
+    status_set,
 )
 from charmhelpers.contrib.openstack.utils import get_host_ip
 from charmhelpers.core.host import (
@@ -149,9 +150,13 @@
                 return str(IPNetwork(network).network)
 
     except ValueError:
-        raise Exception("Invalid interface '%s'" % iface)
+        msg = "Invalid interface '%s'" % iface
+        status_set('blocked', msg)
+        raise Exception(msg)
 
-    raise Exception("No valid network found for interface '%s'" % iface)
+    msg = "No valid network found for interface '%s'" % iface
+    status_set('blocked', msg)
+    raise Exception(msg)
 
 
 def get_corosync_id(unit_name):
@@ -276,8 +281,10 @@
 def assert_charm_supports_ipv6():
     """Check whether we are able to support charms ipv6."""
     if lsb_release()['DISTRIB_CODENAME'].lower() < "trusty":
-        raise Exception("IPv6 is not supported in the charms for Ubuntu "
-                        "versions less than Trusty 14.04")
+        msg = "IPv6 is not supported in the charms for Ubuntu " \
+              "versions less than Trusty 14.04"
+        status_set('blocked', msg)
+        raise Exception(msg)
 
 
 def get_transport():
@@ -287,6 +294,7 @@
     if val not in ['udp', 'udpu']:
         msg = ("Unsupported corosync_transport type '%s' - supported "
                "types are: %s" % (transport, ', '.join(SUPPORTED_TRANSPORTS)))
+        status_set('blocked', msg)
         raise ValueError(msg)
 
     return val
@@ -378,20 +386,26 @@
         url = config('maas_url')
         creds = config('maas_credentials')
         if None in [url, creds]:
-            raise Exception('maas_url and maas_credentials must be set '
-                            'in config to enable STONITH.')
+            msg = 'maas_url and maas_credentials must be set ' \
+                  'in config to enable STONITH.'
+            status_set('blocked', msg)
+            raise Exception(msg)
 
         nodes = maas.MAASHelper(url, creds).list_nodes()
         if not nodes:
-            raise Exception('Could not obtain node inventory from '
-                            'MAAS @ %s.' % url)
+            msg = 'Could not obtain node inventory from ' \
+                  'MAAS @ %s.' % url
+            status_set('blocked', msg)
+            raise Exception(msg)
 
         cluster_nodes = pcmk.list_nodes()
         for node in cluster_nodes:
             rsc, constraint = pcmk.maas_stonith_primitive(nodes, node)
             if not rsc:
-                raise Exception('Failed to determine STONITH primitive for '
-                                'node %s' % node)
+                msg = 'Failed to determine STONITH primitive for ' \
+                      'node %s' % node
+                status_set('blocked', msg)
+                raise Exception(msg)
 
             rsc_name = str(rsc).split(' ')[1]
             if not pcmk.is_resource_present(rsc_name):