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

[José Antonio Rey]

Added blank defaults to config.yaml

Added blank defaults where there was no defaults as charm proof didn't like it

[James Page (james-page)]

This is intentional.

review: Disapprove

Unmerged revisions

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

Added blank defaults to config.yaml

=== modified file 'config.yaml'
--- config.yaml	2014-02-03 10:44:24 +0000
+++ config.yaml	2014-03-26 09:20:59 +0000
@@ -89,6 +89,7 @@
     # HA configuration settings
     vip:
         type: string
+        default: ""
         description: "Virtual IP to use to front cinder API in ha configuration"
     vip_iface:
         type: string
@@ -113,6 +114,7 @@
     # Per-service HTTPS configuration.
     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
@@ -120,7 +122,9 @@
           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.
     config-flags:
         type: string
+        default: ""
         description: Comma separated list of key=value config flags to be set in cinder.conf.