Merge lp:~jcsackett/charms/precise/charmworld/quick-fix-charm-test-options into lp:~juju-jitsu/charms/precise/charmworld/trunk

Proposed by j.c.sackett
Status: Merged
Merged at revision: 90
Proposed branch: lp:~jcsackett/charms/precise/charmworld/quick-fix-charm-test-options
Merge into: lp:~juju-jitsu/charms/precise/charmworld/trunk
Diff against target: 32 lines (+6/-6)
2 files modified
production_overrides.ini (+3/-3)
scripts/write_config.py (+3/-3)
To merge this branch: bzr merge lp:~jcsackett/charms/precise/charmworld/quick-fix-charm-test-options
Reviewer Review Type Date Requested Status
j.c.sackett (community) Approve
Review via email: mp+202158@code.launchpad.net

Description of the change

This fixes the charm to write the variables to the correct ini config option names.

To post a comment you must log in.
Revision history for this message
j.c.sackett (jcsackett) wrote :

Self reviewing as a trivial change

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'production_overrides.ini'
2--- production_overrides.ini 2014-01-14 16:03:57 +0000
3+++ production_overrides.ini 2014-01-17 18:53:29 +0000
4@@ -7,9 +7,9 @@
5 mongo.url =
6 lp_credentials_file = /home/webops_deploy/charmworld/charmbot_credentials.txt
7 proof.port = 6543
8-charm_testing_url =
9-charm_testing_token =
10-charm_testing_job =
11+charm_test_url =
12+charm_test_token =
13+charm_test_job =
14
15 [server:main]
16 port = 6543
17
18=== modified file 'scripts/write_config.py'
19--- scripts/write_config.py 2014-01-14 16:32:24 +0000
20+++ scripts/write_config.py 2014-01-17 18:53:29 +0000
21@@ -46,9 +46,9 @@
22 'app:main', 'worker_interval', worker_interval)
23 new_config.set('app:main', 'es_replicas', es_replicas)
24 new_config.set('app:main', 'es_shards', es_shards)
25- new_config.set('app:main', 'charm_testing_url', charm_testing_url)
26- new_config.set('app:main', 'charm_testing_token', charm_testing_token)
27- new_config.set('app:main', 'charm_testing_job', charm_testing_job)
28+ new_config.set('app:main', 'charm_test_url', charm_testing_url)
29+ new_config.set('app:main', 'charm_test_token', charm_testing_token)
30+ new_config.set('app:main', 'charm_test_job', charm_testing_job)
31 with open(target, 'w') as output:
32 new_config.write(output)
33

Subscribers

People subscribed via source and target branches

to all changes: