Merge lp:~jose/charms/precise/glance/add-blank-defaults into lp:~openstack-charmers-archive/charms/precise/glance/trunk

Proposed by José Antonio Rey
Status: Rejected
Rejected by: James Page
Proposed branch: lp:~jose/charms/precise/glance/add-blank-defaults
Merge into: lp:~openstack-charmers-archive/charms/precise/glance/trunk
Diff against target: 27 lines (+3/-0)
1 file modified
config.yaml (+3/-0)
To merge this branch: bzr merge lp:~jose/charms/precise/glance/add-blank-defaults
Reviewer Review Type Date Requested Status
James Page Disapprove
Review via email: mp+212880@code.launchpad.net

Commit message

Added blank defaults to missing defaults on config.yaml

Description of the change

Some options on the config.yaml file were missing defaults and charm proof didn't like that, added blank defaults.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

This is intentional.

review: Disapprove

Unmerged revisions

47. By José Antonio Rey

Added blank defaults for missing defaults

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config.yaml'
--- config.yaml 2014-02-03 11:24:02 +0000
+++ config.yaml 2014-03-26 16:08:08 +0000
@@ -45,6 +45,7 @@
45 # HA configuration settings45 # HA configuration settings
46 vip:46 vip:
47 type: string47 type: string
48 default: ""
48 description: "Virtual IP to use to front Glance API in ha configuration"49 description: "Virtual IP to use to front Glance API in ha configuration"
49 vip_iface:50 vip_iface:
50 type: string51 type: string
@@ -68,6 +69,7 @@
68 HA Cluster nodes.69 HA Cluster nodes.
69 ssl_cert:70 ssl_cert:
70 type: string71 type: string
72 default: ""
71 description: |73 description: |
72 SSL certificate to install and use for API ports. Setting this value74 SSL certificate to install and use for API ports. Setting this value
73 and ssl_key will enable reverse proxying, point Glance's entry in the75 and ssl_key will enable reverse proxying, point Glance's entry in the
@@ -75,6 +77,7 @@
75 issued by Keystone (if it is configured to do so).77 issued by Keystone (if it is configured to do so).
76 ssl_key:78 ssl_key:
77 type: string79 type: string
80 default: ""
78 description: SSL key to use with certificate specified as ssl_cert.81 description: SSL key to use with certificate specified as ssl_cert.
79 rabbit-user:82 rabbit-user:
80 default: glance83 default: glance

Subscribers

People subscribed via source and target branches