Ubuntu CI Engine

Merge lp:~cjohnston/uci-engine/deploy-local-restish into lp:uci-engine

  1. deploy-local-restish
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 507
Merged at revision: 507
Proposed branch: lp:~cjohnston/uci-engine/deploy-local-restish
Merge into: lp:uci-engine
Diff against target: 12 lines (+1/-1)
1 file modified
juju-deployer/deploy.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/uci-engine/deploy-local-restish
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andy Doan (community) Approve
Review via email: mp+220924@code.launchpad.net

Commit message

Add restish charm to local charms in deploy.py

Description of the change

The restish charm was added back to the engine, however, it was never added as a local charm for deploy.py and now is removed by deploy.py in it's cleanup.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:507
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/698/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/698/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju-deployer/deploy.py'
2--- juju-deployer/deploy.py 2014-05-15 18:01:07 +0000
3+++ juju-deployer/deploy.py 2014-05-26 08:57:02 +0000
4@@ -573,7 +573,7 @@
5
6 # Feed local_charms with our charms so that if anything goes wrong during
7 # the building phase, we'll never remove them.
8- local_charms = {'precise': ['lander', 'python-django',
9+ local_charms = {'precise': ['lander', 'python-django', 'restish',
10 'rabbitmq-worker', 'webui']}
11 clean_func = lambda: _cleanup(local_charms)
12 atexit.register(clean_func)

Subscribers

People subscribed via source and target branches