Merge pull request #55426 from fzdarsky/fix-osdocs-5142-and-5143

OSDOCS-5142 and OSDOCS-5143: Use RHEL major version instead of full version

Author: mburke5678

_attributes/attributes-microshift.adoc

@@ -4,11 +4,13 @@
 :experimental:
 :imagesdir: images
 :OCP: OpenShift Container Platform
+:ocp-version: 4.12
 :rhel-major: rhel-8
 :op-system-first: Red Hat Enterprise Linux (RHEL)
 :op-system: RHEL
 :op-system-ostree-first: Red Hat Enterprise Linux (RHEL) for Edge
 :op-system-ostree: RHEL for Edge
 :op-system-version: 8.7
+:op-system-version-major: 8
 :op-system-ram: 2GB RAM
 :op-system-chip: two-core AMD64 1.5GHz processor

modules/microshift-adding-repos-to-image-builder.adoc

@@ -20,8 +20,8 @@ Use the following procedure to add the {product-title} repositories to Image Bui
 [source,terminal,subs="attributes+"]
 ----
 $ sudo subscription-manager repos
-    --enable rhocp-{ocp-version}-for-rhel-{op-system-version}-$(uname -i)-rpms
-    --enable fast-datapath-for-rhel-{op-system-version}-$(uname -i)-rpms
+    --enable rhocp-{ocp-version}-for-rhel-{op-system-version-major}-$(uname -i)-rpms
+    --enable fast-datapath-for-rhel-{op-system-version-major}-$(uname -i)-rpms
 ----
 
 . Install the `reposync` and `createrepo` tools by running the following command:
@@ -37,8 +37,8 @@ $ sudo yum install -y yum-utils
 ----
 $ sudo reposync --arch=$(uname -i) --arch=noarch --gpgcheck \
     --download-path REPO_PATH=/var/repos/microshift-local \
-    --repo=rhocp-{ocp-version}-for-rhel-{op-system-version}-$(uname -i)-rpms \
-    --repo=fast-datapath-for-rhel-{op-system-version}-$(uname -i)-rpms
+    --repo=rhocp-{ocp-version}-for-rhel-{op-system-version-major}-$(uname -i)-rpms \
+    --repo=fast-datapath-for-rhel-{op-system-version-major}-$(uname -i)-rpms
 ----
 
 . Remove `coreos` packages to avoid conflicts by running the following command: