summaryrefslogtreecommitdiff
path: root/tests/cloud_tests/testcases
diff options
context:
space:
mode:
authorChad Smith <chad.smith@canonical.com>2017-10-20 13:24:22 -0600
committerChad Smith <chad.smith@canonical.com>2017-10-20 13:24:22 -0600
commit6bc504e41666329631cdfd5b947ed5b0e2529a76 (patch)
tree732858dd24cff8b9ab7ba49b20316c8406f9fdf2 /tests/cloud_tests/testcases
parentee90a6cda4083479d5e9e2aa26887d3db91a3785 (diff)
downloadvyos-cloud-init-6bc504e41666329631cdfd5b947ed5b0e2529a76.tar.gz
vyos-cloud-init-6bc504e41666329631cdfd5b947ed5b0e2529a76.zip
ntp: fix config module schema to allow empty ntp config
Fix three things related to the ntp module: 1. Fix invalid cloud-config schema in the integration test which provided empty dicts instead of emptylists for pools and servers 2. Correct logic in the ntp module to allow support for the minimal cloud-config 'ntp:' without raising a RuntimeError. Docs and schema definitions already describe that cloud-config's ntp can be empty. An ntp configuration with neither pools nor servers will be configured with a default set of ntp pools. As such, the ntp module now officially allows the following ntp cloud-configs: - ntp: - ntp: {} - ntp: servers: [] pools: [] 3. Add a simple unit test which validates all cloud-config provided to our integration tests to ensure it adheres to any defined module schema so as more jsonschema definitions are added, we validate our integration test configs. LP: #1724951
Diffstat (limited to 'tests/cloud_tests/testcases')
-rw-r--r--tests/cloud_tests/testcases/modules/ntp.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/cloud_tests/testcases/modules/ntp.yaml b/tests/cloud_tests/testcases/modules/ntp.yaml
index fbef431b..2530d72e 100644
--- a/tests/cloud_tests/testcases/modules/ntp.yaml
+++ b/tests/cloud_tests/testcases/modules/ntp.yaml
@@ -4,8 +4,8 @@
cloud_config: |
#cloud-config
ntp:
- pools: {}
- servers: {}
+ pools: []
+ servers: []
collect_scripts:
ntp_installed: |
#!/bin/bash