From af7eb1deab12c7208853c5d18b55228e0ba29c4d Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Mon, 31 Jan 2022 20:45:29 -0700 Subject: Schema a d (#1211) Migrate from legacy schema or define new schema in cloud-init-schema.json, adding extensive schema tests for: - cc_apt_configure - cc_bootcmd - cc_byobu - cc_ca_certs - cc_chef - cc_debug - cc_disable_ec2_metadata - cc_disk_setup Deprecate config hyphenated schema keys in favor of underscores: - ca_certs and ca_certs.remove_defaults instead of ca-certs and ca-certs.remove-defaults - Continue to honor deprecated config keys but emit DEPRECATION warnings in logs for continued use of the deprecated keys: - apt_sources key - any apt v1 or v2 keys - use or ca-certs or ca_certs.remove-defaults - Extend apt_configure schema - Define more strict schema below object opaque keys using patternProperties - create common $def apt_configure.mirror for reuse in 'primary' and 'security' schema definitions within cc_apt_configure Co-Authored-by: James Falcon --- doc/examples/cloud-config-ca-certs.txt | 6 +++--- doc/examples/cloud-config-disk-setup.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/examples/cloud-config-ca-certs.txt b/doc/examples/cloud-config-ca-certs.txt index 5e9115a0..9f7beb05 100644 --- a/doc/examples/cloud-config-ca-certs.txt +++ b/doc/examples/cloud-config-ca-certs.txt @@ -7,13 +7,13 @@ # Make sure that this file is valid yaml before starting instances. # It should be passed as user-data when starting the instance. -ca-certs: - # If present and set to True, the 'remove-defaults' parameter will remove +ca_certs: + # If present and set to True, the 'remove_defaults' parameter will remove # all the default trusted CA certificates that are normally shipped with # Ubuntu. # This is mainly for paranoid admins - most users will not need this # functionality. - remove-defaults: true + remove_defaults: true # If present, the 'trusted' parameter should contain a certificate (or list # of certificates) to add to the system as trusted CA certificates. diff --git a/doc/examples/cloud-config-disk-setup.txt b/doc/examples/cloud-config-disk-setup.txt index 5c6de77e..a36e6cfb 100644 --- a/doc/examples/cloud-config-disk-setup.txt +++ b/doc/examples/cloud-config-disk-setup.txt @@ -80,7 +80,7 @@ fs_setup: disk_setup: ephmeral0: table_type: 'mbr' - layout: 'auto' + layout: true /dev/xvdh: table_type: 'mbr' layout: -- cgit v1.2.3