Merge lp:~caio1982/charms/trusty/system-image-server/productionizing-story-1332 into lp:~caio1982/charms/trusty/system-image-server/trunk

[Caio Begotti]

Merge changes needed for story #1332 of Capomastro development and testing on production.

=== modified file 'README'
--- README	2015-02-27 19:45:00 +0000
+++ README	2015-05-04 16:24:20 +0000
@@ -14,6 +14,11 @@
 
 From this point on it follows the standard operation of System Image Server through si-shell.
 
+TODO
+----
+
+* Amulet tests
+
 Contact Information
 -------------------
 
 
=== modified file 'config.yaml'
--- config.yaml	2015-03-02 18:10:42 +0000
+++ config.yaml	2015-05-04 16:24:20 +0000
@@ -16,7 +16,7 @@
   packages:
     type: string
     description: "Packages required for this service"
-    default: "bzr abootimg android-tools-fsutils python-gnupg python-gpgme fakeroot pxz pep8 pyflakes python-mock haveged tree"
+    default: "bzr abootimg android-tools-fsutils python-gnupg python-gpgme fakeroot pxz pep8 pyflakes python-mock haveged tree cron"
   install_root:
     type: string
     description: "The root directory the service will be installed in"
@@ -25,6 +25,10 @@
     type: string
     description: "FQDN of the host unit that this charm relates to, used with install_root to determine the installation path too"
     default: "system-image.staging.ubuntu.com"
+  shell:
+    type: string
+    description: "A batch of commands to be passed to si-shell during post-deployment (base64 encoded)"
+    default: ""
   config_template:
     type: string
     description: "Image server config template (base64 encoded)"
@@ -33,3 +37,11 @@
     type: string
     description: "List of pairs with devices for creation and their channel relation"
     default: "ubuntu-touch/devel:mydevice ubuntu-touch/devel-current:mydevice ubuntu-touch/qa:otherdevice"
+  cronjob:
+    type: string
+    description: "Cronjob of the image server, useful for periodic importing of images (base64 encoded)"
+    default: ""
+  keyowner:
+    type: string
+    description: "E-mail to be used when generating the service GPG keys (if empty it will use testing keys)"
+    default: ""
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-04-23 14:49:58 +0000
+++ hooks/hooks.py	2015-05-04 16:24:20 +0000
@@ -8,14 +8,17 @@
 import sys
 import grp
 import pwd
+import tempfile
 
 import charmhelpers.fetch
 
-from charmhelpers.core.hookenv import log, config, relation_set, Hooks, UnregisteredHookError
+from charmhelpers.core.hookenv import (log, config, relation_set,
+                                       Hooks, UnregisteredHookError)
 from jinja2 import Template
 
 hooks = Hooks()
 
+
 def _service_dir():
     unit = os.environ['JUJU_UNIT_NAME'].split('/')[0]
     for x in (':', '-', '/', '"', "'"):
@@ -53,7 +56,6 @@
 
 
 def _setup_config():
-    log('Saving config file...', 'INFO')
     sdir = _service_dir()
     config_file = os.path.join(sdir, 'etc', 'config')
 
@@ -67,22 +69,38 @@
     charmconfig = config()
     with open(config_file, 'w') as conf:
         conf.write(str(template.render(charmconfig)))
+        conf.close()
 
 
 def _setup_keys():
-    log('Generating server keys...', 'INFO')
     subprocess.check_output(['haveged'])
