Merge lp:~james-page/charms/precise/jenkins-slave/fixup into lp:charms/jenkins-slave

[James Page]

* FIX: Fixup /etc/default/jenkins-slave configuration handling (changed from
  upstart override).
* FEATURE: Add hooks/install.d to allow charm to be extended.

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Thanks James.

Approved.

-Juan

review: Approve

=== removed file 'CHANGES.md'
--- CHANGES.md	2011-10-07 13:43:39 +0000
+++ CHANGES.md	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-jenkins-slave 7
----------------
-
-* [james-page] minor refactoring to master-slave setup
-
-jenkins-slave 6
----------------
-
-* [james-page] Migrated ensemble-log -> juju-log inline with project renaming
-* [james-page] Fixup use of ENSEMBLE_REMOTE_UNIT -> JUJU_REMOTE_UNIT
-* [james-page] str -> string in config.yaml

=== added symlink 'hooks/config-changed'
=== target is u'install'
=== modified file 'hooks/install'
--- hooks/install	2012-04-27 13:25:33 +0000
+++ hooks/install	2012-07-31 13:54:28 +0000
@@ -4,10 +4,7 @@
 
 install_slave () {
 	juju-log "Installing jenkins-slave..."
-	apt-get -y install python-software-properties
-	add-apt-repository ppa:hudson-ubuntu/testing
-	apt-get update || true
-	apt-get -y install -qq jenkins-slave
+	apt-get -y install -qq jenkins-slave wget
 }
 [[ -f /etc/init/jenkins-slave.conf ]] || install_slave
 
@@ -16,6 +13,16 @@
 	juju-log "Installing tools..."
 	apt-get -y install -qq `config-get tools`
 }
-install_tools 
+install_tools
+
+# Execute any hook overlay which may be provided
+# by forks of this charm
+if [ -d hooks/install.d ]
+then
+    for i in `ls -1 hooks/install.d/*`
+    do
+        [[ -x $i ]] && . ./$i
+    done
+fi
 
 exit 0

=== added directory 'hooks/install.d'
=== added file 'hooks/install.d/README'
--- hooks/install.d/README	1970-01-01 00:00:00 +0000
+++ hooks/install.d/README	2012-07-31 13:54:28 +0000
@@ -0,0 +1,7 @@
+This directory can be used to extend the function
+of the jenkins master charm without changing any
+of the base hooks.
+
+Files must be executable otherwise the install hook
+(which is also run on upgrade-charm and config-changed
+hooks) will not execute them.

=== modified file 'hooks/slave-relation-changed'
--- hooks/slave-relation-changed	2011-10-07 13:43:39 +0000
+++ hooks/slave-relation-changed	2012-07-31 13:54:28 +0000
@@ -12,13 +12,12 @@
 
 # Set the slave hostname to match the juju unit
 # in the jenkins master instance
-slavehost=`echo ${JUJU_UNIT_NAME} | sed s,/,-,` 
+slavehost=`echo ${JUJU_UNIT_NAME} | sed s,/,-,`
 
 juju-log "Configuring jenkins-slave with $url..."
-cat > /etc/init/jenkins-slave.override << EOF
-env JENKINS_URL=$url
-env JENKINS_HOSTNAME=$slavehost
-EOF
+sed -i -e "s!^JENKINS_HOSTNAME.*!JENKINS_HOSTNAME=${slavehost}!" \
+       -e "s!^#*JENKINS_URL.*!JENKINS_URL=${url}!" \
+        /etc/default/jenkins-slave
 
 juju-log "Restarting jenkins-slave..."
 # Startup the jenkins-slave service

=== modified file 'hooks/slave-relation-departed'
--- hooks/slave-relation-departed	2011-08-02 08:53:54 +0000
+++ hooks/slave-relation-departed	2012-07-31 13:54:28 +0000
@@ -1,7 +1,3 @@
 #!/bin/bash
 
 stop jenkins-slave || true
-
-if [ -f /etc/init/jenkins-slave.override]; then
-	rm /etc/init/jenkins-slave.override 
-fi

=== added symlink 'hooks/upgrade-charm'
=== target is u'install'
=== modified file 'revision'
--- revision	2011-10-07 13:43:39 +0000
+++ revision	2012-07-31 13:54:28 +0000
@@ -1,1 +1,1 @@
-7
+8