Merge pull request #613 from IBM/revert-612-fk-misc

Revert "Air-gapped installation issues"

automation-roles/50-install-cloud-pak/cp4d/cp4d-catalog-source/tasks/create-catalog-source-olm-utils.yml

@@ -21,7 +21,7 @@
 - name: If air-gapped, copy case files from {{ status_dir }}/cp4d/offline to /tmp/work/offline
   copy:
     src: "{{ status_dir }}/cp4d/offline"
-    dest: /tmp/work/
+    dest: /tmp/work/offline
     remote_src: True
   when: (cpd_airgap | default(False) | bool)
 

automation-roles/50-install-cloud-pak/cp4d/cp4d-mirror-images/tasks/main.yml

@@ -116,12 +116,6 @@
   failed_when: False
   register: _mirror_images
 
-- name: Copy case files from /tmp/work/offline to {{ status_dir }}/cp4d/
-  copy:
-    src: /tmp/work/offline
-    dest: "{{ status_dir }}/cp4d/"
-    remote_src: True
-
 - name: Stop script that mirrors log files
   file:
     path: "/tmp/mirroring-complete.txt"

automation-roles/50-install-cloud-pak/cp4d/cp4d-ocp-icsp-manta/tasks/create-icsp-manta.yml

@@ -0,0 +1,7 @@
+---
+- name: Create ImageContentSourcePolicy {{ icsp_name }} yaml
+  template:
+    src: cloud-pak-icsp-manta.j2
+    dest: "{{ status_dir }}/openshift/cloud-pak-icsp-manta.yaml"
+- name: Create ImageContentSourcePolicy {{ icsp_name }}
+  shell: "oc apply -f {{ status_dir }}/openshift/cloud-pak-icsp-manta.yaml"  

automation-roles/50-install-cloud-pak/cp4d/cp4d-ocp-icsp-manta/tasks/main.yml

@@ -0,0 +1,11 @@
+---
+- debug:
+    var: _cartridges_to_install
+
+- name: Create ImageContentSourcePolicy for Manta
+  include_tasks: create-icsp-manta.yml
+  when: _mco_exists
+
+- name: Apply ImageContentSourcePolicy settings if the Machine Config Operator does not exist
+  include_tasks: non-mco-apply-icsp-manta.yml
+  when: not _mco_exists

automation-roles/50-install-cloud-pak/cp4d/cp4d-ocp-icsp-manta/tasks/non-mco-apply-icsp-manta.yml

@@ -0,0 +1,10 @@
+---
+- name: Create Manta registry configuration (ImageContentSourcePolicy) on ROKS
+  template:
+    src: cloud-pak-icsp-registries-manta-conf.j2
+    dest: "{{ status_dir }}/openshift/cloud-pak-icsp-registries-manta.conf"
+
+- name: Set data for config map
+  shell: |
+    oc set data cm/cloud-pak-node-fix-config -n kube-system \
+      --from-file={{ status_dir }}/openshift/cloud-pak-icsp-registries-manta.conf

automation-roles/50-install-cloud-pak/cp4d/cp4d-ocp-icsp-manta/templates/cloud-pak-icsp-manta.j2

@@ -0,0 +1,9 @@
+apiVersion: operator.openshift.io/v1alpha1
+kind: ImageContentSourcePolicy
+metadata:
+  name: manta
+spec:
+  repositoryDigestMirrors:
+  - mirrors:
+    - icr.io/cpopen
+    source: repo.getmanta.com/manta-ubi8-ibm

automation-roles/50-install-cloud-pak/cp4d/cp4d-ocp-icsp-manta/templates/cloud-pak-icsp-registries-manta-conf.j2

@@ -0,0 +1,7 @@
+[[registry]]
+  prefix = ""
+  location = "repo.getmanta.com/manta-ubi8-ibm"
+  mirror-by-digest-only = true
+
+  [[registry.mirror]]
+  location = "icr.io/cpopen"

