Merge lp:~cprov/charms/trusty/adt-cloud-worker/py2-production into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk

[Celso Providelo]

Proposed interim hack for deploying adt-cloud-worker on trusty with standard python2 dependencies.

Since it is still only a deployment issue, lets solve it on the charm layer and development can continue with py3.

[Joe Talbott (joetalbott)]

LGTM

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-04 15:09:16 +0000
+++ hooks/actions.py	2015-03-04 18:43:52 +0000
@@ -7,7 +7,13 @@
 from charmhelpers.core import hookenv
 
 
-REQUIRED_PACKAGES = ['bzr', 'python-kombu']
+REQUIRED_PACKAGES = [
+    'bzr',
+    # py2 dependencies as a temporary hack-to-production.
+    'python-kombu',
+    'python-configparser',
+    'python-swiftclient',
+]
 SERVICE_DIR = '/srv/adt-cloud-worker'
 
 config = hookenv.config()

=== modified file 'templates/upstart.conf'
--- templates/upstart.conf	2015-03-04 16:14:33 +0000
+++ templates/upstart.conf	2015-03-04 18:43:52 +0000
@@ -15,5 +15,7 @@
 
 script
   mkdir -p ${SERVICE_DIR}/logs
-  exec ${SERVICE_DIR}/adt-cloud-worker.py -c ${SERVICE_DIR}/.adt-service.conf >> ${SERVICE_DIR}/logs/adt-cloud-worker.log 2>&1
+  # 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