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

Proposed by Celso Providelo on 2015-03-04
Status: Merged
Merged at revision: 4
Proposed branch: lp:~cprov/charms/trusty/adt-cloud-worker/py2-production
Merge into: lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk
Diff against target: 31 lines (+10/-2)
2 files modified
hooks/actions.py (+7/-1)
templates/upstart.conf (+3/-1)
To merge this branch: bzr merge lp:~cprov/charms/trusty/adt-cloud-worker/py2-production
Reviewer Review Type Date Requested Status
Joe Talbott (community) 2015-03-04 Approve on 2015-03-04
Review via email: mp+251804@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Joe Talbott (joetalbott) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/actions.py'
2--- hooks/actions.py 2015-03-04 15:09:16 +0000
3+++ hooks/actions.py 2015-03-04 18:43:52 +0000
4@@ -7,7 +7,13 @@
5 from charmhelpers.core import hookenv
6
7
8-REQUIRED_PACKAGES = ['bzr', 'python-kombu']
9+REQUIRED_PACKAGES = [
10+ 'bzr',
11+ # py2 dependencies as a temporary hack-to-production.
12+ 'python-kombu',
13+ 'python-configparser',
14+ 'python-swiftclient',
15+]
16 SERVICE_DIR = '/srv/adt-cloud-worker'
17
18 config = hookenv.config()
19
20=== modified file 'templates/upstart.conf'
21--- templates/upstart.conf 2015-03-04 16:14:33 +0000
22+++ templates/upstart.conf 2015-03-04 18:43:52 +0000
23@@ -15,5 +15,7 @@
24
25 script
26 mkdir -p ${SERVICE_DIR}/logs
27- exec ${SERVICE_DIR}/adt-cloud-worker.py -c ${SERVICE_DIR}/.adt-service.conf >> ${SERVICE_DIR}/logs/adt-cloud-worker.log 2>&1
28+ # XXX cprov: respect py3 project choice once we have proper dependencies
29+ # available.
30+ exec python ${SERVICE_DIR}/adt-cloud-worker.py -c ${SERVICE_DIR}/.adt-service.conf >> ${SERVICE_DIR}/logs/adt-cloud-worker.log 2>&1
31 end script

Subscribers

People subscribed via source and target branches