automation-roles/50-install-cloud-pak/cp4d/cp4d-ocp-icsp-manta/vars/main.yml

@@ -0,0 +1,2 @@
+---
+icsp_name: manta-mirror-config

cp-deploy.sh

@@ -595,18 +595,6 @@ if ! $INSIDE_CONTAINER;then
   fi
 fi
 
-# If images have not been overridden, set the variables here
-if [ -z $CPD_OLM_UTILS_V1_IMAGE ];then
-  export CPD_OLM_UTILS_V1_IMAGE=icr.io/cpopen/cpd/olm-utils:latest
-else
-  echo "Custom olm-utils image ${CPD_OLM_UTILS_V1_IMAGE} will be used."
-fi
-if [ -z $CPD_OLM_UTILS_V2_IMAGE ];then
-  export CPD_OLM_UTILS_V2_IMAGE=icr.io/cpopen/cpd/olm-utils-v2:latest
-else
-  echo "Custom olm-utils-v2 image ${CPD_OLM_UTILS_V2_IMAGE} will be used."
-fi
-
 if ! $INSIDE_CONTAINER;then
   # Check if podman or docker command was found
   if [ -z $CPD_CONTAINER_ENGINE ];then
@@ -638,6 +626,13 @@ if ! $INSIDE_CONTAINER;then
     chmod +x ${SCRIPT_DIR}/.version-info/version-info.sh
     # Show version info
     cat ${SCRIPT_DIR}/.version-info/version-info.sh
+    # If images have not been overridden, set the variables here
+    if [ -z $CPD_OLM_UTILS_V1_IMAGE ];then
+      export CPD_OLM_UTILS_V1_IMAGE=icr.io/cpopen/cpd/olm-utils:latest
+    fi
+    if [ -z $CPD_OLM_UTILS_V2_IMAGE ];then
+      export CPD_OLM_UTILS_V2_IMAGE=icr.io/cpopen/cpd/olm-utils-v2:latest
+    fi
     # Build the image
     ${CPD_CONTAINER_ENGINE} build -t cloud-pak-deployer:${CPD_IMAGE_TAG} \
       --pull \
@@ -894,22 +889,12 @@ if ! $INSIDE_CONTAINER;then
   fi
 fi
 
-# If download action, save Deployer and olm-utils images
+# If download action, save Deployer image
 if [[ "${ACTION}" == "download" ]] && ! ${CHECK_ONLY};then
   echo "Removing old archives for deployer container image"
   rm -f ${STATUS_DIR}/downloads/cloud-pak-deployer-image.tar
   echo "Saving Deployer container image cloud-pak-deployer:${CPD_IMAGE_TAG} into ${STATUS_DIR}/downloads/cloud-pak-deployer-image.tar"
   ${CPD_CONTAINER_ENGINE} save -o ${STATUS_DIR}/downloads/cloud-pak-deployer-image.tar cloud-pak-deployer:${CPD_IMAGE_TAG}
-
-  echo "Removing old archives for olm-utils container image"
-  rm -f ${STATUS_DIR}/downloads/olm-utils-image.tar
-  echo "Saving container image ${CPD_OLM_UTILS_V1_IMAGE} into ${STATUS_DIR}/downloads/olm-utils-image.tar"
-  ${CPD_CONTAINER_ENGINE} save -o ${STATUS_DIR}/downloads/olm-utils-image.tar ${CPD_OLM_UTILS_V1_IMAGE}
-
-  echo "Removing old archives for olm-utils-v2 container image"
-  rm -f ${STATUS_DIR}/downloads/olm-utils-v2-image.tar
-  echo "Saving container image ${CPD_OLM_UTILS_V2_IMAGE} into ${STATUS_DIR}/downloads/olm-utils-v2-image.tar"
-  ${CPD_CONTAINER_ENGINE} save -o ${STATUS_DIR}/downloads/olm-utils-v2-image.tar ${CPD_OLM_UTILS_V2_IMAGE}
 fi
 
 # Build command when not running inside container