From 04ae4653fc77c85f936599a55872d2a32bb3925c Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Fri, 12 Jun 2020 10:11:57 -0400 Subject: [PATCH 1/2] cli.rst: alphabetise devel subcommands --- doc/rtd/topics/cli.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/rtd/topics/cli.rst b/doc/rtd/topics/cli.rst index b32677b01c8..e1019651185 100644 --- a/doc/rtd/topics/cli.rst +++ b/doc/rtd/topics/cli.rst @@ -106,17 +106,16 @@ Do **NOT** rely on the output of these commands as they can and will change. Current subcommands: - * ``schema``: a **#cloud-config** format and schema - validator. It accepts a cloud-config yaml file and annotates potential - schema errors locally without the need for deployment. Schema - validation is work in progress and supports a subset of cloud-config - modules. - * ``render``: use cloud-init's jinja template render to process **#cloud-config** or **custom-scripts**, injecting any variables from ``/run/cloud-init/instance-data.json``. It accepts a user-data file containing the jinja template header ``## template: jinja`` and renders that content with any instance-data.json variables present. + * ``schema``: a **#cloud-config** format and schema + validator. It accepts a cloud-config yaml file and annotates potential + schema errors locally without the need for deployment. Schema + validation is work in progress and supports a subset of cloud-config + modules. .. _cli_features: From 61c54df9b97cabaa4eaa416d2265877aec2b01ad Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Fri, 12 Jun 2020 10:16:32 -0400 Subject: [PATCH 2/2] cli.rst: add net-convert entry to devel section --- doc/rtd/topics/cli.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/rtd/topics/cli.rst b/doc/rtd/topics/cli.rst index e1019651185..4a0aa92473c 100644 --- a/doc/rtd/topics/cli.rst +++ b/doc/rtd/topics/cli.rst @@ -106,6 +106,9 @@ Do **NOT** rely on the output of these commands as they can and will change. Current subcommands: + * ``net-convert``: manually use cloud-init's network format conversion, useful + for testing configuration or testing changes to the network conversion logic + itself. * ``render``: use cloud-init's jinja template render to process **#cloud-config** or **custom-scripts**, injecting any variables from ``/run/cloud-init/instance-data.json``. It accepts a user-data file