From 0860a437150cb0ad019231e49d00a977426529b5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 8 Jul 2022 11:15:16 -0400 Subject: [PATCH] Update BYOH docs for RHEL 8 openshift-ansible --- modules/rhel-compute-updating.adoc | 16 ++++++++++------ modules/rhel-preparing-node.adoc | 2 +- modules/rhel-preparing-playbook-machine.adoc | 13 ++++++------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/rhel-compute-updating.adoc b/modules/rhel-compute-updating.adoc index c35b9f5b3c..f2df316891 100644 --- a/modules/rhel-compute-updating.adoc +++ b/modules/rhel-compute-updating.adoc @@ -44,7 +44,7 @@ Because the {op-system-base} machines require assets that are generated by the c + [NOTE] ==== -By default, the base OS RHEL with "Minimal" installation option enables firewalld serivce. Having the firewalld service enabled on your host prevents you from accessing {product-title} logs on the worker. Do not enable firewalld later if you wish to continue accessing {product-title} logs on the worker. +By default, the base OS RHEL with "Minimal" installation option enables firewalld service. Having the firewalld service enabled on your host prevents you from accessing {product-title} logs on the worker. Do not enable firewalld later if you wish to continue accessing {product-title} logs on the worker. ==== . Enable the repositories that are required for {product-title} {product-version}: @@ -52,10 +52,14 @@ By default, the base OS RHEL with "Minimal" installation option enables firewall + [source,terminal] ---- -# subscription-manager repos --disable=rhel-7-server-ose-4.9-rpms \ - --enable=rhel-7-server-ose-4.10-rpms +# subscription-manager repos --disable=rhocp-4.10-for-rhel-8-x86_64-rpms \ + --enable=rhocp-4.11-for-rhel-8-x86_64-rpms ---- -// As of OCP 4.10 GA, there are no openshift-ansible el8 packages built for RHEL8, so QE advised that we still run the playbook on RHEL7 machines. ++ +[IMPORTANT] +==== +As of {product-title} 4.11, the Ansible playbooks are provided only for {op-system-base} 8. If a {op-system-base} 7 system was used as a host for the {product-title} 4.10 Ansible playbooks, you must either upgrade the Ansible host to {op-system-base} 8, or create a new Ansible host on a {op-system-base} 8 system and copy over the inventories from the old Ansible host. +==== .. On the machine that you run the Ansible playbooks, update the required packages, including `openshift-ansible`: + @@ -68,8 +72,8 @@ By default, the base OS RHEL with "Minimal" installation option enables firewall + [source,terminal] ---- -# subscription-manager repos --disable=rhocp-4.9-for-rhel-8-x86_64-rpms \ - --enable=rhocp-4.10-for-rhel-8-x86_64-rpms +# subscription-manager repos --disable=rhocp-4.10-for-rhel-8-x86_64-rpms \ + --enable=rhocp-4.11-for-rhel-8-x86_64-rpms ---- . Update a {op-system-base} worker machine: diff --git a/modules/rhel-preparing-node.adoc b/modules/rhel-preparing-node.adoc index 669745b257..154101b2f7 100644 --- a/modules/rhel-preparing-node.adoc +++ b/modules/rhel-preparing-node.adoc @@ -75,7 +75,7 @@ Note that this might take a few minutes if you have a large number of available # subscription-manager repos \ --enable="rhel-8-for-x86_64-baseos-rpms" \ --enable="rhel-8-for-x86_64-appstream-rpms" \ - --enable="rhocp-4.10-for-rhel-8-x86_64-rpms" \ + --enable="rhocp-4.11-for-rhel-8-x86_64-rpms" \ --enable="fast-datapath-for-rhel-8-x86_64-rpms" ---- diff --git a/modules/rhel-preparing-playbook-machine.adoc b/modules/rhel-preparing-playbook-machine.adoc index 1dbd7f0bd3..bdffc12d73 100644 --- a/modules/rhel-preparing-playbook-machine.adoc +++ b/modules/rhel-preparing-playbook-machine.adoc @@ -7,7 +7,7 @@ [id="rhel-preparing-playbook-machine_{context}"] = Preparing the machine to run the playbook -Before you can add compute machines that use {op-system-base-full} as the operating system to an {product-title} {product-version} cluster, you must prepare a {op-system-base} 7 machine to run an Ansible playbook that adds the new node to the cluster. This machine is not part of the cluster but must be able to access it. +Before you can add compute machines that use {op-system-base-full} as the operating system to an {product-title} {product-version} cluster, you must prepare a {op-system-base} 8 machine to run an Ansible playbook that adds the new node to the cluster. This machine is not part of the cluster but must be able to access it. .Prerequisites @@ -16,7 +16,7 @@ Before you can add compute machines that use {op-system-base-full} as the operat .Procedure -. Ensure that the `kubeconfig` file for the cluster and the installation program that you used to install the cluster are on the {op-system-base} 7 machine. One way to accomplish this is to use the same machine that you used to install the cluster. +. Ensure that the `kubeconfig` file for the cluster and the installation program that you used to install the cluster are on the {op-system-base} 8 machine. One way to accomplish this is to use the same machine that you used to install the cluster. . Configure the machine to access all of the {op-system-base} hosts that you plan to use as compute machines. You can use any method that your company allows, including a bastion with an SSH proxy or a VPN. @@ -61,12 +61,11 @@ If you use SSH key-based authentication, you must manage the key with an SSH age [source,terminal] ---- # subscription-manager repos \ - --enable="rhel-7-server-rpms" \ - --enable="rhel-7-server-extras-rpms" \ - --enable="rhel-7-server-ansible-2.9-rpms" \ - --enable="rhel-7-server-ose-4.10-rpms" + --enable="rhel-8-for-x86_64-baseos-rpms" \ + --enable="rhel-8-for-x86_64-appstream-rpms" \ + --enable="ansible-2.9-for-rhel-8-x86_64-rpms" \ + --enable="rhocp-4.11-for-rhel-8-x86_64-rpms" ---- -// As of OCP 4.10 GA, there are no openshift-ansible el8 packages built for RHEL8, so QE advised that we still run the playbook on RHEL7 machines. . Install the required packages, including `openshift-ansible`: +