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
=== 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 @@
7from charmhelpers.core import hookenv7from charmhelpers.core import hookenv
88
99
10REQUIRED_PACKAGES = ['bzr', 'python-kombu']10REQUIRED_PACKAGES = [
11 'bzr',
12 # py2 dependencies as a temporary hack-to-production.
13 'python-kombu',
14 'python-configparser',
15 'python-swiftclient',
16]
11SERVICE_DIR = '/srv/adt-cloud-worker'17SERVICE_DIR = '/srv/adt-cloud-worker'
1218
13config = hookenv.config()19config = hookenv.config()
1420
=== 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 @@
1515
16script16script
17 mkdir -p ${SERVICE_DIR}/logs17 mkdir -p ${SERVICE_DIR}/logs
18 exec ${SERVICE_DIR}/adt-cloud-worker.py -c ${SERVICE_DIR}/.adt-service.conf >> ${SERVICE_DIR}/logs/adt-cloud-worker.log 2>&118 # XXX cprov: respect py3 project choice once we have proper dependencies
19 # available.
20 exec python ${SERVICE_DIR}/adt-cloud-worker.py -c ${SERVICE_DIR}/.adt-service.conf >> ${SERVICE_DIR}/logs/adt-cloud-worker.log 2>&1
19end script21end script

Subscribers

People subscribed via source and target branches