Merge lp:~cprov/charms/trusty/adt-cloud-service/gunicorn-app into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk

[Celso Providelo]

Restoring upstart template capabilities and running web_app with gunicorn from the venv (py3 support).

Restoring upstart template capabilities and running web_app with gunicorn from the venv (py3 support).

Also providing website relation for HA | Apache

[Joe Talbott (joetalbott)]

LGTM, Thanks for doing this.

review: Approve

=== modified file 'README'
--- README	2015-03-10 20:17:05 +0000
+++ README	2015-03-13 03:40:39 +0000
@@ -7,7 +7,8 @@
 -------------
 
 There are only two config options for this charm:
- * branch: The bzr branch to pull for adt-cloud-service (default:
-           lp:adt-cloud-service)
  * config-file: A base64 encoded string with the config file to use for
                 adt-cloud-service.
+
+NOTE: This expects the payload code in the form of adt-cloud-service.tgz 
+to exist with the snapshot of lp:adt-cloud-service that needs deploying
 
=== removed file 'adt.conf'
--- adt.conf	2015-03-10 20:17:05 +0000
+++ adt.conf	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# `adt-cloud-worker` configuration file.
-[adt]
-name = foo
-# <arch>.<platform>[ ...]
-tags = i386.nova amd64.nova
-
-[amqp]
-uris = amqp://guest:guest@localhost:5672//
-
-[nova]
-# Matching OS_ env_vars.
-os_username = foo
-os_tenant_name = foo_project
-os_password = <redacted>
-os_auth_url = http://172.20.161.138:5000/v2.0/
-os_region_name = bot-prototype
-extra_args = --net-id=415a0839-eb05-4e7a-907c-413c657f4bf5
 
=== modified file 'config.yaml'
--- config.yaml	2015-03-10 20:17:05 +0000
+++ config.yaml	2015-03-13 03:40:39 +0000
@@ -1,6 +1,5 @@
 options:
-  branch:
+  config-file:
     type: string
-    default: "lp:adt-cloud-service"
-    description: "Branch to use for adt-cloud-service"
-
+    description: |
+      base64 encoded string with the config file for adt-cloud-worker
 
=== added directory 'files'
=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-10 20:17:05 +0000
+++ hooks/actions.py	2015-03-13 03:40:39 +0000
@@ -1,38 +1,90 @@
 import base64
 import os
-import shutil
 import subprocess
 
 from charmhelpers import fetch
-from charmhelpers.core import hookenv
+from charmhelpers.core import (
+    hookenv,
+    host,
+)
+from charmhelpers.core.services import helpers
+from charmhelpers.payload.archive import extract_tarfile
 
 
 REQUIRED_PACKAGES = [
-    'bzr',
-    # py2 dependencies as a temporary hack-to-production.
-    'python-kombu',
-    'python-configparser',
-    'python-swiftclient',
+    'python-virtualenv', 'python3-dev',
 ]
 SERVICE_DIR = '/srv/adt-cloud-service'
+LOG_DIR = os.path.join(SERVICE_DIR, 'logs')
+WSGI_USER = 'www-data'
+WSGI_GROUP = 'www-data'
 
 config = hookenv.config()
 
+
 def log_start(service_name):
     hookenv.log('adt-cloud-service starting')
 
+
 def install_packages(service_name):
     hookenv.log('Installing dependencies...')
+    fetch.add_source('ppa:canonical-ci-engineering/ci-airline-phase-0')
     fetch.configure_sources(update=True)
     fetch.apt_install(REQUIRED_PACKAGES, fatal=True)
 
-def get_cloud_service_branch(service_name):
-    branch = config['branch']
-    shutil.rmtree(SERVICE_DIR, ignore_errors=True)
-    subprocess.call(['bzr', 'branch', branch, SERVICE_DIR])
+
+def get_cloud_service_from_tarball(service_name):
+    files_dir = os.path.join(hookenv.charm_dir(), 'files')
+    tarball = os.path.join(files_dir, 'adt-cloud-service.tgz')
+    if not os.path.exists(SERVICE_DIR):
+        hookenv.log('Installing the code for the first time from tarball')
+        extract_tarfile(tarball, '/srv/')
+
 
 def get_config_file(service_name):
     config_file = config.get('config-file')
     if config_file is not None:
         with open(os.path.join(SERVICE_DIR, '.adt-service.conf'), 'w') as f:
             f.write(base64.b64decode(config_file))
