Merge lp:~marcoceppi/charms/trusty/landscape-client/fix-proof into lp:charms/trusty/landscape-client

[Marco Ceppi]

Fix proof errors

[Adam Collard (adam-collard)]

Thanks for the branch. Getting the client charm to pass the charm "lint" is great. What testing has happened with this change? How does the client charm cope with these new defaults?

I see a bunch of these charm updates adding empty defaults, with the only rationale being "charm proof". It would be useful to know the drive behind this.

review: Needs Information

[Adam Collard (adam-collard)]

Note that the docs[1] still say that the default: key is optional.

https://juju.ubuntu.com/docs/authors-charm-config.html#charm-configuration

Unmerged revisions

45. By Marco Ceppi on 2014-09-09

Fixes proof

=== modified file 'config.yaml'
--- config.yaml	2014-05-14 06:32:39 +0000
+++ config.yaml	2014-09-09 23:19:58 +0000
@@ -14,25 +14,30 @@
       The directory to store data files in (default:
       '/var/lib/landscape/client/').
     type: string
+    default:
   log-dir:
     description: |
       The directory to write log files to (default:
       '/var/log/landscape').
     type: string
+    default:
   log-level:
     description: |
       One of debug, info, warning, error or critical.
     type: string
+    default:
   url:
     description: |
       The message server URL to connect to. Normally
       https://fqdn/message-system.
     type: string
+    default:
   ping-url:
     description: |
       The ping server URL to perform lightweight exchange initiation with.
       Normally http://fqdn/ping.
     type: string
+    default:
   ssl-public-key:
     description: |
       The CA certificate to verify the server certificate with. This can be
@@ -40,56 +45,70 @@
       prefixed with "base64:". This config is only used if the message server
       URL given above starts with https.
     type: string
+    default:
   server-autodiscover:
     description: |
       Enable server autodiscovery.
     type: boolean
+    default: False
   autodiscover-srv-query-string:
     description: |
       Autodiscovery string for DNS SRV queries
     type: string
+    default:
   autodiscover-a-query-string:
     description: |
       Autodiscovery string for DNS A queries
     type: string
+    default:
   account-name:
     description: |
       The account this computer belongs to.
     type: string
+    default:
   registration-key:
     description: |
       The account-wide key used for registering clients.
     type: string
+    default:
   exchange-interval:
     description: |
       The number of seconds between server exchanges.
     type: int
+    default:
   urgent-exchange-interval:
     description: |
       The number of seconds between urgent server exchanges.
     type: int
+    default:
   ping-interval:
     description: |
       The number of seconds between pings.
     type: int
+    default:
   http-proxy:
     description: |
       The URL of the HTTP proxy, if one is needed.
     type: string
+    default:
   https-proxy:
     description: |
       The URL of the HTTPS proxy, if one is needed.
     type: string
+    default:
   tags:
     description: |
       Comma separated list of tag names to be sent to the server.
     type: string
+    default:
   script-users:
     description: |
       A comma-separated list of users to allow scripts to run.  To allow
       scripts to be run by any user, enter: ALL
     type: string
+    default:
   include-manager-plugins:
     description: |
       A comma-separated list of manager plugins to load.
     type: string
+    default:

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-01-28 17:53:33 +0000
+++ metadata.yaml	2014-09-09 23:19:58 +0000
@@ -7,6 +7,8 @@
   account.  This package provides the Landscape client and requires a
   Landscape account.
 subordinate: true
+categories:
+ - misc
 requires:
   container:
     interface: juju-info