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

[José Antonio Rey]

Added blank defaults to missing defaults on config.yaml

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

[James Page (james-page)]

This is intentional.

review: Disapprove

Unmerged revisions

47. By José Antonio Rey on 2014-03-26

Added blank defaults for missing defaults

=== 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 @@
   # HA configuration settings
   vip:
     type: string
+    default: ""
     description: "Virtual IP to use to front Glance API in ha configuration"
   vip_iface:
     type: string
@@ -68,6 +69,7 @@
       HA Cluster nodes.
   ssl_cert:
     type: string
+    default: ""
     description: |
       SSL certificate to install and use for API ports.  Setting this value
       and ssl_key will enable reverse proxying, point Glance's entry in the
@@ -75,6 +77,7 @@
       issued by Keystone (if it is configured to do so).
   ssl_key:
     type: string
+    default: ""
     description: SSL key to use with certificate specified as ssl_cert.
   rabbit-user:
     default: glance