+
+
+def install_python_packages(service_name):
+    env_dir = os.path.join(SERVICE_DIR, 've')
+    if os.path.exists(env_dir):
+        hookenv.log('Service venv already exists, nothing to do ...')
+        return
+
+    hookenv.log('Installing python packages into the venv ...')
+    subprocess.check_call(['virtualenv', '-p', 'python3', env_dir])
+
+    pip_cache = os.path.join(hookenv.charm_dir(), 'files', 'pip-cache')
+    requirements = os.path.join(SERVICE_DIR, 'requirements.txt')
+
+    hookenv.log('Installing from download cache.')
+    subprocess.check_call(['%s/bin/pip' % env_dir,
+                           'install',
+                           '--no-index',
+                           '--find-links={}'.format(pip_cache),
+                           '-r', requirements])
+
+    subprocess.check_call(['%s/bin/pip' % env_dir,
+                           'install', '--no-deps', '-e', SERVICE_DIR])
+
+def prepare_for_wsgi(service_name):
+    host.adduser(WSGI_USER)
+    host.add_group(WSGI_GROUP)
+    host.add_user_to_group(WSGI_USER, WSGI_GROUP)
+    if not os.path.exists(LOG_DIR):
+        host.mkdir(LOG_DIR, WSGI_USER, WSGI_GROUP, perms=0755)
+
+
+class WebsiteRelation(helpers.RelationContext):
+    name = 'website'
+    interface = 'http'
+
+    def provide_data(self):
+        data = {
+            'hostname': hookenv.unit_private_ip(),
+            'port': 8000,
+        }
+        return data
 
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-03-10 20:17:05 +0000
+++ hooks/services.py	2015-03-13 03:40:39 +0000
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 
 from charmhelpers.core import hookenv
+from charmhelpers.core.services import helpers
 from charmhelpers.core.services.base import ServiceManager
-from charmhelpers.core.services import helpers
 
 import actions
 
@@ -12,11 +12,14 @@
     manager = ServiceManager([
         {
             'service': 'adt-cloud-service',
+            'provided_data': [actions.WebsiteRelation()],
             'required_data': [config],
             'data_ready': [
                 actions.install_packages,
-                actions.get_cloud_service_branch,
+                actions.get_cloud_service_from_tarball,
+                actions.install_python_packages,
                 actions.get_config_file,
+                actions.prepare_for_wsgi,
                 helpers.render_template(
                     source='upstart.conf',
                     target='/etc/init/adt-cloud-service.conf'),
 
=== added file 'hooks/wsgi-relation-joined'
--- hooks/wsgi-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/wsgi-relation-joined	2015-03-13 03:40:39 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/python
+import services
+services.manage()
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-03-10 20:17:05 +0000
+++ metadata.yaml	2015-03-13 03:40:39 +0000
@@ -1,5 +1,9 @@
 name: adt-cloud-service
-summary: Deploy a service to handle adt jobs dispatched to a rabbit queue
+summary: Deploys a web_app to handle adt jobs dispatched to a rabbit queue
 maintainer: Canonical CI Engineering <[e-mail]>
 description: |
-  Runs adt-cloud-service from a specified bzr branch
+  Runs adt-cloud-service using gunicorn from given code tarball
+provides:
+  website:
+    interface: http
+    optional: true
 
=== added directory 'templates'
=== removed directory 'templates'
=== added file 'templates/upstart.conf'
--- templates/upstart.conf	1970-01-01 00:00:00 +0000
+++ templates/upstart.conf	2015-03-13 03:40:39 +0000
@@ -0,0 +1,28 @@
+description "Starts the adt-cloud-service with gunicorn"
+
+start on (local-filesystems and net-device-up IFACE=eth0)
+stop on runlevel [!12345]
+
+# use sigint so python code just needs to catch KeyboardInterrupt
+kill signal SIGINT
+
+# If the process quits unexpectedly trigger respawn it
+respawn
+# unless it fails 15 times within 5 seconds
+respawn limit 15 5
+
+env SERVICE_DIR=/srv/adt-cloud-service
+
+script
+
+  chdir ${SERVICE_DIR}
+
+  exec sudo -u www-data ./ve/bin/gunicorn \
+    --name=adt-cloud-service \
+    --bind=0.0.0.0 \
+    --log-file=${SERVICE_DIR}/logs/gunicorn.log \
+    --log-level=INFO \
+    --access-logfile=${SERVICE_DIR}/logs/access.log \
+    adt_cloud_service:app
+
+end script
 
=== removed file 'templates/upstart.conf'
--- templates/upstart.conf	2015-03-10 20:17:05 +0000
+++ templates/upstart.conf	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-description "Starts a adt-cloud-worker process"
-
-start on (local-filesystems and net-device-up IFACE=eth0)
-stop on runlevel [!12345]
-
-# use sigint so python code just needs to catch KeyboardInterrupt
-kill signal SIGINT
-
-# If the process quits unexpectedly trigger respawn it
-respawn
-# unless it fails 15 times within 5 seconds
-respawn limit 15 5
-
-env SERVICE_DIR=/srv/adt-cloud-worker
-
-script
-  mkdir -p ${SERVICE_DIR}/logs
-  # XXX cprov: respect py3 project choice once we have proper dependencies
-  # available.
-  exec python ${SERVICE_DIR}/adt-cloud-worker.py -c ${SERVICE_DIR}/.adt-service.conf >> ${SERVICE_DIR}/logs/adt-cloud-worker.log 2>&1
-end script