Merge lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/make-config-file-explicit into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 14
Merged at revision: 14
Proposed branch: lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/make-config-file-explicit
Merge into: lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk
Diff against target: 24 lines (+2/-2)
2 files modified
hooks/actions.py (+1/-1)
templates/upstart.conf (+1/-1)
To merge this branch: bzr merge lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/make-config-file-explicit
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Celso Providelo (community) Approve
Review via email: mp+253117@code.launchpad.net

Commit message

Be explicit about the config file we use.

Description of the change

Be explicit about the config file we use.

To post a comment you must log in.
Revision history for this message
Celso Providelo (cprov) :
review: Approve
Revision history for this message
Francis Ginther (fginther) 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-12 18:32:42 +0000
3+++ hooks/actions.py 2015-03-16 21:07:56 +0000
4@@ -39,7 +39,7 @@
5
6 def get_config_file(service_name):
7 config_content = base64.b64decode(config['config-file'])
8- config_path = os.path.join(SERVICE_DIR, '.adt-service.conf')
9+ config_path = os.path.join(SERVICE_DIR, 'adt-service.conf')
10 with open(config_path, 'w') as f:
11 f.write(config_content)
12
13
14=== modified file 'templates/upstart.conf'
15--- templates/upstart.conf 2015-03-12 15:54:48 +0000
16+++ templates/upstart.conf 2015-03-16 21:07:56 +0000
17@@ -17,6 +17,6 @@
18
19 install -d -o acw-worker ${SERVICE_DIR}/logs
20 chdir ${SERVICE_DIR}
21- exec sudo -u acw-worker sh -c "./ve/bin/python3 adt-cloud-worker.py >> logs/adt-cloud-worker.log 2>&1"
22+ exec sudo -u acw-worker sh -c "./ve/bin/python3 adt-cloud-worker.py -c ${SERVICE_DIR}/adt-service.conf >> logs/adt-cloud-worker.log 2>&1"
23
24 end script

Subscribers

People subscribed via source and target branches

to all changes: