Merge branch 'master' into py312

Author: durera

CONTRIBUTING.md

@@ -77,7 +77,7 @@ It is possible to develop the Ansible roles without needing to build the collect
   vars:
     cluster_type: rosa
     cluster_name: fvtrosa
-    ocp_version: "4.15.17"
+    ocp_version: "4.19.14"
 
   roles:
     - ocp_provision

build/bin/build-collection.sh

@@ -13,8 +13,8 @@ cat $GITHUB_WORKSPACE/ibm/mas_devops/galaxy.yml
 
 
 # Update this when we have new catalog
-MAS_PREVIOUS_CATALOG='v9-251010-amd64'
-MAS_LATEST_CATALOG='v9-251030-amd64'
+MAS_PREVIOUS_CATALOG='v9-251030-amd64'
+MAS_LATEST_CATALOG='v9-251127-amd64'
 
 
 # Update all the placeholders in the playbooks

docs/execution-environment.md

@@ -225,7 +225,7 @@ If you need to set an environment variable then you can do this in the playbook
   vars:
     cluster_name: testcluster
     cluster_type: rosa
-    ocp_version: 4.14.35
+    ocp_version: 4.19.14
     rosa_compute_nodes: 3
 
   environment:

ibm/mas_devops/playbooks/ocp_rosa_provision.yml

@@ -2,7 +2,7 @@
 - hosts: localhost
   vars:
     cluster_type: rosa
-    ocp_version: "{{ lookup('env', 'OCP_VERSION') | default('4.15.17', True) }}"
+    ocp_version: "{{ lookup('env', 'OCP_VERSION') | default('4.19.14', True) }}"
 
     # We use "turbonomic_target_name" as a key to indicate that we want to run the turbonomic role
     turbonomic_target_name: "{{ lookup('env', 'TURBONOMIC_TARGET_NAME') }}"

ibm/mas_devops/roles/mongodb/tasks/providers/community/validate-upgrade.yml

@@ -68,7 +68,6 @@
   assert:
     that: mongodb_v7_upgrade
     fail_msg: "Your current mongo version is {{ existing_mongo_version }}, in order to upgrade to version {{ target_mongodb_version }}, you must set 'mongodb_v7_upgrade': true"
-
 # This would validate that, we only upgrade to v8.0 if 'target_mongodb_version' matches v8.0 minor version and 'mongodb_v8_upgrade: true'
 - name: "Assert that the Mongo v8 upgrade has been triggered"
   when:

ibm/mas_devops/roles/ocp_provision/README.md

@@ -22,14 +22,14 @@ Specify the name of the cluster
 - Default Value: None
 
 ### ocp_version
-The version of OCP to use.  A specific version can be set, minor and patch level versions can be used, e.g. `4.15`, or `4.15.16`.  Additionally, two version aliases are available; `default` will auto-select the newest version of OCP currently supported by IBM Maximo Application Suite, `rotate` will auto-select a predetermined version of OCP currently supported by IBM Maximo Application Suite based on the day of the week.  This latter option is primarily useful for testing purposes.
+The version of OCP to use.  A specific version can be set, minor and patch level versions can be used, e.g. `4.19`, or `4.19.14`.  Additionally, two version aliases are available; `default` will auto-select the newest version of OCP currently supported by IBM Maximo Application Suite, `rotate` will auto-select a predetermined version of OCP currently supported by IBM Maximo Application Suite based on the day of the week.  This latter option is primarily useful for testing purposes.
 
 - **Required**
 - Environment Variable: `OCP_VERSION`
 - Default Value: None
 
 !!! note
-    When using the IBMCloud Red Hat OpenShift Service (ROKS) the version must be followed by `_openshift`, e.g. **4.15_openshift** or **4.15.16_openshift**
+    When using the IBMCloud Red Hat OpenShift Service (ROKS) the version must be followed by `_openshift`, e.g. **4.19_openshift** or **4.19.14_openshift**
 
 ### ocp_storage_provider
 Setting this to `nfs` when `cluster_type` is set to `fyre` will create an `nfs-client` storage class connected to the infrastucture node. When enabled, the existing image registry PVC will also be deleted and recreated configured to use the newly available NFS storage class.