Merge lp:~adalbas/ibmcharms/gpfs-config into lp:ibmcharms

[Adalberto Medeiros]

Add install to gpfshooklib.py
Add config-changed. Installation is done here if gpfs_url was not set before.
Add unit test. Still not fully tested

[Michael Chase-Salerno (mcs-chasal)]

Looks good to me.

review: Approve

[lp:~adalbas/ibmcharms/gpfs-config]

27. By Adalberto Medeiros on 2015-03-09

Changes on installation for config-changed

28. By Adalberto Medeiros on 2015-03-09

Merge with dnsfixes

29. By Adalberto Medeiros on 2015-03-09

Fix pep8

30. By Adalberto Medeiros on 2015-03-09

merge tests

=== modified file 'charms/trusty/gpfs/README.md'
--- charms/trusty/gpfs/README.md	2015-01-27 12:40:23 +0000
+++ charms/trusty/gpfs/README.md	2015-03-09 15:35:58 +0000
@@ -30,13 +30,17 @@
 Configure config.yaml with the repository url
 
     gpfs_url: "http://<server-name>/debs/gpfs4.1"
- **Packages.gz should be on the same directory as the packages. The install hook will add Linux/x86_64 to the URL
+ **Packages.gz should be on the same directory as the packages. The install hook will add Linux/x86_64 to the URL**
 
+You can also set gpfs_url with "juju set" after deploy the charm
 ## Deploy
 
     juju deploy gpfs gpfs-manager
     juju deploy gpfs gpfs-client
 
+    # If gpfs_url is not set
+    juju set gpfs-manager gpfs_url="http://<server-name>/debs/gpfs4.1"
+
     juju add relation gpfs-manager:manager gpfs-client:client
 
 # Configuration
 
=== modified file 'charms/trusty/gpfs/config.yaml'
--- charms/trusty/gpfs/config.yaml	2015-01-27 12:19:54 +0000
+++ charms/trusty/gpfs/config.yaml	2015-03-09 15:35:58 +0000
@@ -11,3 +11,9 @@
     type: string
     default: "4.1"
     description: "Version of GPFS"
+  quorum:
+    type: string
+    default: "quorum"
+    description: >
+        Designation for nodes. Values can be quorum,
+        non-quorum or empty string (this assumes non-quorum)
 
=== modified file 'charms/trusty/gpfs/hooks/common-relation-changed'
--- charms/trusty/gpfs/hooks/common-relation-changed	2015-03-03 17:57:57 +0000
+++ charms/trusty/gpfs/hooks/common-relation-changed	2015-03-09 15:35:58 +0000
@@ -24,13 +24,15 @@
     rlhn = hookenv.relation_get(attribute='lhostname', unit=runit, rid=relid)
     llhn = socket.getfqdn()
     if not rlhn is None:
-        gpfshooklib.chk_dns(rlhn,rip)
+        gpfshooklib.chk_dns(rlhn, rip)
 
     if hookname == "client-relation-changed":
         # Save the keypair from the manager
         log("Copying keys to client")
-        pubkey = hookenv.relation_get(attribute='pubkey', unit=runit, rid=relid)
-        privkey = hookenv.relation_get(attribute='privkey', unit=runit, rid=relid)
+        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)
     if hookname == "manager-relation-changed" and not rlhn is None:
 
=== modified file 'charms/trusty/gpfs/hooks/common-relation-joined'
--- charms/trusty/gpfs/hooks/common-relation-joined	2015-03-03 17:57:57 +0000
+++ charms/trusty/gpfs/hooks/common-relation-joined	2015-03-09 15:35:58 +0000
@@ -12,6 +12,7 @@
 )
 
 log = hookenv.log
+config = hookenv.config()
 
 
 def main():
@@ -34,11 +35,13 @@
         })
     if hookname == "client-relation-joined":
         # Set the node designation values and hostname
+        quorum = gpfshooklib.validate_quorum(config.get('quorum'))
         hookenv.relation_set(hookenv.relation_id(), {
-            'quorum': 'quorum',
+            'hostname': socket.gethostname(),
+            'quorum': quorum,
             'client': 'client'
-        })    
-        
+        })
+
     # Configure sshd to allow root ssh
     # Avoid the host key confirmation (all relation-joined)
     gpfshooklib.configure_ssh()
 
=== modified file 'charms/trusty/gpfs/hooks/config-changed'
--- charms/trusty/gpfs/hooks/config-changed	2015-01-21 19:48:09 +0000
+++ charms/trusty/gpfs/hooks/config-changed	2015-03-09 15:35:58 +0000
@@ -9,8 +9,7 @@
     hookenv,
     host,
 )
-
-#from start import start
+import gpfshooklib
 
 hooks = hookenv.Hooks()
 log = hookenv.log
@@ -22,15 +21,49 @@
 def config_changed():
     config = hookenv.config()
 
+    install_bool = False
     for key in config:
         if config.changed(key):
             log("config['{}'] changed from {} to {}".format(
                 key, config.previous(key), config[key]))
+            if key in ['gpfs_url', 'version', 'update']:
+                install_bool = True
+
+    # If installation configuration has changed, reinstall gpfs
+    log("Installation: %s" % install_bool)
+    gpfs_url = config['gpfs_url']
+    version = config['version']
+    update = config['update']
+
+    # exit if there is no source
+    gpfshooklib.check_empty_source(gpfs_url)
+    # If source changed, install packages from new source
+    if install_bool:
+        install_gpfs(gpfs_url, version, update)
+
+    # if quorum changed, change node designation
+    if config.changed('quorum'):
+        unit = hookenv.local_unit()
+        quorum = config.get('quorum')
+        change_node_designation(unit, quorum)
 
     config.save()
     #start.start()
 
 
+def install_gpfs(gpfs_url, version, update):
+    # install gpfs
+
+    gpfshooklib.gpfs_install(gpfs_url, version)
+    gpfshooklib.gpfs_install_updates(gpfs_url, version, update)
+    gpfshooklib.build_modules()
+
+
+def change_node_designation(unit, quorum='quorum'):
+    # TODO, change unit designation to quorum or non-quorum
+    pass
+
+
 if __name__ == "__main__":
     # execute a hook based on the name the program is called by
     hooks.execute(sys.argv)
 
=== modified file 'charms/trusty/gpfs/hooks/gpfshooklib.py'
--- charms/trusty/gpfs/hooks/gpfshooklib.py	2015-03-03 17:57:57 +0000
+++ charms/trusty/gpfs/hooks/gpfshooklib.py	2015-03-09 15:35:58 +0000
@@ -7,24 +7,75 @@
 import tempfile
 import socket
 from shlex import split
+import subprocess
 from subprocess import (
     call,
     check_call,
-    check_output
+    check_output,
+    Popen,
+    CalledProcessError
 )
 
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
 
+from charmhelpers import fetch
 from charmhelpers.core import (
     hookenv,
 )
 log = hookenv.log
 
+GPFS_PATH = '/Linux/x86_64'
+
+
 def add_to_path(p, new):
     return p if new in p.split(':') else p + ':' + new
 
 os.environ['PATH'] = add_to_path(os.environ['PATH'], '/usr/lpp/mmfs/bin')
 
+
+## installation methods ##
+def _get_source(url, source_dir=""):
+    return "deb %s%s ./" % (url, source_dir)
+
+
+def check_empty_source(gpfs_url):
+    # Check if there is a repository to install from
+    # TODO: check if packages are already installed
+    if not gpfs_url:
+        log("No GPFS source available. Use juju set gpfs gpfs_url=<url> "
+            "to install packages. See README for more info.", log.ERROR)
+        sys.exit(0)
+
+
+def gpfs_install(url, version):
+    # install main gpfs packages
+    gpfs_source = _get_source(url, source_dir=GPFS_PATH)
+    log('Gpfs source' + gpfs_source)
+
+    # Add gpfs source and update apt
+    fetch.add_source(gpfs_source)
+    try:
+        fetch.apt_update(fatal=True)
+        # Install gpfs packages
+        fetch.apt_install("gpfs*", options=["--allow-unauthenticated"],
+                          fatal=True)
+    except CalledProcessError:
+        #TODO: verify source was configured correctly
+        raise
+
+
+def gpfs_install_updates(url, version, update=True):
+    # install update packages (patches), if given
+    if update:
+        log('Applying patches')
+        source_dir = '/gpfs' + version + '_patches' + GPFS_PATH
+        patch_source = _get_source(url, source_dir=source_dir)
+        fetch.add_source(patch_source)
+        fetch.apt_update(fatal=True)
+        fetch.apt_install("gpfs*", options=["--allow-unauthenticated"],
+                          fatal=True)
+
+
 ## ssh key methods ##
 def create_ssh_keys():
     # Generate ssh keys if needed
@@ -34,7 +85,8 @@
         # Ensure permissions are good
         os.chmod('/root/.ssh/id_rsa.pub', 0600)
         os.chmod('/root/.ssh/id_rsa', 0600)
-   
+
+
 def get_ssh_keys():
     # get public and private ssh keys
     with open("/root/.ssh/id_rsa.pub", "r") as idfile:
@@ -48,9 +100,10 @@
         idfile.close()
     return [privkey, pubkey]
 
+
 def set_ssh_key(key, private=False):
     if key:
-        if private == False:
+        if private is False:
             f = open("/root/.ssh/id_rsa.pub", "w")
             f.write(key)
             f.close()
@@ -65,6 +118,7 @@
             f.close()
             os.chmod('/root/.ssh/id_rsa', 0600)
 
+
 def configure_ssh():
     # Configure sshd_config file to allow root
     sshconf = open("/etc/ssh/sshd_config", 'r')
@@ -91,53 +145,78 @@
         idfile.write("StrictHostKeyChecking no\n")
         idfile.close()
 
+
+## Other utility methods##
+def validate_quorum(quorum):
+    valid_values = ['', 'quorum', 'non-quorum']
+    return quorum if quorum in valid_values else ''
+
+
 ## cluster management methods ##
+def build_modules():
+# build binary gpfs modules after installation
+    try:
+        check_call(["mmbuildgpl"])
+    except CalledProcessError:
+        log('mmbuildgpl was not executed', level=hookenv.WARNING)
+    except OSError:
+        log('mmbuildgpl not found/installed')
+
 
 def start():
     # Only manager can start/stop cluster
     if is_manager():
         log(check_output(split('mmstartup -a')))
 
+
 def stop():
     # stop the server
     if is_manager():
         check_output(split('mmshutdown -a'))
 
+
 def node_exists(nodename):
     # Check if node has already been added to cluster
     lscluster = check_output('mmlscluster')
     node = re.search('^.*\d+.*%s.*\n' % nodename, lscluster, re.M)
     return False if node is None else True
 
+
 def add_node(nodename, m_designation='client', q_designation='nonquorum'):
     # add new node to the cluster
     if cluster_exists() and not node_exists(nodename):
-        log(check_output(split('mmaddnode -N %s:%s-%s' % \
-                    (nodename, m_designation, q_designation))))
+        log(check_output(split('mmaddnode -N %s:%s-%s' %
+                         (nodename, m_designation, q_designation))))
     else:
         log('Node %s could not be added. Manager not defined' % nodename)
-  
+
+
 def apply_license(nodename):
     check_output(split('mmchlicense server --accept -N %s' % nodename))
 
+
 def set_manager_file():
     # define a file that indicates the node is a manager
-    open("/var/mmfs/.manager","a").close()
+    open("/var/mmfs/.manager", "a").close()
+
 
 def is_manager():
     # check if the node is a manager
     if os.path.exists("/var/mmfs/.manager"):
         return True
 
+
 def cluster_exists():
     # Check if cluster is already defined
     return True if call('mmlscluster') == 0 else False
-       
+
+
 def create_cluster(hostname):
     # create the cluster for the hostname, manager only
     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')))
+        log(check_output(split('mmcrcluster -N %s:quorum-manager' %
+                         hostname + ' -r /usr/bin/ssh -R /usr/bin/scp')))
+
 
 def chk_dns(hostname, ip):
     try:
@@ -145,6 +224,5 @@
     except:
         log("Hostname not resolving, adding to /etc/hosts")
         with open("/etc/hosts", "a") as hostfile:
-            hostfile.write("%s %s\n" % (ip, hostname) )
+            hostfile.write("%s %s\n" % (ip, hostname))
             hostfile.close()
-
 
=== modified file 'charms/trusty/gpfs/hooks/install'
--- charms/trusty/gpfs/hooks/install	2015-02-09 11:42:31 +0000
+++ charms/trusty/gpfs/hooks/install	2015-03-09 15:35:58 +0000
@@ -11,66 +11,42 @@
     hookenv,
 )
 
+import gpfshooklib
+
 hooks = hookenv.Hooks()
 log = hookenv.log
 config = hookenv.config()
 
-SERVICE = 'gpfs'
-
+# development packages needed to build kernel modules for GPFS cluster
 PREREQS = ["ksh", "binutils", "m4", "libaio1", "g++", "cpp", "make", "gcc"]
