resolved merge conflicts

.ansible-lint-ignore

@@ -1,2 +1,3 @@
 zos_subsystems/zcee/provisioning/roles/zcee_reserve_ports/tasks/main.yml syntax-check[specific]
-zos_subsystems/ims/ims_provisioning/roles/ims_initialize/tasks/main.yml syntax-check[specific]
+zos_subsystems/ims/ims_provisioning/roles/ims_initialize/tasks/main.yml syntax-check[specific]
+zos_subsystems/ims/ims_provisioning_wazi/roles/ims_initialize/tasks/main.yml syntax-check[specific]

README.md

@@ -15,7 +15,7 @@ The collections can be found on
 and [Automation Hub](https://www.ansible.com/products/automation-hub).
 For additional content, review our [community page](http://ibm.biz/BdfsTR).
 
-This repository is frequently updated to refresh content. We recommend that you clone the
+This repository is frequently updated to refresh content. We recommend that you clone 
 the repository and configure your GitHub
 [notifications and subscriptions](https://docs.github.com/en/github/managing-subscriptions-and-notifications-on-github/about-notifications#notifications-and-subscriptions)
 to receive ongoing updates about specific activity on GitHub.
@@ -60,8 +60,12 @@ often repeated and in need of automation.
   - [Copy and Fetch Data sets](zos_concepts/data_transfer/copy_fetch_data_set)
   - [Copy, Sort and Fetch Data Sets on z/OS using Ansible](zos_concepts/data_transfer/copy_sort_fetch)- \[[Playback](https://mediacenter.ibm.com/media/Copy%2C+sort%2C+and+fetch+data+on+z+OS+using+Ansible/1_ah4qhyvu)]
   - [Terse Data Set and Fetch](zos_concepts/data_transfer/terse_fetch_data_set)
+  - [Dump, Archive, Fetch, Copy and Unarchive Data Sets](zos_concepts/data_transfer/archive_copy_unarchive_restore)
   - [Transfer, Dump and Unpack Data Sets](zos_concepts/data_transfer/dump_pack_ftp_unpack_restore)
   - [Grow ZFS aggregates](zos_concepts/zfsadm/zfs_grow_aggr)
+  - [Copy templates to z/OS](zos_concepts/templates/copy_template)
+  - [Use templated job cards and JCL to submit jobs](zos_concepts/templates/submit_job_template)
+  - [Use templates for compiling and linking libraries](zos_concepts/templates/loadlib)
 - Integrating Existing Automation
   - [Job Control Language](zos_concepts/jobs) (JCL)
     - [Submit Batch Jobs, Query and Retrieve Job Output](zos_concepts/jobs/submit_query_retrieve)
@@ -71,7 +75,9 @@ often repeated and in need of automation.
   - [Invoking REST APIs using the URI module](zos_concepts/rest_apis)
 - Provisioning
   - [IMS](zos_subsystems/ims)
+    - [Deploy an IMS Cobol App](zos_subsystems/ims/ims_cobol_deploy)
     - [Provision a new IMS TMDB subsystem](zos_subsystems/ims/ims_provisioning)
+    - [Provision a new IMS TMDB subsystem for Wazi](zos_subsystems/ims/ims_provisioning_wazi)
   - [ZCEE](zos_subsystems/zcee)
     - [Provision a new z/OS Connect EE subsystem](zos_subsystems/zcee/provisioning)
   - [WLP](zos_subsystems/wlp)
@@ -94,6 +100,8 @@ often repeated and in need of automation.
     - [Provision a Db2 schema instance](zos_subsystems/db2/db2_schema_provisioning)
     - [Discover registered Db2 applications](zos_subsystems/db2/db2_discover_applications)
     - [Discover registered Db2 subsystems](zos_subsystems/db2/db2_discover_subsystems)
+  - [IMS](zos_subsystems/ims)
+    - [Enable IMS catalog and managed ACBs](zos_subsystems/ims/enable_catalog_macb)
 - Software Installation
   - [SMP/E Playbooks](https://github.com/IBM/z_ansible_collections_samples/tree/master/zos_concepts/software_management)
 - Security
@@ -131,7 +139,7 @@ For further reading on how playbook projects are organized in this repository,
 review the following [documentation](./docs/share/contribution-guidelines.md#playbook-structure).
 
 ## Copyright
-© Copyright IBM Corporation 2020, 2021
+© Copyright IBM Corporation 2020 - 2023
 
 ## License
 Licensed under

collections/requirements.yml

@@ -11,7 +11,7 @@ collections:
   - name: ibm.ibm_zos_cics
     version: 1.0.4
   - name: ibm.ibm_zos_core
-    version: 1.6.0-beta.1
+    version: 1.7.0-beta.2
   - name: ibm.ibm_zos_ims
     version: 1.1.0
   - name: ibm.ibm_zosmf

z_infra_provisioning/cloud_infra_center/ocp_upi/README.md

@@ -233,7 +233,7 @@ icic-services status
 
 If you meet any **not running** service or **failed** message, check the IBM Cloud Infrastructure Center [Troubleshooting](https://www.ibm.com/docs/en/cic/1.1.6?topic=troubleshooting) document to fix before running the ansible playbook.
 
-9. Subnet DNS
+9. Set Subnet DNS
 
 **Note**: This step is required for KVM, z/VM is optional.
 
@@ -249,7 +249,24 @@ $ openstack subnet set --no-dns-nameservers <use_network_subnet>
 $ openstack subnet set --dns-nameserver 198.51.100.86 <use_network_subnet>
 ```
 
-For the multiple Openshift Container Platform, user can create multiple subnets or tenant network to deploy it. 
+
+10. Support to deploy multiple OCPs with multiple networks
+
+Now we support the following scenarios for multiple ocps :
+- Deploy multiple OCPs on ZVM multi-vlan network. You can refer ICIC doc to [create ZVM multiple vlan networks](https://www.ibm.com/docs/en/cic/1.2.0?topic=mfvc-zvm-multiple-vlan-networks-pass-through-different-zvm-vswitchesthe-first-time-configuration) then choose one network and set the network in the related inventory.yaml file section.
+
+- Deploy multiple OCPs on ZVM multi-flat network. You can refer ICIC doc to [create ZVM multiple flat networks](https://www.ibm.com/docs/en/cic/1.2.0?topic=configuration-zvm-multiple-flat-networksthe-first-time) then choose one network and set the network in the related inventory.yaml file section.
+
+- Deploy multiple OCPs on KVM multi-vlan network. You can refer ICIC doc to [create KVM multiple vlan networks](https://www.ibm.com/docs/en/cic/1.2.0?topic=mfvc-kvm-multiple-vlan-networks-that-pass-through-different-osasthe-first-time-configuration) then choose one network and set the network in the related inventory.yaml file section.
+
+- Deploy multiple OCPs on KVM multi-flat network. You can refer ICIC doc to [create KVM multiple flat networks](https://www.ibm.com/docs/en/cic/1.2.0?topic=configuration-kvm-multiple-flat-networksthe-first-time) then choose one network and set the network in the related inventory.yaml file section.
+
+- Deploy multiple OCPs on KVM flat+vlan network. You can refer ICIC doc to [create KVM flat+vlan networks](https://www.ibm.com/docs/en/cic/1.2.0?topic=mfvc-kvm-multiple-flat-vlan-networks-pass-through-different-osasconfigured-already) then choose one network and set the network in the related inventory.yaml file section.
+
+- Deploy multiple OCPs on ZVM in one project use single network by custom DNS
+
+  you can set different custom DNS IP values in the related inventory.yaml file then to deploy multiple OCPs.
+
 
 ### 4. Download this playbook on your Linux server
 
@@ -314,6 +331,8 @@ Others are **optional**, you can enable them and update value if you need more s
 | `additional_certs` |`{{ lookup('file', '/opt/registry/certs/domain.crt') \| indent (width=2) }}`| The local mirror registry repo additionally need SSL certificated to be accessed, those can be added cert file via the `additional_certs` variable.
 | `create_server_timeout` |10| Default is 10 minutes that used to create instances and volumes from backend storage provider
 
+**Note**: Check [OpenShift on a single node](./SNO.md) for how to define single node cluster.
+
 ## Creation of the cluster
 
 1. **Step1**:

z_infra_provisioning/cloud_infra_center/ocp_upi/SNO.md

@@ -0,0 +1,51 @@
+For development and test purpose, you can define a [openshift on a single node, SNO](https://docs.openshift.com/container-platform/4.13/installing/installing_sno/install-sno-installing-sno.html) cluster with following steps:
+
+update inventory.yaml from default 3 control nodes and 3 compute nodes to 1 control and compute node. This apply to both z/VM and KVM.
+```
+os_control_nodes_number: 1
+os_compute_nodes_number: 0
+```
+
+Then follow the other steps of Openshift deployment, finally you will get a cluster like following:
+
+```
+# oc get node
+NAME                         STATUS   ROLES                         AGE   VERSION
+openshiftji-dm5dv-master-0   Ready    control-plane,master,worker   48m   v1.25.4+a34b9e9
+
+# oc get co
+NAME                                       VERSION   AVAILABLE   PROGRESSING   DEGRADED   SINCE   MESSAGE
+authentication                             4.12.3    True        False         False      24m
+baremetal                                  4.12.3    True        False         False      45m
+cloud-controller-manager                   4.12.3    True        False         False      47m
+cloud-credential                           4.12.3    True        False         False      48m
+cluster-autoscaler                         4.12.3    True        False         False      44m
+config-operator                            4.12.3    True        False         False      45m
+console                                    4.12.3    True        False         False      19m
+control-plane-machine-set                  4.12.3    True        False         False      45m
+csi-snapshot-controller                    4.12.3    True        False         False      25m
+dns                                        4.12.3    True        False         False      42m
+etcd                                       4.12.3    True        False         False      37m
+image-registry                             4.12.3    True        False         False      28m
+ingress                                    4.12.3    True        False         False      45m
+insights                                   4.12.3    True        False         False      37m
+kube-apiserver                             4.12.3    True        False         False      37m
+kube-controller-manager                    4.12.3    True        False         False      41m
+kube-scheduler                             4.12.3    True        False         False      41m
+kube-storage-version-migrator              4.12.3    True        False         False      45m
+machine-api                                4.12.3    True        False         False      45m
+machine-approver                           4.12.3    True        False         False      45m
+machine-config                             4.12.3    True        False         False      43m
+marketplace                                4.12.3    True        False         False      45m
+monitoring                                 4.12.3    True        False         False      23m
+network                                    4.12.3    True        False         False      46m
+node-tuning                                4.12.3    True        False         False      45m
+openshift-apiserver                        4.12.3    True        False         False      37m
+openshift-controller-manager               4.12.3    True        False         False      27m
+openshift-samples                          4.12.3    True        False         False      23m
+operator-lifecycle-manager                 4.12.3    True        False         False      45m
+operator-lifecycle-manager-catalog         4.12.3    True        False         False      45m
+operator-lifecycle-manager-packageserver   4.12.3    True        False         False      37m
+service-ca                                 4.12.3    True        False         False      45m
+storage                                    4.12.3    True        False         False      45m
+```