adt-image-mapper

Merge lp:~thomir-deactivatedaccount/adt-image-mapper/trunk-fix-config-file into lp:adt-image-mapper

  1. trunk-fix-config-file
  2. Merge into trunk
Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 4
Merged at revision: 4
Proposed branch: lp:~thomir-deactivatedaccount/adt-image-mapper/trunk-fix-config-file
Merge into: lp:adt-image-mapper
Diff against target: 25 lines (+2/-2)
2 files modified
README.rst (+1/-1)
adt_image_mapper/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/adt-image-mapper/trunk-fix-config-file
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
Review via email: mp+253116@code.launchpad.net

Commit message

Make the config file visible.

Description of the change

Make the config file visible.

To post a comment you must log in.
Revision history for this message
Celso Providelo (cprov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.rst'
2--- README.rst 2015-03-13 15:44:04 +0000
3+++ README.rst 2015-03-16 21:01:20 +0000
4@@ -16,7 +16,7 @@
5
6 $ pip install -r requirements.txt
7
8-Create a sample config file, which should look something like this (there's a template in .adt-service.conf)::
9+Create a sample config file, which should look something like this (there's a template in adt-service.conf)::
10
11 [nova]
12 # Matching OS_ env_vars.
13
14=== renamed file '.adt-service.conf' => 'adt-service.conf'
15=== modified file 'adt_image_mapper/__init__.py'
16--- adt_image_mapper/__init__.py 2015-03-13 15:44:04 +0000
17+++ adt_image_mapper/__init__.py 2015-03-16 21:01:20 +0000
18@@ -36,7 +36,7 @@
19
20 if config is None:
21 config = configparser.ConfigParser()
22- config.read(".adt-service.conf")
23+ config.read("adt-service.conf")
24
25 app = flask.Flask('adt_image_mapper')
26

Subscribers

People subscribed via source and target branches

to all changes: