Merge lp:~moon127/charms/precise/mongodb/add-execd-for-basenode into lp:charms/mongodb

[Gareth Woolridge]

Add exec.d charm preinstall support from charmhelpers for basenode.

[Tom Haddon (mthaddon)]

Looks good and works in my test environment. Will merge.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-07-10 18:38:27 +0000
+++ .bzrignore	2014-08-21 15:23:35 +0000
@@ -1,3 +1,4 @@
 .git
 bin/*
 scripts/charm-helpers-sync.py
+exec.d/*
 
=== modified file 'charm-helpers-sync.yaml'
--- charm-helpers-sync.yaml	2014-04-11 20:55:42 +0000
+++ charm-helpers-sync.yaml	2014-08-21 15:23:35 +0000
@@ -3,3 +3,4 @@
 include:
     - core
     - fetch
+    - payload.execd
 
=== added directory 'exec.d'
=== added directory 'hooks/charmhelpers/payload'
=== added file 'hooks/charmhelpers/payload/__init__.py'
--- hooks/charmhelpers/payload/__init__.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/payload/__init__.py	2014-08-21 15:23:35 +0000
@@ -0,0 +1,1 @@
+"Tools for working with files injected into a charm just before deployment."
 
=== added file 'hooks/charmhelpers/payload/execd.py'
--- hooks/charmhelpers/payload/execd.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/payload/execd.py	2014-08-21 15:23:35 +0000
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import subprocess
+from charmhelpers.core import hookenv
+
+
+def default_execd_dir():
+    return os.path.join(os.environ['CHARM_DIR'], 'exec.d')
+
+
+def execd_module_paths(execd_dir=None):
+    """Generate a list of full paths to modules within execd_dir."""
+    if not execd_dir:
+        execd_dir = default_execd_dir()
+
+    if not os.path.exists(execd_dir):
+        return
+
+    for subpath in os.listdir(execd_dir):
+        module = os.path.join(execd_dir, subpath)
+        if os.path.isdir(module):
+            yield module
+
+
+def execd_submodule_paths(command, execd_dir=None):
+    """Generate a list of full paths to the specified command within exec_dir.
+    """
+    for module_path in execd_module_paths(execd_dir):
+        path = os.path.join(module_path, command)
+        if os.access(path, os.X_OK) and os.path.isfile(path):
+            yield path
+
+
+def execd_run(command, execd_dir=None, die_on_error=False, stderr=None):
+    """Run command for each module within execd_dir which defines it."""
+    for submodule_path in execd_submodule_paths(command, execd_dir):
+        try:
+            subprocess.check_call(submodule_path, shell=True, stderr=stderr)
+        except subprocess.CalledProcessError as e:
+            hookenv.log("Error ({}) running  {}. Output: {}".format(
+                e.returncode, e.cmd, e.output))
+            if die_on_error:
+                sys.exit(e.returncode)
+
+
+def execd_preinstall(execd_dir=None):
+    """Run charm-pre-install for each module within execd_dir."""
+    execd_run('charm-pre-install', execd_dir=execd_dir)
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-07-30 15:39:55 +0000
+++ hooks/hooks.py	2014-08-21 15:23:35 +0000
@@ -43,6 +43,8 @@
 
 from charmhelpers.core.hookenv import log as juju_log
 
+from charmhelpers.payload.execd import execd_preinstall
+
 from charmhelpers.core.host import (
     service,
 )
@@ -724,6 +726,8 @@
 ###############################################################################
 @hooks.hook('install')
 def install_hook():
+    juju_log('Begin install hook.')
+    execd_preinstall()
     juju_log("Installing mongodb")
     add_source(config('source'), config('key'))
     apt_update(fatal=True)
@@ -1369,4 +1373,4 @@
 ###############################################################################
 if __name__ == "__main__":
     # execute a hook based on the name the program is called by
-    hooks.execute(sys.argv)
 \ No newline at end of file
+    hooks.execute(sys.argv)