Fix: Issue 433 - UPI installion not working (#434)

This is regression inside of UPI installation and KVM. 
Several fixes including doc update.

Fix was tested using latest OCP version (default) for a four node
cluster:
# oc get no
NAME STATUS ROLES AGE VERSION
t313-odf-master-0.t313-odf.lnxero1.boe Ready control-plane,master 105m
v1.33.5
t313-odf-master-1.t313-odf.lnxero1.boe Ready control-plane,master 105m
v1.33.5
t313-odf-master-2.t313-odf.lnxero1.boe Ready control-plane,master 105m
v1.33.5
t313-odf-worker-0.t313-odf.lnxero1.boe Ready worker 90m v1.33.5

Signed-off-by: Amadeuds Podvratnik <[email protected]>

Author: AmadeusPodvratnik

docs/set-variables-group-vars.md

@@ -181,7 +181,7 @@
 **ocp_install_tgz** | OpenShift installer filename (tar.gz). | openshift-install-linux.tar.gz
 **rhcos_download_url** | Link to the CoreOS files to be used for the bootstrap, control and compute nodes. Feel free to change to a different version. | https://mirror.openshift.com/pub/openshift-v4/multi/clients/ocp/latest/s390x/
 **rhcos_os_variant** | CoreOS base OS. Use the OS string as defined in 'osinfo-query os -f short-id' | rhl9
-**rhcos_live_kernel** | CoreOS kernel filename to be used for the bootstrap, control and compute nodes. | rhcos-live-kernel-s390x
+**rhcos_live_kernel** | CoreOS kernel filename to be used for the bootstrap, control and compute nodes. | rhcos-live-kernel.s390x
 **rhcos_live_initrd** | CoreOS initramfs to be used for the bootstrap, control and compute nodes. | rhcos-live-initramfs.s390x.img
 **rhcos_live_rootfs** | CoreOS rootfs to be used for the bootstrap, control and compute nodes. | rhcos-live-rootfs.s390x.img
 

playbooks/6_create_nodes.yaml

@@ -33,7 +33,7 @@
   roles:
     - { role: prep_kvm_guests, when: env.cluster.nodes.bootstrap.vm_name not in hosts_with_host_vars }
     # Delete control, compute and infra nodes, if exists
-    - { role: delete_nodes, when: env.cluster.nodes.bootstrap.vm_name not in hosts_with_host_vars }
+    - { role: delete_nodes, when: (hosts_with_host_vars|length == 0) or env.cluster.nodes.bootstrap.vm_name not in hosts_with_host_vars }
 
 - name: 6 create nodes - create bootstrap
   hosts: kvm_host[0]
@@ -42,7 +42,7 @@
     - "{{ inventory_dir }}/group_vars/all.yaml"
   roles:
     - { role: common,  when: env.cluster.nodes.bootstrap.vm_name not in hosts_with_host_vars }
-    - { role: create_bootstrap, when: env.cluster.nodes.bootstrap.vm_name not in hosts_with_host_vars }
+    - { role: create_bootstrap, when: (hosts_with_host_vars|length == 0) or env.cluster.nodes.bootstrap.vm_name not in hosts_with_host_vars }
 
 - name: 6 create nodes - bootstrap and control ( if in lpar )
   hosts: bastion

roles/boot_LPAR/defaults/main.yaml

@@ -1,7 +1,7 @@
 # rhcos_download_url with '/' at the end !
 rhcos_download_url: "https://mirror.openshift.com/pub/openshift-v4/s390x/dependencies/rhcos/latest/"
-   
+
 # RHCOS live image filenames
-rhcos_live_kernel: "rhcos-live-kernel-s390x"
+rhcos_live_kernel: "rhcos-live-kernel.s390x"
 rhcos_live_initrd: "rhcos-live-initramfs.s390x.img"
 rhcos_live_rootfs: "rhcos-live-rootfs.s390x.img"

roles/create_bootstrap/defaults/main.yaml

@@ -4,6 +4,6 @@ rhcos_download_url: "https://mirror.openshift.com/pub/openshift-v4/s390x/depende
 rhcos_os_variant: rhl9
 
 # RHCOS live image filenames
-rhcos_live_kernel: "rhcos-live-kernel-s390x"
+rhcos_live_kernel: "rhcos-live-kernel.s390x"
 rhcos_live_initrd: "rhcos-live-initramfs.s390x.img"
 rhcos_live_rootfs: "rhcos-live-rootfs.s390x.img"

roles/create_compute_node/defaults/main.yaml

@@ -4,6 +4,6 @@ rhcos_download_url: "https://mirror.openshift.com/pub/openshift-v4/s390x/depende
 rhcos_os_variant: rhl9
 
 # RHCOS live image filenames
-rhcos_live_kernel: "rhcos-live-kernel-s390x"
+rhcos_live_kernel: "rhcos-live-kernel.s390x"
 rhcos_live_initrd: "rhcos-live-initramfs.s390x.img"
 rhcos_live_rootfs: "rhcos-live-rootfs.s390x.img"

roles/create_compute_nodes/defaults/main.yaml

@@ -4,6 +4,6 @@ rhcos_download_url: "https://mirror.openshift.com/pub/openshift-v4/s390x/depende
 rhcos_os_variant: rhl9
 
 # RHCOS live image filenames
-rhcos_live_kernel: "rhcos-live-kernel-s390x"
+rhcos_live_kernel: "rhcos-live-kernel.s390x"
 rhcos_live_initrd: "rhcos-live-initramfs.s390x.img"
 rhcos_live_rootfs: "rhcos-live-rootfs.s390x.img"

roles/create_control_nodes/defaults/main.yaml

@@ -4,6 +4,6 @@ rhcos_download_url: "https://mirror.openshift.com/pub/openshift-v4/s390x/depende
 rhcos_os_variant: rhl9
 
 # RHCOS live image filenames
-rhcos_live_kernel: "rhcos-live-kernel-s390x"
+rhcos_live_kernel: "rhcos-live-kernel.s390x"
 rhcos_live_initrd: "rhcos-live-initramfs.s390x.img"
 rhcos_live_rootfs: "rhcos-live-rootfs.s390x.img"