-# TODO: gpfs.msg.en_us - change it to any language
-GPFS_PKGS = ["gpfs.base", "gpfs.crypto", "gpfs.docs", "gpfs.ext",
-            "gpfs.gpl", "gpfs.gski", "gpfs.msg.en_us"]
-GPFS_PATH = '/Linux/x86_64'
+
 
 @hooks.hook('install')
 def install():
     log('Installing gpfs')
 
     # Things that need to happen here
-    # Fetch GPFS packages from user given location?
     gpfs_url = config.get('gpfs_url')
     version = config.get('version')
     update = config.get('update')   # boolean value whether to apply patches
 
-    gpfs_source = get_source(gpfs_url, source_dir=GPFS_PATH)  
-    log('Gpfs source' + gpfs_source)
-
-    # Add gpfs source and update apt
-    fetch.add_source(gpfs_source)
-    fetch.apt_update()
-    # Apt install prereqs
-    fetch.apt_install(PREREQS)
-    # install kernel prereq
+    # install kernel prereq and other prereqs
     linux_headers = "linux-headers-%s" % get_kernel_version()
-    fetch.apt_install(linux_headers)   
-
-    # Install gpfs packages
-    fetch.apt_install("gpfs*", options=["--allow-unauthenticated"])
-
-    # Apply patch packages
-    if update:
-        log('Applying patches')
-        source_dir = '/gpfs' + version + '_patches' + GPFS_PATH
-        patch_source = get_source(gpfs_url, source_dir=source_dir)
-        fetch.add_source(patch_source)
-        fetch.apt_update()
-        fetch.apt_install("gpfs*", options=["--allow-unauthenticated"])
-
-    # Build binary modules
-    os.environ['PATH'] += (':/usr/lpp/mmfs/bin')
-    try:
-        subprocess.check_call(["mmbuildgpl"])
-    except subprocess.CalledProcessError:
-        log('mmbuildgpl was not executed', level=hookenv.WARNING)
-    except OSError:
-        log('mmbuildgpl not found/installed')
-
-def get_source(url, source_dir=""):
-    return "deb %s%s ./" % (url,source_dir)
+    fetch.apt_install(PREREQS + [linux_headers])
+
+    if gpfs_url == "":
+        log("""No GPFS source packages. Use juju set gpfs gpfs_url=<url>
+               to install packages. See README for more info""",
+            level=hookenv.ERROR)
+        sys.exit(0)
+
+    gpfshooklib.gpfs_install(gpfs_url, version)
+    gpfshooklib.gpfs_install_updates(gpfs_url, version, update)
+    gpfshooklib.build_modules()
+
 
 def get_kernel_version():
-    return subprocess.check_output(['uname','-r']).strip()
+    return subprocess.check_output(['uname', '-r']).strip()
 
 if __name__ == "__main__":
     # execute a hook based on the name the program is called by
 
=== modified file 'charms/trusty/gpfs/hooks/start'
--- charms/trusty/gpfs/hooks/start	2015-02-10 02:11:55 +0000
+++ charms/trusty/gpfs/hooks/start	2015-03-09 15:35:58 +0000
@@ -15,6 +15,7 @@
 hooks = hookenv.Hooks()
 log = hookenv.log
 
+
 @hooks.hook('start')
 def start():
     log("Starting cluster (manager only)")
 
=== modified file 'charms/trusty/gpfs/hooks/stop'
--- charms/trusty/gpfs/hooks/stop	2015-02-10 02:11:55 +0000
+++ charms/trusty/gpfs/hooks/stop	2015-03-09 15:35:58 +0000
@@ -14,6 +14,7 @@
 hooks = hookenv.Hooks()
 log = hookenv.log
 
+
 @hooks.hook('stop')
 def stop():
     gpfshooklib.stop()
 
=== modified file 'charms/trusty/gpfs/tests/10-deploy'
--- charms/trusty/gpfs/tests/10-deploy	2015-03-09 15:24:07 +0000
+++ charms/trusty/gpfs/tests/10-deploy	2015-03-09 15:35:58 +0000
@@ -25,7 +25,6 @@
 
 unit_manager_0 = d.sentry.unit['gpfs/0']
 unit_client_0 = d.sentry.unit['gpfs-client/0']
-
 print(unit_manager_0.info)
 
 # verify unit_manager is manager