Merge lp:~fginther/charms/trusty/jenkaas-slave/update-slave-config into lp:~canonical-ci-engineering/charms/trusty/jenkaas-slave/trunk

[Francis Ginther]

Finish the changes needed to configure a slave via the jenkaas-slave relation.

Finish the changes needed to configure a slave via the jenkaas-slave relation.

This includes passing info on the default user so that the slave can connect without having to enable slave changes via the anonymous user.

[Joe Talbott (joetalbott)]

Looks okay to me.

review: Approve

[Para Siva (psivaa)]

+1, looks good to me.

review: Approve

Unmerged revisions

8. By Francis Ginther on 2015-06-22

Fix some errors and add the jenkaas-slave-relation-departed hook.

7. By Francis Ginther on 2015-06-19

Add passing of -jnlpCredentials and remove 'port'.

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-18 18:06:42 +0000
+++ hooks/actions.py	2015-06-22 18:40:32 +0000
@@ -48,9 +48,15 @@
 
 def configure_slave(service_name):
     hookenv.log('Configuring the slave')
+    hookenv.log('hook: {}'.format(hookenv.hook_name()))
+    if not hookenv.in_relation_hook():
+        return
+
     unit_name = hookenv.local_unit().replace('/', '-')
-    master_url = 'http://{}:8080/'.format(
+    master_url = 'http://{}:8080'.format(
         hookenv.relation_get('master-address'))
+    username = hookenv.relation_get('username')
+    password = hookenv.relation_get('password')
     hookenv.log('Configuring {} to connect to {}'.format(
         unit_name, master_url))
 
@@ -62,6 +68,11 @@
                 line = 'JENKINS_HOSTNAME={}\n'.format(unit_name)
             if 'JENKINS_URL=' in line:
                 line = 'JENKINS_URL={}\n'.format(master_url)
+            if 'JENKINS_ARGS=' in line:
+                line = 'JENKINS_ARGS="-jnlpUrl ' \
+                        '$JENKINS_URL/computer/$JENKINS_HOSTNAME/' \
+                        'slave-agent.jnlp -jnlpCredentials ' \
+                        '{}:{}"'.format(username, password)
             out_file.write(line)
     shutil.move(temp_path, config_path)
     # Set the file permissions to their original value

=== added symlink 'hooks/jenkaas-slave-relation-departed'
=== target is u'hooks.py'
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-06-18 11:59:55 +0000
+++ hooks/services.py	2015-06-22 18:40:32 +0000
@@ -22,7 +22,8 @@
     interface = 'jenkaas-slave'
     required_keys = [
         'master-address',
-        'port',
+        'username',
+        'password',
     ]