diff --git a/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/tasks/install-cert-manager-operator.yml b/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/tasks/install-cert-manager-operator.yml index 07d6177e6..6e96318bc 100644 --- a/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/tasks/install-cert-manager-operator.yml +++ b/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/tasks/install-cert-manager-operator.yml @@ -21,7 +21,7 @@ vars: _p_subscr_name: "openshift-cert-manager-operator" _p_namespace: "cert-manager-operator" - _p_channel: "stable-v1" + _p_channel: "stable-v1.13" _p_subscr_source: "redhat-operators" - name: "Return default project back to {{ current_cp4i_cluster.project }}" diff --git a/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/tasks/install-cp4i.yml b/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/tasks/install-cp4i.yml index aac66d195..23b104917 100644 --- a/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/tasks/install-cp4i.yml +++ b/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/tasks/install-cp4i.yml @@ -41,7 +41,7 @@ - name: "Check if new installation style is needed based on specified Cloud Pak for Integration version {{ current_cp4i_cluster.cp4i_version }}" set_fact: _new_style: True - when: current_cp4i_cluster.cp4i_version >= '2023.4' + when: current_cp4i_cluster.cp4i_version >= '2023.4' or current_cp4i_cluster.cp4i_version >= '16.1.0' - debug: var: _new_style @@ -161,4 +161,4 @@ - name: "Ensure the status log folder exists" file: path: "{{status_dir}}/log" - state: directory \ No newline at end of file + state: directory diff --git a/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/vars/versions.yml b/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/vars/versions.yml index 6dda3e16f..e81da82fa 100644 --- a/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/vars/versions.yml +++ b/automation-roles/50-install-cloud-pak/cp4i/cp4i-cluster/vars/versions.yml @@ -1,5 +1,180 @@ + version_specific_properties: +- cp4i_version: 16.1.0.1 + instance_types: + + - type: platform-navigator + name: integration-navigator + license: L-JTPV-KYG8TF + channel: v7.3-sc2 + case_version: 7.3.1 + template: cp4i-platform-navigator-2 + + - type: api-management + name: apic1 + license: L-DZZQ-MGVN8V + version: 10.0.8.0 + channel: v5.2-sc2 + case_version: 5.2.0 + template: api-management-2 + + - type: automation-assets + name: asset-repo1 + license: L-JTPV-KYG8TF + version: 4.0.2-sc2 + channel: v1.7-sc2 + case_version: 1.7.2 + template: automation-assets-2 + + - type: enterprise-gateway + name: data-power1 + admin_password_secret: '' + license: L-WRRP-ZHFMSQ + version: 10.6-lts + channel: v1.11-sc2 + case_version: 1.11.1 + template: enterprise-gateway-2 + + - type: event-endpoint-management + name: eepm1 + license: L-JTPV-KYG8TF + version: latest + channel: v11.2 + case_version: 11.2.3 + template: event-endpoint-management-2 + + - type: event-streams + name: es1 + license: L-JTPV-KYG8TF + version: latest + channel: v3.4 + case_version: 3.4.0 + template: event-streams-2 + + - type: high-speed-transfer-server + name: aspera1 + aspera_key: '' + version: 4.4.4 + channel: v1.5 + case_version: 1.5.13 + + - type: integration-dashboard + name: ace1 + license: L-XRNH-47FJAW + version: '12.0' + channel: v12.2 + case_version: 12.2.1 + template: integration-dashboard-2 + + - type: integration-design + name: designer1 + license: L-XRNH-47FJAW + version: '12.0' + channel: v12.2 + case_version: 12.2.1 + template: integration-design-2 + + - type: messaging + name: mq1 + queue_manager_name: QUICKSTART + license: L-JTPV-KYG8TF + version: 9.4.0.0-r3 + channel: v3.2-sc2 + case_version: 3.2.3 + template: messaging-2 + + - type: foundational-services + channel: v4.6 + case_version: 4.6.5 + +- cp4i_version: 16.1.0.0 + instance_types: + + - type: platform-navigator + name: integration-navigator + license: L-JTPV-KYG8TF + channel: v7.3-sc2 + case_version: 7.3.0 + template: cp4i-platform-navigator-2 + + - type: api-management + name: apic1 + license: L-DZZQ-MGVN8V + version: 10.0.8.0 + channel: v5.2-sc2 + case_version: 5.2.0 + template: api-management-2 + + - type: automation-assets + name: asset-repo1 + license: L-JTPV-KYG8TF + version: 4.0-sc2 + channel: v1.7-sc2 + case_version: 1.7.0 + template: automation-assets-2 + + - type: enterprise-gateway + name: data-power1 + admin_password_secret: '' + license: L-WRRP-ZHFMSQ + version: 10.6-lts + channel: v1.11-sc2 + case_version: 1.11.0 + template: enterprise-gateway-2 + + - type: event-endpoint-management + name: eepm1 + license: L-JTPV-KYG8TF + version: latest + channel: v11.2 + case_version: 11.2.0+20240603.010000 + template: event-endpoint-management-2 + + - type: event-streams + name: es1 + license: L-JTPV-KYG8TF + version: latest + channel: v3.4 + case_version: 3.4.0 + template: event-streams-2 + + - type: high-speed-transfer-server + name: aspera1 + aspera_key: '' + version: 4.4.4 + channel: v1.5 + case_version: 1.5.13 + + - type: integration-dashboard + name: ace1 + license: L-XRNH-47FJAW + version: '12.0' + channel: v12.0-sc2 + case_version: 12.0.0 + template: integration-dashboard-2 + + - type: integration-design + name: designer1 + license: L-XRNH-47FJAW + version: '12.0' + channel: v12.0-sc2 + case_version: 12.0.0 + template: integration-design-2 + + - type: messaging + name: mq1 + queue_manager_name: QUICKSTART + license: L-JTPV-KYG8TF + version: 9.4.0.0-r1 + channel: v3.2-sc2 + case_version: 3.2.1 + template: messaging-2 + + - type: foundational-services + channel: v4.6 + case_version: 4.6.3 + - cp4i_version: 2023.4.1-0 instance_types: diff --git a/sample-configurations/cp4i-existing-ocp/config/sample-cp4i.yaml b/sample-configurations/cp4i-existing-ocp/config/sample-cp4i.yaml index ea619608a..a14282d9c 100644 --- a/sample-configurations/cp4i-existing-ocp/config/sample-cp4i.yaml +++ b/sample-configurations/cp4i-existing-ocp/config/sample-cp4i.yaml @@ -1,6 +1,7 @@ --- global_config: + environment_name: sample cloud_platform: existing-ocp confirm_destroy: False @@ -10,9 +11,9 @@ vault: openshift: - name: "{{ env_id }}" - ocp_version: "4.14" + ocp_version: "4.15" cluster_name: "{{ env_id }}" - domain_name: 658a76f3fb5859001139d5cf.cloud.techzone.ibm.com + domain_name: 66c7293ebb681e681e0d02fc.ocp.techzone.ibm.com openshift_storage: - storage_name: techzone storage_type: custom @@ -27,7 +28,7 @@ image_registry: cp4i: - project: cp4i openshift_cluster_name: "{{ env_id }}" - cp4i_version: 2023.4.1-0 + cp4i_version: 16.1.0.1 accept_licenses: true instances: