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

[Francis Ginther]

Configure the upstart config files for the slave service to connect to the jenkaas master.

Configure the upstart config files for the slave service to connect to the jenkaas master.

The master charm still needs to be updated to configure the slave so that it can actually connect.

[Joe Talbott (joetalbott)]

Looks good. I didn't know you could use the comma in a with block, neato!

review: Approve

[Francis Ginther (fginther)]

> Looks good. I didn't know you could use the comma in a with block, neato!

Yep, it saves having to do a nested indent with a second 'with'.

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-16 19:02:24 +0000
+++ hooks/actions.py	2015-06-18 18:10:39 +0000
@@ -1,6 +1,8 @@
 import glob
 import os
+import shutil
 import subprocess
+import tempfile
 
 from charmhelpers import fetch
 from charmhelpers.core import hookenv
@@ -44,5 +46,27 @@
         subprocess.check_call(['dpkg', '-i', package])
 
 
+def configure_slave(service_name):
+    hookenv.log('Configuring the slave')
+    unit_name = hookenv.local_unit().replace('/', '-')
+    master_url = 'http://{}:8080/'.format(
+        hookenv.relation_get('master-address'))
+    hookenv.log('Configuring {} to connect to {}'.format(
+        unit_name, master_url))
+
+    config_path = '/etc/default/jenkins-slave'
+    _unused, temp_path = tempfile.mkstemp()
+    with open(config_path) as in_file, open(temp_path, 'w') as out_file:
+        for line in in_file:
+            if 'JENKINS_HOSTNAME=' in line:
+                line = 'JENKINS_HOSTNAME={}\n'.format(unit_name)
+            if 'JENKINS_URL=' in line:
+                line = 'JENKINS_URL={}\n'.format(master_url)
+            out_file.write(line)
+    shutil.move(temp_path, config_path)
+    # Set the file permissions to their original value
+    os.chmod(config_path, 0o644)
+
+
 def log_start(service_name):
     hookenv.log('Starting service {}'.format(SERVICE_NAME))

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-06-17 13:34:28 +0000
+++ hooks/services.py	2015-06-18 18:10:39 +0000
@@ -40,6 +40,7 @@
                 actions.basenode,
                 actions.install_service_dependencies,
                 actions.install_service_packages,
+                actions.configure_slave,
                 actions.log_start,
             ],
         },