Merge lp:~cprov/charms/trusty/adt-cloud-worker/py3-venv-switch into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk

[Celso Providelo]

Supporting python3 codebase on trusty with virtualenv.

Dependencies are installed from pypi (internet) if the charm does not get fed with files/pip-cache.

We will populate the cache in the mojo spec, later.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

=== added directory 'files'
=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-04 18:34:06 +0000
+++ hooks/actions.py	2015-03-05 01:17:46 +0000
@@ -7,13 +7,7 @@
 from charmhelpers.core import hookenv
 
 
-REQUIRED_PACKAGES = [
-    'bzr',
-    # py2 dependencies as a temporary hack-to-production.
-    'python-kombu',
-    'python-configparser',
-    'python-swiftclient',
-]
+REQUIRED_PACKAGES = ['bzr', 'python-virtualenv', 'python3-dev']
 SERVICE_DIR = '/srv/adt-cloud-worker'
 
 config = hookenv.config()
@@ -35,3 +29,25 @@
     config_file = config['config-file']
     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):
+    hookenv.log('Installing python packages...')
+    env_dir = os.path.join(SERVICE_DIR, 've')
+    subprocess.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')
+    if os.path.exists(pip_cache):
+        hookenv.log('Installing from download cache.')
+        subprocess.call(['%s/bin/pip' % env_dir,
+                         'install',
+                         '--no-index',
+                         '--find-links={}'.format(pip_cache),
+                         '-r', requirements])
+    else:
+        hookenv.log('Installing from pypi.')
+        subprocess.call(['%s/bin/pip' % env_dir,
+                         'install', '-r', requirements])
+
+    subprocess.call(['%s/bin/pip' % env_dir,
+                     'install', '--no-deps', '-e', SERVICE_DIR])

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-03-04 16:14:33 +0000
+++ hooks/services.py	2015-03-05 01:17:46 +0000
@@ -16,6 +16,7 @@
             'data_ready': [
                 actions.install_packages,
                 actions.get_cloud_worker_branch,
+                actions.install_python_packages,
                 actions.get_config_file,
                 helpers.render_template(
                     source='upstart.conf',

=== modified file 'templates/upstart.conf'
--- templates/upstart.conf	2015-03-04 18:34:06 +0000
+++ templates/upstart.conf	2015-03-05 01:17:46 +0000
@@ -14,8 +14,9 @@
 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
+  chdir ${SERVICE_DIR}
+  exec ./ve/bin/python3 adt-cloud-worker.py >> logs/adt-cloud-worker.log 2>&1
+
 end script