Merge lp:~mcs-chasal/ibmcharms/dnsfix into lp:ibmcharms

[Michael Chase-Salerno]

Added creation of /etc/hosts entries if hostnames are not resolving on the systems.

[Adalberto Medeiros (adalbas)]

There are a few comments regarding how the hostname and ip is being handled by the local unit and a few improvements.

Other than that, will you add that to peers relation as well? Is it necessary?

[Adalberto Medeiros (adalbas)]

review: Needs Fixing

[lp:~mcs-chasal/ibmcharms/dnsfix]

27. By Michael Chase-Salerno on 2015-03-03

Incorporating review comments and fixing startup

=== modified file 'charms/trusty/gpfs/hooks/common-relation-changed'
--- charms/trusty/gpfs/hooks/common-relation-changed	2015-02-10 12:24:34 +0000
+++ charms/trusty/gpfs/hooks/common-relation-changed	2015-03-03 17:58:00 +0000
@@ -15,38 +15,33 @@
 
 def main():
     hookname = hookenv.hook_name()
+    relid = hookenv.relation_id()
+    runit = hookenv.remote_unit()
+    unit = hookenv.local_unit()
+
+    # Get hosts in relationship and configure /etc/hosts if needed
+    rip = hookenv.relation_get(attribute='pip', unit=runit, rid=relid)
+    rlhn = hookenv.relation_get(attribute='lhostname', unit=runit, rid=relid)
+    llhn = socket.getfqdn()
+    if not rlhn is None:
+        gpfshooklib.chk_dns(rlhn,rip)
+
     if hookname == "client-relation-changed":
         # Save the keypair from the manager
         log("Copying keys to client")
-        relid = hookenv.relation_id()
-        unit = hookenv.remote_unit()
-        pubkey = hookenv.relation_get(attribute='pubkey', unit=unit, rid=relid)
-        privkey = hookenv.relation_get(attribute='privkey', unit=unit, rid=relid)
-        log("Public key config: %s" % pubkey)
+        pubkey = hookenv.relation_get(attribute='pubkey', unit=runit, rid=relid)
+        privkey = hookenv.relation_get(attribute='privkey', unit=runit, rid=relid)
         gpfshooklib.set_ssh_key(pubkey, private=False)
         gpfshooklib.set_ssh_key(privkey, private=True)
-        # start gpfs
-        # set the node to the manager
-        #call(split('mmstartup -a'))
-    if hookname == "manager-relation-changed":
+    if hookname == "manager-relation-changed" and not rlhn is None:
         log("Creating GPFS cluster")
-        relid = hookenv.relation_id()
-        runit = hookenv.remote_unit()
-        hostname = socket.gethostname()
-        gpfshooklib.create_cluster(hostname)
-        gpfshooklib.apply_license(hostname)
-        chostname = hookenv.relation_get(attribute='hostname',
-                                         unit=runit, rid=relid)
+        gpfshooklib.create_cluster(llhn)
+        gpfshooklib.apply_license(llhn)
         log("Adding remote client")
-        gpfshooklib.add_node(chostname)
-        gpfshooklib.apply_license(chostname)
-        # Create disk stanza
-        # Create nsd
-        # mmcrnsd -F stanza.txt
-        # create and mount fs
-        # mmcrfs gpfs1 -F stanza.txt -A yes -T /gpfs
-        # mmmount gpfs1 -a
-        # start gpfs
-        #call(split('mmstartup -a'))
+        gpfshooklib.add_node(rlhn)
+        gpfshooklib.apply_license(rlhn)
+        log("Starting cluster")
+        gpfshooklib.start()
+
 if __name__ == '__main__':
     main()

=== modified file 'charms/trusty/gpfs/hooks/common-relation-joined'
--- charms/trusty/gpfs/hooks/common-relation-joined	2015-02-09 11:42:31 +0000
+++ charms/trusty/gpfs/hooks/common-relation-joined	2015-03-03 17:58:00 +0000
@@ -17,9 +17,13 @@
 def main():
     hookname = hookenv.hook_name()
     hookenv.relation_set(hookenv.relation_id(), {
-        'hostname': socket.gethostname()
+        'lhostname': socket.getfqdn(),
+        'pip': hookenv.unit_private_ip()
     })
+
     if hookname == "manager-relation-joined":
+        # Denote this as a manager
+        gpfshooklib.set_manager_file()
         # Generate ssh keys if needed
         gpfshooklib.create_ssh_keys()
         privkey, pubkey = gpfshooklib.get_ssh_keys()
@@ -31,7 +35,6 @@
     if hookname == "client-relation-joined":
         # Set the node designation values and hostname
         hookenv.relation_set(hookenv.relation_id(), {
-            'hostname': socket.gethostname(),
             'quorum': 'quorum',
             'client': 'client'
         })    

=== modified file 'charms/trusty/gpfs/hooks/gpfshooklib.py'
--- charms/trusty/gpfs/hooks/gpfshooklib.py	2015-02-19 12:46:34 +0000
+++ charms/trusty/gpfs/hooks/gpfshooklib.py	2015-03-03 17:58:00 +0000
@@ -5,6 +5,7 @@
 import sys
 import shutil
 import tempfile
+import socket
 from shlex import split
 from subprocess import (
     call,
@@ -134,6 +135,16 @@
        
 def create_cluster(hostname):
     # create the cluster for the hostname, manager only
-    if not is_manager() and not cluster_exists():
+    if is_manager() and not cluster_exists():
         log(check_output(split('mmcrcluster -N %s:quorum-manager' % \
                     hostname + ' -r /usr/bin/ssh -R /usr/bin/scp')))
+
+def chk_dns(hostname, ip):
+    try:
+        socket.gethostbyname(hostname)
+    except:
+        log("Hostname not resolving, adding to /etc/hosts")
+        with open("/etc/hosts", "a") as hostfile:
+            hostfile.write("%s %s\n" % (ip, hostname) )
+            hostfile.close()
+