Merge lp:~wesmason/charms/trusty/mongodb/merge-precise-patches into lp:charms/trusty/mongodb

[Wes Mason]

Merge exec.d and volume relation_id patches from precise charm

This adds in the exec.d and volumes relation_id (MP#234670) patches from the precise mongodb charm.

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #809 trusty-mongodb for wesmason mp237694
    LINT FAIL: lint-check missing

LINT Results not found.
Build: http://10.98.191.181:8080/job/charm_lint_check/809/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #617 trusty-mongodb for wesmason mp237694
    UNIT FAIL: unit-test missing

UNIT Results not found.
Build: http://10.98.191.181:8080/job/charm_unit_test/617/

[Adam Israel (aisrael)]

Hi Wes,

Thanks for the work bringing over patches from the precise branch. I've had the opportunity to review this MP and am happy to report that it tests successfully. I'm adding my +1.

review: Approve

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10911-results

review: Needs Fixing (automated testing)

[Matt Bruzek (mbruzek)]

There were some lint errors that I took care of to avoid delaying this merge. In the future please resolve the lint errors in the files that you touch, even if you did not introduce them.

+1 LGTM

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-07-10 18:38:27 +0000
+++ .bzrignore	2014-10-08 21:52:23 +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-10-08 21:52:23 +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-10-08 21:52:23 +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-10-08 21:52:23 +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-08-20 23:48:43 +0000
+++ hooks/hooks.py	2014-10-08 21:52:23 +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)
@@ -989,7 +993,7 @@
 def data_relation_joined():
     juju_log("data_relation_joined")
 
-    return(relation_set(
+    return(relation_set(relation_id(),
         {
             'mountpoint': '/srv/juju/mongodb-data'
         }))