Merge lp:~aisrael/charms/trusty/glance/charm-proof into lp:~openstack-charmers-archive/charms/trusty/glance/trunk

Proposed by Adam Israel
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~aisrael/charms/trusty/glance/charm-proof
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/trunk
Diff against target: 35 lines (+5/-0)
1 file modified
config.yaml (+5/-0)
To merge this branch: bzr merge lp:~aisrael/charms/trusty/glance/charm-proof
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+234032@code.launchpad.net

Description of the change

Add default: stanzas to config.yaml so glance will pass charm proof

To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :

This currently affects most charms and since this type of fix is functionally equivalent to what it replaces, I reckon it would make more sense to adjust charm proof to ignore lack of default for string type.

Revision history for this message
José Antonio Rey (jose) wrote :

Same as my last two comments.

Revision history for this message
Edward Hope-Morley (hopem) wrote :
Revision history for this message
James Page (james-page) wrote :

I've merged an equiv fix into our /next branch which will get released in a few weeks time; marking merged.

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-12 16:55:29 +0000
3+++ config.yaml 2014-09-09 23:53:30 +0000
4@@ -51,9 +51,11 @@
5 description: Enable verbose logging
6 # HA configuration settings
7 vip:
8+ default:
9 type: string
10 description: "Virtual IP to use to front Glance API in ha configuration"
11 vip_iface:
12+ default:
13 type: string
14 default: eth0
15 description: "Network Interface where to place the Virtual IP"
16@@ -74,6 +76,7 @@
17 Default multicast port number that will be used to communicate between
18 HA Cluster nodes.
19 ssl_cert:
20+ default:
21 type: string
22 description: |
23 SSL certificate to install and use for API ports. Setting this value
24@@ -81,9 +84,11 @@
25 Keystone catalog to use https, and override any certficiate and key
26 issued by Keystone (if it is configured to do so).
27 ssl_key:
28+ default:
29 type: string
30 description: SSL key to use with certificate specified as ssl_cert.
31 ssl_ca:
32+ default:
33 type: string
34 description: |
35 SSL CA to use with the certificate and key provided - this is only

Subscribers

People subscribed via source and target branches