Merge lp:~arosales/charms/trusty/mysql/add-default-keys into lp:charms/trusty/mysql

Proposed by Antonio Rosales
Status: Merged
Merged at revision: 126
Proposed branch: lp:~arosales/charms/trusty/mysql/add-default-keys
Merge into: lp:charms/trusty/mysql
Diff against target: 19 lines (+2/-0)
1 file modified
config.yaml (+2/-0)
To merge this branch: bzr merge lp:~arosales/charms/trusty/mysql/add-default-keys
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+235064@code.launchpad.net

Description of the change

This MP is from Jorge's work from https://code.launchpad.net/~jorge/charms/trusty/mysql/fix-proof/+merge/234020

However in that MP the config.yaml had a tab instead of spaces which causes issues in the parsing of the yaml.

The ultimate goal of this MP is to set default values to satisfy proof.

This does deploy to at started state, thus the defaults look to not have a negative affect on the the deploy.

To post a comment you must log in.
Revision history for this message
Antonio Rosales (arosales) wrote :

This also passes bundletester lint and proof:

/mysql$ bundletester
mysql
    charm-proof PASS
    make lint PASS

PASS: 2 Total: 2 (1.83715 sec)

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-09-17 22:41:34 +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.

Subscribers

People subscribed via source and target branches

to all changes: