Merge pull request canonical#1956 from Chris-Peterson444/top-level-au…

…toinstall Allow top-level autoinstall in all delivery methods
Chris-Peterson444 · Apr 4, 2024 · 16bcfcf · 16bcfcf
2 parents d77bfbe + 26761b4
commit 16bcfcf
Show file tree

Hide file tree

Showing 7 changed files with 267 additions and 135 deletions.
diff --git a/doc/.custom_wordlist.txt b/doc/.custom_wordlist.txt
@@ -73,6 +73,7 @@ pw
 realname
 rootfs
 rsyslog
+runtime
 subvolume
 subvolumes
 superset

diff --git a/doc/.wordlist.txt b/doc/.wordlist.txt
@@ -8,6 +8,8 @@ EBS
 EKS
 Grafana
 IAM
+ISO
+ISOs
 JSON
 Jira
 Juju

diff --git a/doc/intro-to-autoinstall.rst b/doc/intro-to-autoinstall.rst
@@ -94,18 +94,6 @@ path is relative to the rootfs of the installation system. For example:
 
 * :code:`subiquity.autoinstallpath=path/to/autoinstall.yaml`
 
-.. note::
-
-    Directly specifying autoinstall as a :code:`autoinstall.yaml` file does not
-    require a :code:`#cloud-config` header, and does not use a top level
-    ``autoinstall:`` key. The autoinstall directives are placed at the top
-    level. For example:
-
-    .. code-block:: yaml
-
-        version: 1
-        ....
-
 
 Order precedence of the autoinstall locations
 =============================================