Minor corrections to two AWS how-tos

canonical · Aug 25, 2023 · 8b28f5c · 8b28f5c
1 parent 69a3bbf
commit 8b28f5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/aws/aws-how-to/build-cloudformation-templates.rst b/aws/aws-how-to/build-cloudformation-templates.rst
@@ -67,10 +67,6 @@ Since Ubuntu Pro FIPS is only available at the AWS Marketplace, the product ID n
      - amd64
      - ``prod-k6fgbnayirmrc``
 
-.. note::
-
-   For ARM (Graviton) and other Ubuntu versions in the Marketplace, use the IDs from :ref:`Find Ubuntu images on AWS`.
-
 To create the parameter in your CloudFormation template, choose a product ID from above and use it in place of <product-id> in:
 
 .. code::

diff --git a/aws/aws-how-to/build-pro-ami-using-packer.rst b/aws/aws-how-to/build-pro-ami-using-packer.rst
@@ -8,7 +8,7 @@ We'll be using Ubuntu Pro 20.04 for this guide, but the method is equally applic
 .. note::
 
    * For **Ubuntu Pro FIPS**, it is better to use a pre-enabled FIPS image from the marketplace to avoid unnecessary additional steps. 
-   * For **Ubuntu LTS**, you can use this method with a small change. As explained in the :ref:`Define provisioners` section below, don't include the two specific sets of commands in the *provisioners* component of the packer template. 
+   * For **Ubuntu LTS**, you can use this method with a small change as explained at the end of the :ref:`Define provisioners` section below. 
 
 
 Basic setup
@@ -116,10 +116,6 @@ The *provisioners* component is used to specify things that have to be installed
 
 Irrespective of the use-cases and tools being used, there are two sets of commands that have to be included - one at the beginning and the other at the end. These are needed to ensure the smooth functioning of Ubuntu Pro.
 
-.. note::
-
-   For an Ubuntu LTS AMI (i.e. for all non-Pro versions), these two sets of commands are not needed.
-
 The first set used at the beginning includes a ``cloud-init status --wait`` command. Using an "inline shell", it will look like:
 
 .. code::
@@ -154,6 +150,11 @@ These commands remove information that is specific to the instance being used to
 The rest of your personalised scripts or provisioning tools should go in between these two sets of commands. These two sets of commands can also be included directly within your script or provisioning tool.
 
 
+.. note::
+
+   For an **Ubuntu LTS** AMI (i.e. for all non-Pro versions), you can remove the ``cloud-init status --wait`` command from the first set and exclude the second set completely. These commands are not needed since they are Pro specific. However, including them will not lead to any errors and following this guide as it is will also work fine.
+
+
 Build the AMI
 -------------