Merge lp:~aisrael/charms/precise/mysql/fix-charm-lint into lp:charms/mysql

Proposed by Adam Israel on 2014-10-09
Status: Merged
Merged at revision: 127
Proposed branch: lp:~aisrael/charms/precise/mysql/fix-charm-lint
Merge into: lp:charms/mysql
Diff against target: 41 lines (+4/-2)
2 files modified
config.yaml (+2/-0)
hooks/shared_db_relations.py (+2/-2)
To merge this branch: bzr merge lp:~aisrael/charms/precise/mysql/fix-charm-lint
Reviewer Review Type Date Requested Status
Marco Ceppi 2014-10-09 Approve on 2014-11-04
Review Queue (community) automated testing Approve on 2014-10-24
Review via email: mp+237755@code.launchpad.net

Description of the change

Fix charm proof warnings and lint errors so that the charm will pass automated testing.

To post a comment you must log in.
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://reports.vapour.ws/charm-tests/charm-bundle-test-1267-results

review: Approve (automated testing)
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-05-08 11:23:53 +0000
3+++ config.yaml 2014-10-09 10:19:53 +0000
4@@ -80,6 +80,7 @@
5 your ceph cluster).
6 source:
7 type: string
8+ default:
9 description: |
10 Optional configuration to support use of additional sources such as:
11 .
12@@ -91,6 +92,7 @@
13 option.
14 key:
15 type: string
16+ default:
17 description: |
18 Key ID to import to the apt keyring to support use with arbitary source
19 configuration from outside of Launchpad archives or PPA's.
20
21=== modified file 'hooks/shared_db_relations.py'
22--- hooks/shared_db_relations.py 2014-06-02 19:52:50 +0000
23+++ hooks/shared_db_relations.py 2014-10-09 10:19:53 +0000
24@@ -94,7 +94,7 @@
25 # nova_database=xxx nova_username=xxx nova_hostname=xxx
26 # quantum_database=xxx quantum_username=xxx quantum_hostname=xxx
27 # create
28- #{
29+ # {
30 # "nova": {
31 # "username": xxx,
32 # "database": xxx,
33@@ -105,7 +105,7 @@
34 # "database": xxx,
35 # "hostname": xxx
36 # }
37- #}
38+ # }
39 #
40 databases = {}
41 for k, v in settings.iteritems():

Subscribers

People subscribed via source and target branches

to all changes: