Merge pull request #1118 from IBM/sov-core

#1117 Add from_oci property to cp4d

Author: fketelaars

automation-roles/50-install-cloud-pak/cp4d/cp4d-case-save/templates/case-download.j2

@@ -1,6 +1,6 @@
 case-download \
     --release={{ _p_cp4d_version }} \
-{% if not (_cp_alt_repo_used | default(False)) -%}
+{% if not (_cp_alt_repo_used | default(False)) and (_p_current_cp4d_cluster.from_oci | default(True)) -%}
     --from_oci=true \
 {% endif -%}
 {% if _p_cp4d_version >= '5.3.0' -%}

automation-roles/50-install-cloud-pak/cp4d/cp4d-catalog-source/templates/apply-olm-create-catsrc.j2

@@ -1,7 +1,7 @@
 apply-olm \
     --release={{ _p_cp4d_version }} \
     --case_download={%- if cpd_airgap | default(False) | bool -%}false{%- else -%}true{%- endif %} \
-{% if not (_cp_alt_repo_used | default(False)) -%}
+{% if not (_cp_alt_repo_used | default(False)) and (_p_current_cp4d_cluster.from_oci | default(True)) -%}
     --from_oci=true \
 {% endif -%}   
     --catsrc=true --sub=false \

automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/tasks/install-cp4d.yml

@@ -30,6 +30,7 @@
     _p_openshift_cluster_name: "{{ current_cp4d_cluster.openshift_cluster_name }}"
     _p_license_threads_per_core: "{{ _cp_fs.license_service.threads_per_core | default(1) }}"
     _p_ibm_cert_manager: "{{ current_cp4d_cluster.ibm_cert_manager | default(false) }}"
+    _p_from_oci: "{{ current_cp4d_cluster.from_oci | default(True) }}"
     _p_migrate_topology: False
     _p_preview: False
 

automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/templates/setup-instance-topology.j2

@@ -2,7 +2,7 @@ setup-instance-topology \
     --cpd_operator_ns={{ current_cp4d_cluster.operators_project }} \
     --cpd_instance_ns={{ current_cp4d_cluster.project }} \
     --release={{ _p_cp4d_version }} \
-{% if not (_cp_alt_repo_used | default(False)) -%}
+{% if not (_cp_alt_repo_used | default(False)) and (current_cp4d_cluster.from_oci | default(True)) -%}
     --from_oci=true \
 {% endif -%}   
     --block_storage_class={{ ocp_storage_class_block }} \

automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/templates/setup-instance.j2

@@ -2,7 +2,7 @@ setup-instance \
     --cpd_operator_ns={{ current_cp4d_cluster.operators_project }} \
     --cpd_instance_ns={{ current_cp4d_cluster.project }} \
     --release={{ _p_cp4d_version }} \
-{% if not _cp_alt_repo_used -%}
+{% if not (_cp_alt_repo_used | default(False)) and (current_cp4d_cluster.from_oci | default(True)) -%}
     --from_oci=true \
 {% endif -%}   
     --block_storage_class={{ ocp_storage_class_block }} \

automation-roles/50-install-cloud-pak/cp4d/cp4d-prepare-openshift/templates/deploy-knative-eventing.j2

@@ -2,6 +2,6 @@ deploy-knative-eventing \
     --release={{ _p_cp4d_version }} \
     --block_storage_class={{ ocp_storage_class_block }} \
     --events_operator_ns=ibm-knative-events \
-{% if not (_cp_alt_repo_used | default(False)) -%}
+{% if not (_cp_alt_repo_used | default(False)) and (current_cp4d_cluster.from_oci | default(True)) -%}
     --from_oci=true
 {% endif -%}   

automation-roles/50-install-cloud-pak/cpfs/cp-fs-cluster-components/tasks/main.yml

@@ -2,6 +2,7 @@
 - set_fact:
     _threads_per_core: "{{ _p_license_threads_per_core | default(1) }}"
     _ibm_cert_manager: "{{ _p_ibm_cert_manager | default(False) | bool }}"
+    _from_oci: "{{ _p_from_oci | default(True) | bool }}"
 
 - include_role:
     name: cp4d-get-latest-version

automation-roles/50-install-cloud-pak/cpfs/cp-fs-cluster-components/templates/apply-cluster-components.j2

@@ -1,7 +1,7 @@
 apply-cluster-components \
     --release={{ _p_cp4d_version }} \
     --license_acceptance=true \
-{% if not (_cp_alt_repo_used | default(False)) -%}
+{% if not (_cp_alt_repo_used | default(False)) and (_from_oci | default(True)) -%}
     --from_oci=true \
 {% endif -%}   
 {% if _p_migrate_topology | default(False) -%}