diff options
| author | Scott Moser <smoser@brickies.net> | 2017-10-17 16:12:59 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-10-18 16:10:06 -0400 |
| commit | 41152f10ddbd8681cdac44b408038a4f23ab02df (patch) | |
| tree | a2edb9a13b16340c980643e476482de4166a70c7 /cloudinit | |
| parent | d4f70470b7c3af89d4bf97123f4d61ad8a58805b (diff) | |
| download | vyos-cloud-init-41152f10ddbd8681cdac44b408038a4f23ab02df.tar.gz vyos-cloud-init-41152f10ddbd8681cdac44b408038a4f23ab02df.zip | |
schema: Log debug instead of warning when jsonschema is not available.
When operating in expected path, cloud-init should avoid logging with
warning. That causes 'WARNING' messages in /var/log/cloud-init.log.
By default, warnings also go to the console.
Since jsonschema is a optional dependency, and not present on xenial
and zesty, cloud-init should not warn there.
Also here:
* Add a test to integration tests to assert that there are no
warnings in /var/log/cloud-init.log.
* Update one integration test that did show warning and the related
documentation and examples.
LP: #1724354
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/config/cc_users_groups.py | 3 | ||||
| -rw-r--r-- | cloudinit/config/schema.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py index b80d1d36..f363000d 100644 --- a/cloudinit/config/cc_users_groups.py +++ b/cloudinit/config/cc_users_groups.py @@ -15,7 +15,8 @@ options, see the ``Including users and groups`` config example. Groups to add to the system can be specified as a list under the ``groups`` key. Each entry in the list should either contain a the group name as a string, or a dictionary with the group name as the key and a list of users who should -be members of the group as the value. +be members of the group as the value. **Note**: Groups are added before users, +so any users in a group list must already exist on the system. The ``users`` config key takes a list of users to configure. The first entry in this list is used as the default user for the system. To preserve the standard diff --git a/cloudinit/config/schema.py b/cloudinit/config/schema.py index bb291ff8..ca7d0d5b 100644 --- a/cloudinit/config/schema.py +++ b/cloudinit/config/schema.py @@ -74,7 +74,7 @@ def validate_cloudconfig_schema(config, schema, strict=False): try: from jsonschema import Draft4Validator, FormatChecker except ImportError: - logging.warning( + logging.debug( 'Ignoring schema validation. python-jsonschema is not present') return validator = Draft4Validator(schema, format_checker=FormatChecker()) |