From bc5dc2a2e54bb05c17dd3169f31babcf19e7fc97 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 6 Oct 2014 23:11:14 +0100
Subject: [PATCH] [trivial] Tidy configuration lint

---
 config.yaml   | 22 ++++++++++++++--------
 metadata.yaml |  2 ++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/config.yaml b/config.yaml
index 0eb89279..a694f290 100644
--- a/config.yaml
+++ b/config.yaml
@@ -12,6 +12,7 @@ options:
       charm assumes anything not starting with /dev is a directory instead.
   osd-journal:
     type: string
+    default:
     description: |
       The device to use as a shared journal drive for all OSD's.  By default
       no journal device will be used.
@@ -41,6 +42,7 @@ options:
       Only supported with ceph >= 0.48.3.
   osd-reformat:
     type: string
+    default:
     description: |
       By default, the charm will not re-format a device that already looks
       as if it might be an OSD device.  This is a safeguard to try to
@@ -60,6 +62,7 @@ options:
       problems as warnings only and will not result in a hook error.
   ephemeral-unmount:
     type: string
+    default:
     description: |
       Cloud instances provider ephermeral storage which is normally mounted
       on /mnt.
@@ -85,6 +88,7 @@ options:
       for precise but is provided in the Ubuntu cloud archive.
   key:
     type: string
+    default:
     description: |
       Key ID to import to the apt keyring to support use with arbitary source
       configuration from outside of Launchpad archives or PPA's.
@@ -94,15 +98,17 @@ options:
     description: |
       If set to True, supporting services will log to syslog.
   ceph-public-network:
-     type: string
-     description: |
-        The IP address and netmask of the public (front-side) network (e.g.,
-        192.168.0.0/24)
+    type: string
+    default:
+    description: |
+      The IP address and netmask of the public (front-side) network (e.g.,
+      192.168.0.0/24)
   ceph-cluster-network:
-     type: string
-     description: |
-        The IP address and netmask of the cluster (back-side) network (e.g.,
-        192.168.0.0/24)
+    type: string
+    default:
+    description: |
+      The IP address and netmask of the cluster (back-side) network (e.g.,
+      192.168.0.0/24)
   prefer-ipv6:
     type: boolean
     default: False
diff --git a/metadata.yaml b/metadata.yaml
index 2f41d9b2..7ac72fa8 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,6 +1,8 @@
 name: ceph-osd
 summary: Highly scalable distributed storage - Ceph OSD storage
 maintainer: James Page <james.page@ubuntu.com>
+categories:
+ - misc
 description: |
  Ceph is a distributed storage and network file system designed to provide
  excellent performance, reliability, and scalability.