From b97e6415fa4e6253e8e3dfc523ab4a0181de33b8 Mon Sep 17 00:00:00 2001 From: Ian Fowler Date: Thu, 13 Jul 2023 10:29:02 +0100 Subject: [PATCH] Replaced install versions with attribute Replaced with attribute and altered code-block header to support attributes Replace install version with attribute https://issues.redhat.com/browse/AAP-14023 --- ...oc-editing-inventory-file-for-updates.adoc | 6 +++--- .../proc-installing-the-aap-setup-bundle.adoc | 8 ++++--- ...oc-installing-the-ansible-builder-rpm.adoc | 21 ++++++++++++------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/downstream/modules/platform/proc-editing-inventory-file-for-updates.adoc b/downstream/modules/platform/proc-editing-inventory-file-for-updates.adoc index 7722b39ca..b75b51fac 100644 --- a/downstream/modules/platform/proc-editing-inventory-file-for-updates.adoc +++ b/downstream/modules/platform/proc-editing-inventory-file-for-updates.adoc @@ -10,16 +10,16 @@ You can keep the same parameters from your existing {PlatformNameShort} deployme . Navigate to the installation program directory. Bundled installer:: + -[source,options="nowrap",subs=attributes+] +[source,options="nowrap",subs="+attributes"] ----- -$ cd ansible-automation-platform-setup-bundle-2.4-1-x86_64 +$ cd ansible-automation-platform-setup-bundle-{AnsibleInstallVers}-x86_64 ----- + Online installer:: + [source,options="nowrap",subs=attributes+] ----- -$ cd ansible-automation-platform-setup-2.4-1 +$ cd ansible-automation-platform-setup-{AnsibleInstallVers} ----- . Open the `inventory` file for editing. diff --git a/downstream/modules/platform/proc-installing-the-aap-setup-bundle.adoc b/downstream/modules/platform/proc-installing-the-aap-setup-bundle.adoc index d0be267cb..1f614a32f 100644 --- a/downstream/modules/platform/proc-installing-the-aap-setup-bundle.adoc +++ b/downstream/modules/platform/proc-installing-the-aap-setup-bundle.adoc @@ -17,10 +17,11 @@ The download and installation of the setup bundle needs to be located on the aut . Untar the bundle + +[literal, options="nowrap" subs="+attributes"] ---- $ tar xvf \ - ansible-automation-platform-setup-bundle-2.4-1.tar.gz -$ cd ansible-automation-platform-setup-bundle-2.4-1 + ansible-automation-platform-setup-bundle-{AnsibleInstallVers}.tar.gz +$ cd ansible-automation-platform-setup-bundle-{AnsibleInstallVers} ---- + . Edit the inventory file to include the required options @@ -68,9 +69,10 @@ NOTE: The inventory should be kept intact after installation since it is used fo + . Run the AAP setup bundle executable as the root user + +[literal, options="nowrap" subs="+attributes"] ---- $ sudo -i -# cd /path/to/ansible-automation-platform-setup-bundle-2.4-1 +# cd /path/to/ansible-automation-platform-setup-bundle-{AnsibleInstallVers} # ./setup.sh ---- + diff --git a/downstream/modules/platform/proc-installing-the-ansible-builder-rpm.adoc b/downstream/modules/platform/proc-installing-the-ansible-builder-rpm.adoc index 7a0e28fa5..bb3a3edcb 100644 --- a/downstream/modules/platform/proc-installing-the-ansible-builder-rpm.adoc +++ b/downstream/modules/platform/proc-installing-the-ansible-builder-rpm.adoc @@ -18,8 +18,9 @@ This is preferred if a Satellite exists because the EE images can leverage RHEL . Unarchive the AAP setup bundle. . Install the ansible-builder RPM and its dependencies from the included content: + +[source,options="nowrap",subs="+attributes"] ---- -$ tar -xzvf ansible-automation-platform-setup-bundle-2.4-1.tar.gz +$ tar -xzvf ansible-automation-platform-setup-bundle-{AnsibleInstallVers}.tar.gz $ cd ansible-automation-platform-setup-bundle-2.4/bundle/el8/repos/ $ sudo yum install ansible-builder-1.0.1-2.el8ap.noarch.rpm python38-requirements-parser-0.2.0-3.el8ap.noarch.rpm @@ -198,32 +199,36 @@ To upgrade between minor releases of AAP 2, use this general workflow. . Run `./setup.sh` to upgrade the installation. -For example, to upgrade from version 2.2.0-7 to 2.3-1.2, make sure that both setup bundles are on the initial controller node where the installation occurred: +For example, to upgrade from version 2.2.0-7 to {AnsibleInstallVers}, make sure that both setup bundles are on the initial controller node where the installation occurred: +[literal, options="nowrap" subs="+attributes"] ---- $ ls -1F ansible-automation-platform-setup-bundle-2.2.0-7/ ansible-automation-platform-setup-bundle-2.2.0-7.tar.gz -ansible-automation-platform-setup-bundle-2.3-1.2/ -ansible-automation-platform-setup-bundle-2.3-1.2.tar.gz +ansible-automation-platform-setup-bundle-{AnsibleInstallVers}/ +ansible-automation-platform-setup-bundle-{AnsibleInstallVers}.tar.gz ---- Back up the 2.2.0-7 installation: +[literal, options="nowrap" subs="+attributes"] ---- $ cd ansible-automation-platform-setup-bundle-2.2.0-7 $ sudo ./setup.sh -b $ cd .. ---- -Copy the 2.2.0-7 inventory file into the 2.3-1.2 bundle directory: +Copy the 2.2.0-7 inventory file into the {AnsibleInstallVers} bundle directory: +[literal, options="nowrap" subs="+attributes"] ---- $ cd ansible-automation-platform-setup-bundle-2.2.0-7 -$ cp inventory ../ansible-automation-platform-setup-bundle-2.3-1.2/ +$ cp inventory ../ansible-automation-platform-setup-bundle-{AnsibleInstallVers}/ $ cd .. ---- -Upgrade from 2.2.0-7 to 2.3-1.2 with the setup.sh script: +Upgrade from 2.2.0-7 to {AnsibleInstallVers} with the setup.sh script: +[literal, options="nowrap" subs="+attributes"] ---- -$ cd ansible-automation-platform-setup-bundle-2.3-1.2 +$ cd ansible-automation-platform-setup-bundle-{AnsibleInstallVers} $ sudo ./setup.sh ----