-    srvdir = _service_dir()
-    #the system-image tools unfortunately really want to run from this dir
-    os.chdir(srvdir)
-    out = subprocess.check_output(['{}/tests/generate-keys'.format(srvdir)])
-    log(out, 'INFO')
-    #copy the keys we just generated into the proper location
-    shutil.rmtree('{}/secret/gpg/keys/'.format(srvdir))
-    shutil.copytree('{}/tests/keys'.format(srvdir),
-                    '{}/secret/gpg/keys/'.format(srvdir))
-    out = subprocess.check_output(['{}/bin/generate-keyrings'.format(srvdir)])
-    log(out, 'INFO')
+
+    # the system-image tools unfortunately
+    # really want to run from this dir
+    sdir = _service_dir()
+    os.chdir(sdir)
+
+    fqdn = config('fqdn')
+    keyowner = config('keyowner')
+
+    if keyowner:
+        command = '{}/bin/generate-keys --email={} ' \
+                  '--prefix={}'.format(sdir, keyowner, fqdn)
+        log('Generating production-ready keys with {}'.format(command), 'INFO')
+        res = subprocess.check_output(command, shell=True)
+        log(str(res), 'INFO')
+    else:
+        log('Generating & copying testing keys as necessary...', 'INFO')
+        res = subprocess.check_output(['{}/tests/generate-keys'.format(sdir)])
+        log(str(res), 'INFO')
+
+        #copy the keys we just generated into the proper location
+        shutil.rmtree('{}/secret/gpg/keys/'.format(sdir))
+        shutil.copytree('{}/tests/keys'.format(sdir),
+                        '{}/secret/gpg/keys/'.format(sdir))
+
+    res = subprocess.check_output(['{}/bin/generate-keyrings'.format(sdir)])
+    log(str(res), 'INFO')
 
 
 def _setup_webserver():
@@ -128,17 +146,59 @@
     channels = [pair.split(':')[0] for pair in config_pairs]
     for channel in channels:
         if channel not in pub.list_channels():
-           log('Creating channel {}...'.format(channel), 'INFO')
-           res = pub.create_channel(channel)
+            log('Creating channel {}...'.format(channel), 'INFO')
+            res = pub.create_channel(channel)
+            log(str(res), 'INFO')
 
     for channel, device in [pair.split(':') for pair in config_pairs]:
         if device not in pub.list_devices(channel):
-            log('Creating device {} in channel {}'.format(device, channel), 'INFO')
+            log('Creating device {} in channel {}'.format(device, channel),
+                'INFO')
             res = pub.create_device(channel, device)
+            log(str(res), 'INFO')
 
     log('Publishing keyring...', 'INFO')
     for keyring in ("archive-master", "image-master", "image-signing"):
         res = pub.publish_keyring(keyring)
+        log(str(res), 'INFO')
+
+
+def _setup_cron():
+    if not config('cronjob'):
+        log("Missing cronjob template, skipping periodic schedule setup")
+        return
+
+    cronjob = '/etc/cron.d/system-image-server'
+    log("Writing cronjob {}".format(cronjob), 'INFO')
+
+    template_str = config('cronjob')
+    template = Template(str(base64.b64decode(template_str)))
+    charmconfig = config()
+    with open(cronjob, 'w') as conf:
+        conf.write(str(template.render(charmconfig)))
+        conf.close()
+
+
+def _setup_sishell():
+    if not config('shell'):
+        log("Missing commands file, skipping si-shell batch")
+        return
+
+    sdir = _service_dir()
+    fd, batchfile = tempfile.mkstemp()
+    template_str = config('shell')
+    template = Template(str(base64.b64decode(template_str)))
+    charmconfig = config()
+    with open(batchfile, 'w') as batch:
+        batch.write(str(template.render(charmconfig)))
+        os.close(fd)
+
+    log('Executing {}/bin/si-shell < {}'.format(sdir, batchfile), 'INFO')
+    res = subprocess.check_output(
+        '{}/bin/si-shell < {}'.format(sdir, batchfile),
+        stderr=subprocess.STDOUT,
+        shell=True)
+    log(str(res), 'INFO')
 
 
 @hooks.hook('install')
@@ -162,6 +222,8 @@
 def config_changed():
     _setup_config()
     _setup_channels()
+    _setup_cron()
+    _setup_sishell()
 
 
 @hooks.hook('upgrade-charm')