Merge lp:~jameinel/charms/precise/tarmac/add-install-dependencies into lp:~james-w/charms/precise/tarmac/trunk

[John A Meinel]

Add "install-dependencies" as a list of packages to install at config-changed time.

Small cleanup to README and the 'install' hook.

A few small changes:
 1) Typo in README
 2) Remove 'puppet' call during 'install' hook. AFAICT it wasn't actually doing anything, because puppet wouldn't have any of the config it actually needed to set up all the hooks, etc.
 3) Add "install-dependencies" as a config item. I can put all of my other 'get things running' into the "verify_command" step, but I needed to install packages as root.

[lp:~jameinel/charms/precise/tarmac/add-install-dependencies]

5. By John A Meinel on 2013-01-21

update the revision number, otherwise juju is really confused.

6. By John A Meinel on 2013-01-22

Small tweak.

You need to apt-get install '-y' so that it actually installs the packages.

Unmerged revisions

6. By John A Meinel on 2013-01-22

Small tweak.

You need to apt-get install '-y' so that it actually installs the packages.

5. By John A Meinel on 2013-01-21

update the revision number, otherwise juju is really confused.

4. By John A Meinel on 2013-01-21

Fix typo in the README

3. By John A Meinel on 2013-01-21

Add an install-dependencies config entry.

This way we can easily install packages that need to be available for the test suite to run.
We can't really put that into the tarmac-conf:verify_command because that
command runs as the tarmac user, not as root.
ATM we only support naming packages that should be installed,
that should keep this a bit more sane that just having a shell
script that gets run.

2. By John A Meinel on 2013-01-21

Remove the install-time puppet run.

Puppet needs to run during 'config-changed' not during 'install', because you don't
really have the config that puppet needs at 'install' time.

=== modified file 'README'
--- README	2012-05-15 23:48:00 +0000
+++ README	2013-01-22 11:19:21 +0000
@@ -18,7 +18,7 @@
     tarmac:
         launchpad-username: <USERNAME>
         public-key: ssh-rsa AAAAA...
-        private_key: |
+        private-key: |
             -----BEGIN RSA PRIVATE KEY-----
             MII....
             ...

=== modified file 'config.yaml'
--- config.yaml	2012-05-15 23:48:00 +0000
+++ config.yaml	2013-01-22 11:19:21 +0000
@@ -14,3 +14,6 @@
     private-key:
         description: The SSH private key to use to connect to Launchpad.
         type: string
+    install-dependencies:
+        description: A list of packages to 'apt-get install' at 'install' time. This lets you inject packages that you will need at testing time.
+        type: string

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-05-15 23:48:00 +0000
+++ hooks/config-changed	2013-01-22 11:19:21 +0000
@@ -8,4 +8,10 @@
 export FACTER_tarmac_conf="$(config-get tarmac-conf)"
 export FACTER_launchpad_credentials="$(config-get launchpad-credentials)"
 
+INSTALL_DEPS="$(config-get install-dependencies)"
+
+if [ -n "$INSTALL_DEPS" ]; then 
+    apt-get install -y $INSTALL_DEPS
+fi
+
 puppet apply --templatedir=. tarmac.pp

=== modified file 'hooks/install'
--- hooks/install	2012-05-15 23:48:00 +0000
+++ hooks/install	2013-01-22 11:19:21 +0000
@@ -5,4 +5,3 @@
 set -e
 
 apt-get install -y puppet
-puppet apply --templatedir=. tarmac.pp

=== modified file 'revision'
--- revision	2012-05-15 23:48:00 +0000
+++ revision	2013-01-22 11:19:21 +0000
@@ -1,1 +1,1 @@
-4
+6