Merge lp:~tvansteenburgh/charms/precise/ceilometer/fix-tests into lp:~openstack-charmers-archive/charms/precise/ceilometer/trunk

[Tim Van Steenburgh]

Fix proof, lint.

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-02-27 09:47:41 +0000
+++ config.yaml	2014-09-10 18:40:04 +0000
@@ -42,6 +42,7 @@
       Setting this to True will force all services to log to the syslog.
   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 Ceilometer's entry in the
@@ -49,9 +50,11 @@
       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.
   ssl_ca:
     type: string
+    default:
     description: |
       SSL CA to use with the certificate and key provided - this is only
       required if you are providing a privately signed ssl_cert and ssl_key.

=== modified file 'hooks/ceilometer_utils.py'
--- hooks/ceilometer_utils.py	2014-04-10 15:34:08 +0000
+++ hooks/ceilometer_utils.py	2014-09-10 18:40:04 +0000
@@ -51,12 +51,12 @@
 
 CEILOMETER_ROLE = "ResellerAdmin"
 
-#NOVA_CONF = "/etc/nova/nova.conf"
-#NOVA_SETTINGS = [
-#    ('DEFAULT', 'instance_usage_audit', 'True'),
-#    ('DEFAULT', 'instance_usage_audit_period', 'hour'),
-#    ('DEFAULT', 'notification_driver', 'ceilometer.compute.nova_notifier')
-#]
+# NOVA_CONF = "/etc/nova/nova.conf"
+# NOVA_SETTINGS = [
+#     ('DEFAULT', 'instance_usage_audit', 'True'),
+#     ('DEFAULT', 'instance_usage_audit_period', 'hour'),
+#     ('DEFAULT', 'notification_driver', 'ceilometer.compute.nova_notifier')
+# ]
 
 
 CONFIG_FILES = OrderedDict([