Merge lp:~doanac/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker-conf into lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-worker

[Andy Doan]

This adds the ability to specify a config file that the charm will store under the root of the unit's source directory

[Andy Doan (doanac)]

I played with this by deploying the branch-source-builder from our trunk with a small change like:

=== modified file 'juju-deployer/branch-source-builder.yaml'
--- juju-deployer/branch-source-builder.yaml 2013-12-19 17:11:55 +0000
+++ juju-deployer/branch-source-builder.yaml 2014-01-26 21:46:10 +0000
@@ -20,6 +20,7 @@
             options:
                 branch: lp:ubuntu-ci-services-itself
                 main: ./branch-source-builder/run_worker
+ unit-config: include-base64://configs/unit_config.yaml
         bsb-rabbit:
             branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server
             charm: rabbitmq

I think this is what you guys were wanting, right?

This is config format agnostic which is probably useful. I did YAML locally, but the charm doesn't care.

[Paul Larson (pwlars)]

Yes, and I think the idea was to have just a single config file with all the auth data any of them care about (right now, I think it's just cloud and lp). Looks fine to me, except we'll need to just write that file and stick it in the other branch.
+1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-01-24 21:10:26 +0000
+++ config.yaml	2014-01-26 22:04:39 +0000
@@ -18,6 +18,13 @@
   main:
     type: string
     description: "The worker script to run as a service. Can include paths relative to local bzr directory"
+  unit-config:
+    type: string
+    description: |
+      base64 encoded string to hold configuration information for the unit.
+      The contents will be written to a file named
+       <install_root>/<unit>/unit_config
+      where <unit> is the location the branch is extracted to.
 
   uid:
     type: string

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-01-24 21:10:26 +0000
+++ hooks/hooks.py	2014-01-26 22:04:39 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import base64
 import os
 import json
 import subprocess
@@ -73,6 +74,11 @@
     args.append(_service_dir(config))
     subprocess.check_call(args)
 
+    unit_config = config.get('unit-config')
+    if unit_config:
+        with open(os.path.join(_service_dir(config), 'unit_config'), 'w') as f:
+            f.write(base64.b64decode(unit_config))
+
 
 def _create_upstart(config):
     template = textwrap.dedent('''