Merge lp:~jorge/charms/precise/juju-gui/add-default-values into lp:charms/juju-gui

Proposed by Jorge Castro on 2014-09-09
Status: Needs review
Proposed branch: lp:~jorge/charms/precise/juju-gui/add-default-values
Merge into: lp:charms/juju-gui
Diff against target: 32 lines (+4/-0)
1 file modified
config.yaml (+4/-0)
To merge this branch: bzr merge lp:~jorge/charms/precise/juju-gui/add-default-values
Reviewer Review Type Date Requested Status
Juju GUI Charmers 2014-09-09 Pending
Review via email: mp+234028@code.launchpad.net

Description of the change

Add default values to pass charm proof.

To post a comment you must log in.

Unmerged revisions

98. By Jorge Castro on 2014-09-09

Add blank default values to pass proof.

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-04-15 14:17:12 +0000
3+++ config.yaml 2014-09-09 23:24:53 +0000
4@@ -66,17 +66,20 @@
5 the GUI. Both ssl-cert-contents and ssl-key-contents must be provided.
6 If not, cetificates will be automatically generated.
7 type: string
8+ default:
9 ssl-key-contents:
10 description: |
11 The contents of the private key file to be used in SSL connections to
12 the GUI. Both ssl-cert-contents and ssl-key-contents must be provided.
13 If not, cetificates will be automatically generated.
14 type: string
15+ default:
16 login-help:
17 description: |
18 The help text shown to the user on the login screen. If not provided, a
19 default message is used, suggesting how to find the login credentials.
20 type: string
21+ default:
22 read-only:
23 description: |
24 Whether or not the GUI is in read-only mode. Note that read-only mode is
25@@ -103,6 +106,7 @@
26 If given, the password to use for the environment to immediately
27 connect. Do not set unless you understand and accept the risks.
28 type: string
29+ default:
30 sandbox:
31 description: |
32 Run using an in-memory sandbox rather than a real Juju backend. Sandbox

Subscribers

People subscribed via source and target branches