rhosp

Author: AC

kubernetes/storage/ceph/README.adoc

@@ -31,17 +31,6 @@ helm repo add ceph-csi https://ceph.github.io/csi-charts
 helm repo update
 ----
 
-== Create Ceph Pool
-
-Create Ceph pool, failesyste and subvolume for Kubernetes & client key
-
-[sourec,bash]
-----
-ansible-playbook kubernetes/storage/ceph/ansible/60-proxmox-create-cephfs-pool.yaml \
-  -e @kubernetes/storage/ceph/ansible/defaults/main.yaml \
-  -e proxmox_host=${PROXMOX_HOST}
-----
-
 == Ansible Inventory
 
 .05-storage.yaml
@@ -82,7 +71,7 @@ kubernetes:
             k8s_role: control-plane
             hw:
               ram: 16384 # In MiB
-              vcpu: 4
+              vcpu: 4  
               storage: 150 # In GiB
       vars:
         ceph_cluster: ceph_01
@@ -92,6 +81,26 @@ kubernetes:
         ceph_fs_subvolume: csi
 ----
 
+
+== Ceph Rados Block Device (RBD)
+
+References:
+
+* https://docs.ceph.com/en/latest/rbd/rbd-kubernetes/
+
+
+== Ceph CephFS
+
+
+Create Ceph pool, failesystem and subvolume for Kubernetes & client key.
+
+[sourec,bash]
+----
+ansible-playbook kubernetes/storage/ceph/ansible/60-proxmox-create-cephfs-pool.yaml \
+  -e @kubernetes/storage/ceph/ansible/defaults/main.yaml \
+  -e proxmox_host=${PROXMOX_HOST}
+----
+
 == Collect information
 
 Define environment variables.

ocp/4.15/README.adoc

@@ -1,4 +1,4 @@
-= OCP UPI Installation on Proxmox
+= OCP 4.15.x Installation
 Antonio C. <sp38af (at) trikorasolutions (dot) com>
 :revdate: {docdate}
 :icons: font
@@ -7,51 +7,44 @@ Antonio C. <sp38af (at) trikorasolutions (dot) com>
 :toc-title: Table of Contents
 :description: OCP UPI Installation on Proxmox
 
-== Introduction
+== Acronyms
 
-[.lead]
-This document describes the OCP installation process using UPI. It automates 
- the instructions found at https://blog.rossbrigoli.com/2020/11/running-openshift-at-home-part-44.html.
+OCP::
+RedHat OpenShift Container Platform
 
-References:
+RHOSP::
+RedHat Open Stack Platform
 
-* https://docs.openshift.com/container-platform/4.15/installing/installing_bare_metal/installing-bare-metal.html#installing-bare-metal
+UPI::
+User-provisioned infrastructure
 
-=== Services host
+== Introduction
 
-[source,bash]
-----
-OCP_CLI_INSTALL_DIR=/tmp<1>
-RH_CLUSTER_PULL_SECRET=<2>
-SSH_PUB_KEY_FILE=<3>
-----
-<1>
-<2> Get a Red Hat pull secret by logging in to https://cloud.redhat.com. 
- Navigate to _Cluster Manager > Create Cluster > Red Hat Openshift Container Platform > Run on Baremetal > User-Provisioned Infrastructure_
- and press _Copy pull secret_.
-<3>
+[.lead]
+The different sections linked by this document describe the installation 
+ process for OCP 4.15.x on different platforms.
 
-[source,bash]
-----
-ansible-playbook ocp/4.15/upi/ansible/ocp-services-02-gen-playbook.yaml \
-  -e @ocp/4.15/upi/ansible/defaults/main.yaml
-----
+[#collect-information]
+== Collect information
 
-Use `openshift-install` to create the Kubernetes manifests and Ignition 
- configuration files for the cluster.
+Collect all the information required for the deployment.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/upi/ansible/ocp-services-03-oi-playbook.yaml \
-  -e @ocp/4.15/upi/ansible/defaults/main.yaml \
-  -e @_local_config/network.yaml \
-  -e pull_secret=${RH_CLUSTER_PULL_SECRET} \
-  -e ssh_pub_key_file=${SSH_PUB_KEY_FILE}
+RH_CLUSTER_PULL_SECRET='{"auths":{"cloud.openshift.com":...'<1>
+SSH_PUB_KEY_FILE=~/.ssh/id_rsa_somefile.pub<2>
 ----
+<1> RedHat Openshift cloud pull secret.
+ Get a Red Hat pull secret by going to https://cloud.redhat.com/.
+ Select the _Access the Console_ link and login to the link:https://console.redhat.com/[Hybrid Cloud console].
+ Open the _Services_ dropdown and navigate to _Platform > Red Hat OpenShift_. 
+ On the _OpenShift > Overview_ page navigate to _Cluster List_, using the left menu, and press _Create Cluster_. 
+ Under the cluster type tab select _Local_ and press the _Copy pull secret_.
+<2> SSH public key used to access the cluster hosts
 
-[source,bash]
-----
-ansible-playbook ocp/4.15/upi/ansible/ocp-services-10-config-playbook.yaml -K \
-  -e @ocp/4.15/upi/ansible/defaults/main.yaml
-----
+== Select platform
+
+The following platforms are available:
 
+* link:upi_proxmox//[OCP UPI Installation on Proxmox]
+* link:upi_rhosp/[OCP Installation on UPI RHOSP]

…ansible/02-ocp-services-oi-binaries.yaml …ansible/02-ocp-services-oi-binaries.yamlocp/4.15/install_upi/ansible/02-ocp-services-oi-binaries.yaml renamed to ocp/4.15/ansible/02-ocp-services-oi-binaries.yaml ocp/4.15/install_upi/ansible/02-ocp-services-oi-binaries.yaml renamed to ocp/4.15/ansible/02-ocp-services-oi-binaries.yaml

@@ -0,0 +1,7 @@
+ocp_install_root_dir: "openshift"
+ocp_install_root_dir_under_user_home: true
+ocp_release_arch: amd64
+ocp_version: 4.15.46
+
+ocp_cluster_name: ocp
+use_compute_nodes: false

ocp/4.15/ansible/defaults/main.yaml

@@ -215,8 +215,8 @@ Execute the playbook that creates the VMs.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/01-proxmox-vms.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml \
+ansible-playbook ocp/4.15/upi_proxmox/ansible/01-proxmox-vms.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
   -e '{"selected_groups": ["ocp_control_plane","ocp_bootstrap"]}'
 ----
 
@@ -251,8 +251,9 @@ This will generate a directory with name defined on the `ocp_install_root_dir`
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/02-ocp-services-oi-binaries.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml
+ansible-playbook ocp/4.15/upi_proxmox/ansible/02-ocp-services-oi-binaries.yaml \
+  -e bootstrap_host=ocp_services
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
 ----
 
 [.lead]
@@ -278,8 +279,8 @@ Add `-K`, or `--ask-become-pass` if your host required password for sudo.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/10-ocp-services-config-host-playbook.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml
+ansible-playbook ocp/4.15/upi_proxmox/ansible/10-ocp-services-config-host-playbook.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml
 ----
 
 Configure HA Proxy.
@@ -295,8 +296,8 @@ Add `-K`, or `--ask-become-pass` if your host required password for sudo.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/15-ocp-services-haproxy-playbook.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml \
+ansible-playbook ocp/4.15/upi_proxmox/ansible/15-ocp-services-haproxy-playbook.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
   -e @_local_config/network.yaml
 ----
 
@@ -315,8 +316,8 @@ Add `-K`, or `--ask-become-pass` if your host required password for sudo.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/18-ocp-services-oi-playbook.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml \
+ansible-playbook ocp/4.15/upi_proxmox/ansible/18-ocp-services-oi-playbook.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
   -e @_local_config/network.yaml \
   -e pull_secret=${RH_CLUSTER_PULL_SECRET} \
   -e ssh_pub_key_file=${SSH_PUB_KEY_FILE}
@@ -336,8 +337,8 @@ This playbook will perform the following tasks for each of the Proxmox hosts con
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/20-proxmox-prepare-coreos-install.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml \
+ansible-playbook ocp/4.15/upi_proxmox/ansible/20-proxmox-prepare-coreos-install.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
   -e skip_download=true <1>
 ----
 <1> Optional variable to skip downloading the ISO if it is already downloaded.
@@ -347,8 +348,8 @@ Extract the installation sources and scripts from the `openshift-install`, as
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/25-ocp-services-show-rhcos-info.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml
+ansible-playbook ocp/4.15/upi_proxmox/ansible/25-ocp-services-show-rhcos-info.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml
 ----
 
 Execute the `coreos-installer` command obtained on the previous Ansible 
@@ -359,8 +360,8 @@ The VMs are setup so it's time to start the OpenShift cluster deployment.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/28-proxmox-vm-start-deployment.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml
+ansible-playbook ocp/4.15/upi_proxmox/ansible/28-proxmox-vm-start-deployment.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml
 ----
 
 === Followup on the deployment
@@ -413,8 +414,8 @@ Get the authentication.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/50-ocp-services-get-ocp-auth-playbook.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml
+ansible-playbook ocp/4.15/upi_proxmox/ansible/50-ocp-services-get-ocp-auth-playbook.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml
 ----
 
 === Copy the kubernetes config file
@@ -450,8 +451,8 @@ Add `-K`, or `--ask-become-pass` if your host required password for sudo.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/35-ocp-services-remove-bootstrap-haproxy-playbook.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml
+ansible-playbook ocp/4.15/upi_proxmox/ansible/35-ocp-services-remove-bootstrap-haproxy-playbook.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml
 ----
 
 == Add Compute Nodes
@@ -460,8 +461,8 @@ Generate compute node VMS.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/01-proxmox-vms.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml \
+ansible-playbook ocp/4.15/upi_proxmox/ansible/01-proxmox-vms.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
   -e '{"selected_groups": ["ocp_compute_node"]}'<1>
   -e '{"vm_host_list": ["ocp4-co-3"]}'<2>
 ----
@@ -474,8 +475,8 @@ Start the `compute-node` VMs to execute the ignition installation.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/20-proxmox-prepare-coreos-install.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml \
+ansible-playbook ocp/4.15/upi_proxmox/ansible/20-proxmox-prepare-coreos-install.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
   -e '{"selected_groups": ["ocp_compute_node"]}'
   -e '{"vm_host_list": ["ocp4-co-3"]}'
   -e skip_download=true
@@ -486,8 +487,8 @@ Extract the installation sources and scripts from the `openshift-install`, as
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/25-ocp-services-show-rhcos-info.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml
+ansible-playbook ocp/4.15/upi_proxmox/ansible/25-ocp-services-show-rhcos-info.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml
 ----
 
 Once all the VMs show the `Install complete` message the VMs are setup. It's 
@@ -496,8 +497,8 @@ Once all the VMs show the `Install complete` message the VMs are setup. It's
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/28-proxmox-vm-start-deployment.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml \
+ansible-playbook ocp/4.15/upi_proxmox/ansible/28-proxmox-vm-start-deployment.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
   -e '{"selected_groups": ["ocp_compute_node"]}'
   -e '{"vm_host_list": ["ocp4-co-3"]}'
 ----
@@ -540,8 +541,8 @@ The Openshift installation folder is required to maintain the cluster.
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/99-ocp-services-ocp-clean-playbook.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml \
+ansible-playbook ocp/4.15/upi_proxmox/ansible/99-ocp-services-ocp-clean-playbook.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml \
   -e remove_binaries_dir=true <1>
 ----
 <1> Also remove the folder containing the OpenShift binaries
@@ -556,8 +557,8 @@ Remove the taints on the nodes so the control-plane nodes can execute
 
 [source,bash]
 ----
-ansible-playbook ocp/4.15/install_upi/ansible/31-ocp-services-remove-cp-taints.yaml \
-  -e @ocp/4.15/install_upi/ansible/defaults/main.yaml
+ansible-playbook ocp/4.15/upi_proxmox/ansible/31-ocp-services-remove-cp-taints.yaml \
+  -e @ocp/4.15/upi_proxmox/ansible/defaults/main.yaml
 ----
 
 === No CNI configuration file in /etc/kubernetes/cni/net.d/. Has your network provider started? 

ocp/4.15/install_upi/README.adoc ocp/4.15/upi_proxmox/README.adococp/4.15/install_upi/README.adoc renamed to ocp/4.15/upi_proxmox/README.adoc

@@ -0,0 +1,70 @@
+---
+- name: "Generate OCP Cluster installation (deprecated)"
+  hosts: "ocp_services"
+  gather_facts: true
+
+  pre_tasks:
+  - name: "Validate required variables"
+    ansible.builtin.assert:
+      that:
+      - "ocp_install_root_dir is defined and ocp_install_root_dir | length > 0"
+
+  - name: "Set variables"
+    ansible.builtin.set_fact:
+      openshift_client_root_url: "https://mirror.openshift.com/pub/openshift-v4/{{ ocp_release_arch }}/clients/ocp/{{ ocp_version }}"
+
+  - name: "Define variables"
+    ansible.builtin.include_tasks:
+      file: tasks/set_ocp_install_dir.yaml
+
+  tasks:
+  - name: "Create openshift install root directory"
+    ansible.builtin.file:
+      path: "{{ openshift_install_dir }}"
+      state: directory
+      mode: '0755'
+
+  - name: "Get release information"
+    ansible.builtin.get_url:
+      url: "{{ openshift_client_root_url }}/release.txt"
+      dest: "{{ openshift_install_dir }}/"
+      # mode: '0440'
+
+  - name: "Get release image name"
+    ansible.builtin.shell: |
+      grep 'Pull From: quay.io' release.txt | awk -F ' ' '{print $3}'
+    args:
+      chdir: "{{ openshift_install_dir }}"
+    register: image_name_res
+
+  - name: "Print image name"
+    ansible.builtin.debug:
+      msg:
+        - "image_name_res: {{ image_name_res.stdout }}"
+
+  - name: "Download the ocp installer and client"
+    ansible.builtin.get_url:
+      url: "{{ openshift_client_root_url }}/{{ item }}"
+      dest: "{{ openshift_install_dir }}/{{ item }}"
+    loop:
+      - openshift-install-linux.tar.gz
+      - openshift-client-linux.tar.gz
+    when: skip_download is undefined or not (skip_download | bool)
+
+  - name: "Extract the ocp installer and client"
+    ansible.builtin.unarchive:
+      src: "{{ openshift_install_dir }}/{{ item }}"
+      dest: "{{ openshift_install_dir }}"
+      remote_src: true
+    loop:
+      - openshift-install-linux.tar.gz
+      - openshift-client-linux.tar.gz
+    when: skip_download is undefined or not (skip_download | bool)
+
+  - name: "Print image name"
+    ansible.builtin.debug:
+      msg:
+        - "Installation folder: {{ openshift_install_dir }}/"
+        - "image_name_res: {{ image_name_res.stdout }}"
+
+...