IBM · jacobemery · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023
diff --git a/ansible.cfg b/ansible.cfg
@@ -1,6 +1,6 @@
 [defaults]
-private_key_file=~/.ssh/ansible-ocpz
 inventory=inventories/default/
+vault_password_file=.password.txt
 roles_path=roles
 #collections_path=collections
 interpreter_python=auto

diff --git a/docs/acknowledgements.md b/docs/acknowledgements.md
@@ -1,13 +1,17 @@
-Phillip Wilson  
-Filipe Miranda  
-Patrick Fruth  
-Wasif Mohammad  
-Stuart Tener  
-Fred Bader  
-Ken Morse  
-Nico Boehr  
-Trevor Vardeman  
-Matt Mondics  
-Klaus Smolin  
-Amadeus Podvratnik  
-Miao Zhang-Cohen  
+Thank you!
+
+* Fred Bader
+* Nico Boehr
+* Veera Damisetti
+* Jacob Emery
+* Patrick Fruth
+* Filipe Miranda
+* Matt Mondics
+* Ken Morse
+* Wasif Mohammad
+* Amadeus Podvratnik
+* Klaus Smolin
+* Stuart Tener
+* Trevor Vardeman
+* Phillip Wilson
+* Miao Zhang-Cohen
diff --git a/docs/images/0-setup.png b/docs/images/0-setup.png
diff --git a/docs/images/1-create-lpars.png b/docs/images/1-create-lpars.png
diff --git a/docs/images/2-create-hypervisors.png b/docs/images/2-create-hypervisors.png
diff --git a/docs/images/3-setup-hypervisors.png b/docs/images/3-setup-hypervisors.png
diff --git a/docs/images/4-create-bastion.png b/docs/images/4-create-bastion.png
diff --git a/docs/images/5-setup-bastion.png b/docs/images/5-setup-bastion.png
diff --git a/docs/images/6-create-nodes.png b/docs/images/6-create-nodes.png
diff --git a/docs/images/7-ocp-verification.png b/docs/images/7-ocp-verification.png
diff --git a/docs/images/environment.png b/docs/images/environment.png
diff --git a/docs/images/install-complete.png b/docs/images/install-complete.png
diff --git a/docs/images/overview.png b/docs/images/overview.png
diff --git a/docs/index.md b/docs/index.md
@@ -1,7 +1,7 @@
 # Ansible-Automated OpenShift Provisioning on KVM on IBM zSystems / LinuxONE
 ## Overview
-These Ansible Playbooks automate the setup and deployment of a Red Hat OpenShift Container Platform (RHOCP) cluster on IBM zSystems / LinuxONE with Kernel Virtual Machine (KVM) as the hypervisor.  
-<img src="images/overview.png" width="75%"/>
+These Ansible Playbooks automate the setup and deployment of a Red Hat OpenShift Container Platform (RHOCP) cluster on IBM zSystems / LinuxONE using Kernel-based Virtual Machine (KVM) as the hypervisor.  
+<img src="images/overview.png" width="85%"/>
 ## Ready to Start?
 Use the left-hand panel to navigate the site. Start with the [Before You Begin](before-you-begin.md) page.
 ## Need Help?

diff --git a/docs/prerequisites.md b/docs/prerequisites.md
@@ -5,8 +5,8 @@
 * [License](https://access.redhat.com/products/red-hat-openshift-container-platform/) or [free trial](https://www.redhat.com/en/technologies/cloud-computing/openshift/try-it) of Red Hat OpenShift Container Platform for IBM Z systems - s390x architecture (comes with the required licenses for Red Hat Enterprise Linux (RHEL) and CoreOS)
 ## IBM zSystems
 * Hardware Management Console (HMC) access on IBM zSystems or LinuxONE
-* In order to use the [playbook](https://github.com/IBM/Ansible-OpenShift-Provisioning/blob/main/playbooks/2_create_kvm_host.yaml) that automates the creation of the KVM host Dynamic Partition Manager (DPM) mode is required.
-    * If DPM mode is not an option for your environment, that playbook can be skipped, but a bare-metal RHEL server must be set-up on an LPAR manually (Filipe Miranda's [how-to article](https://www.linkedin.com/pulse/demystifying-install-process-red-hat-enterprise-linux-filipe-miranda/)) before moving on. Once that is done, continue with the [playbook 3](https://github.com/IBM/Ansible-OpenShift-Provisioning/blob/main/playbooks/3_setup_kvm_host.yaml) that sets up the KVM host.
+* In order to use the [playbook](https://github.com/IBM/Ansible-OpenShift-Provisioning/blob/main/playbooks/2_create_hypervisors.yaml) that automates the creation of the KVM host Dynamic Partition Manager (DPM) mode is required.
+    * If DPM mode is not an option for your environment, that playbook can be skipped, but a bare-metal RHEL server must be set-up on an LPAR manually (Filipe Miranda's [how-to article](https://www.linkedin.com/pulse/demystifying-install-process-red-hat-enterprise-linux-filipe-miranda/)) before moving on. Once that is done, continue with the [playbook 3](https://github.com/IBM/Ansible-OpenShift-Provisioning/blob/main/playbooks/3_setup_hypervisors.yaml) that sets up the KVM host.
 * For a minimum installation, at least:
     * 6 Integrated Facilities for Linux (IFLs) with SMT2 enabled
     * 85 GB of RAM
@@ -15,8 +15,8 @@
 ## File Server
 * A file server accessible from your IBM zSystems / LinuxONE server.
 * Either FTP or HTTP service configured and active.
-* Once a RHEL server is installed natively on the LPAR, pre-existing or configured by this automation, (i.e. the KVM host), you can use that as the file server. 
-* If you are not using a pre-existing KVM host(s) and need to create them using this automation, you must use an FTP server because the HMC does not support HTTP.
+* Once a RHEL server is installed natively on the LPAR, pre-existing or configured by this automation, (i.e. hypervisors), you can use that as the file server if using NAT-based networking. 
+* If you are not using pre-existing hypervisor(s) and need to create them using this automation, you must use an FTP server because the HMC does not support HTTP.
 * A user with sudo and SSH access on that server.
 * A DVD ISO file of Red Hat Enterprise Linux (RHEL) 8 for s390x architecture mounted in an accessible folder (e.g. /home/<user>/rhel/ for FTP or /var/www/html/rhel for HTTP)
     * If you do not have RHEL for s390x yet, go to the Red Hat [Customer Portal](https://access.redhat.com/downloads/content) and download it.
@@ -49,42 +49,21 @@
 * The computer/virtual machine running Ansible, sometimes referred to as localhost.
 * Must be running on with MacOS or Linux operating systems.
 * Network access to your IBM zSystems / LinuxONE hardware
-* All you need to run Ansible is a terminal and a text editor. However, an IDE like [VS Code](https://code.visualstudio.com/download) is highly recommended for an integrated, user-friendly experience with helpful extensions like [YAML](https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml).
-* [Python3](https://realpython.com/installing-python/) installed:
-    * MacOS, first install [Homebrew](https://brew.sh/) package manager:
-        ```
-        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-        ```
-        then install Python3
-        ```
-        brew install python3 #MacOS
-        ```
-    * Fedora:
-        ```
-        sudo dnf install python3 #Fedora
-        ```
-    * Debian:
-        ```
-        sudo apt install python3 #Debian
-        ```
-* Once Python3 is installed, you also need [Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) version 2.9 or above:
-```
-pip3 install ansible
-```
-* Once Ansible is installed, you will need a few collections from Ansible Galaxy:
-```
-ansible-galaxy collection install community.general community.crypto ansible.posix community.libvirt
-```
-* If you will be using these playbooks to automate the creation of the LPAR(s) that will act as KVM host(s) for the cluster, you will also need:
+* You'll need at least a terminal and a text editor. However, an IDE like [VS Code](https://code.visualstudio.com/download) is highly recommended for an integrated, user-friendly experience with helpful extensions like [YAML](https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml) and [Ansible](https://marketplace.visualstudio.com/items?itemName=redhat.ansible).
+###### After step 3, once you have set all the variables and are ready to run the playbooks...
+* Run one of the setup shell scripts, based on whether you are using Mac or Linux (Red Hat based distribtions) as your Ansible Controller:
 ```
-ansible-galaxy collection install ibm.ibm_zhmc 
+./setup_mac.sh
 ```
-* If you are using MacOS, you also need to have [Xcode](https://apps.apple.com/us/app/xcode/id497799835?mt=12):
+OR
 ```
-xcode-select --install
+./setup_rhel.sh
 ```
+* These scripts install software dependencies, install Ansible itself, install Ansible Galaxy collections, and kick off the first Ansible playbook.
+* These are very simple shell scripts, if they throw an error, open them up and see what commands are being used and run them manually if needed.
+* The last command of the setup script runs an Ansible Playbook, 0_setup.yaml, which installs additional software, runs pre-flight checks and connects to the file server in preparation for the next playbook.
 ## Jumphost for NAT network
-* If for KVM network NAT is used, instead of macvtap, a ssh tunnel using a jumphost is required to access the OCP cluster. To configure the ssh tunnel expect is required on the jumphost. Expect will be installed during the setup of the bastion (4_setup_bastion.yaml playbook). In case of missing access to install additional packages, install it manually on the jumphost by executing following command:
+* If for hypervisor network NAT is used, instead of macvtap, an SSH tunnel using a jumphost is required to access the OCP cluster. To configure the ssh tunnel expect is required on the jumphost. Expect will be installed during the setup of the bastion (4_setup_bastion.yaml playbook). In case of missing access to install additional packages, install it manually on the jumphost by executing following command:
 ```
 yum install expect 
 ```

diff --git a/docs/run-the-playbooks-for-hypershift.md b/docs/run-the-playbooks-for-hypershift.md