Merge lp:~adalbas/ibmcharms/departed into lp:ibmcharms

[Adalberto Medeiros]

Add departed hooks for manager-client relation

This removes the client node from the cluster.

Add departed hooks for manager-client relation

This removes the client node from the cluster.

[Michael Chase-Salerno (mcs-chasal)]

Unresolved merge conflict included

review: Needs Fixing

[lp:~adalbas/ibmcharms/departed]

27. By Adalberto Medeiros on 2015-03-10

merge with parent branch

[Michael Chase-Salerno (mcs-chasal)]

review: Approve

Unmerged revisions

27. By Adalberto Medeiros on 2015-03-10

merge with parent branch

26. By Adalberto Medeiros on 2015-03-07

merget to main branch

25. By Adalberto Medeiros on 2015-03-07

small fixes for departed hook

24. By Adalberto Medeiros on 2015-03-06

Add relation-departed hooks

=== added symlink 'charms/trusty/gpfs/hooks/client-relation-departed'
=== target is u'common-relation-departed'
=== added file 'charms/trusty/gpfs/hooks/common-relation-departed'
--- charms/trusty/gpfs/hooks/common-relation-departed	1970-01-01 00:00:00 +0000
+++ charms/trusty/gpfs/hooks/common-relation-departed	2015-03-10 18:29:38 +0000
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+
+import os
+import sys
+import socket
+
+sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
+
+import gpfshooklib
+from charmhelpers.core import (
+    hookenv,
+)
+
+log = hookenv.log
+hooks = hookenv.Hooks()
+
+
[e-mail]('manager-relation-departed')
+def manager_departed():
+    runit = hookenv.remote_unit()
+    relid = hookenv.relation_id()
+    nodename = hookenv.relation_get(attribute='lhostname', unit=runit,
+                                    rid=relid)
+    gpfshooklib.delete_node(nodename)
+
+
[e-mail]('client-relation-departed')
+def client_departed():
+    # Nothing to do, only the manager removes the node from the cluster
+    pass
+    
+
+if __name__ == '__main__':
+    hooks.execute(sys.argv)

=== modified file 'charms/trusty/gpfs/hooks/gpfshooklib.py'
--- charms/trusty/gpfs/hooks/gpfshooklib.py	2015-03-09 15:25:51 +0000
+++ charms/trusty/gpfs/hooks/gpfshooklib.py	2015-03-10 18:29:38 +0000
@@ -191,6 +191,12 @@
         log('Node %s could not be added. Manager not defined' % nodename)
 
 
+def delete_node(nodename):
+    if node_exists(nodename):
+        log('Trying to delete node %s:' % nodename) 
+        log(check_output(split('mmdelnode -N %s' % nodename)))
+
+
 def apply_license(nodename):
     check_output(split('mmchlicense server --accept -N %s' % nodename))
 

=== added symlink 'charms/trusty/gpfs/hooks/manager-relation-departed'
=== target is u'common-relation-departed'