Merge pull request #1090 from IBM/sh-531

#1081 OLM_UTILS_IMAGE environment variable needed for other cpd-cli c…

Author: fketelaars

automation-roles/50-install-cloud-pak/cp4d/cp4d-apply-entitlement/tasks/cp4d-apply-single-entitlement.yml

@@ -9,4 +9,6 @@
     _p_command_description: Apply entitlement {{ _p_entitlement }}
     _p_command: "{{ _apply_entitlement_command }}"
     _p_command_log_file: "{{ status_dir }}/log/{{ current_cp4d_cluster.project }}-apply-entitlement.log"
+    _p_command_environment:
+      OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
     _p_cpd_cli_manage: True

automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/cp4d-setup-mcg-secrets.yml

@@ -8,4 +8,6 @@
   vars:
     _p_command_description: Set up Multicloud Object Gateway (MCG) secrets for {{ _p_component }} in project {{ _p_current_cp4d_cluster.project }}, logs are in {{ status_dir }}/log/{{ _p_current_cp4d_cluster.project }}-{{ _current_cp4d_cartridge.olm_utils_name }}-setup-mcg.log
     _p_command: "{{ _setup_mcg_command }}"
+    _p_command_environment:
+      OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
     _p_cpd_cli_manage: True

automation-roles/50-install-cloud-pak/cp4d/cp4d-case-save/tasks/main.yml

@@ -12,6 +12,8 @@
     _p_command_description: Download case files
     _p_command: "{{ _case_download_command }}"
     _p_command_log_file: "{{ status_dir }}/log/{{ _p_current_cp4d_cluster.project }}-case-download.log"
+    _p_command_environment:
+      OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
     _p_cpd_cli_manage: True
 
 - name: Remove {{ status_dir }}/work/offline to remove any previous CASE files

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

@@ -52,6 +52,8 @@
       _p_command_description: Generate authorize instance command for project {{ current_cp4d_cluster.project }}
       _p_command: "{{ _authorize_instance_command }}"
       _p_command_log_file: "{{ status_dir }}/log/{{ current_cp4d_cluster.project }}-authorize-instance.log"
+      _p_command_environment:
+        OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
       _p_cpd_cli_manage: True
 
   - name: Generate setup instance topology command for project {{ current_cp4d_cluster.project }} for CP4D 5.0.0 and lower

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

@@ -184,6 +184,8 @@
         _p_command: "{{ _mirror_model_images }}"
         _p_command_log_file: "{{ status_dir }}/log/{{ _p_current_cp4d_cluster.project }}-mirror-model-images.log"
         _p_command_failed_when: False
+        _p_command_environment:
+          OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
         _p_cpd_cli_manage: True
 
     - set_fact:
@@ -206,6 +208,8 @@
     _p_command: "{{ _mirror_images }}"
     _p_command_log_file: "{{ status_dir }}/log/{{ _p_current_cp4d_cluster.project }}-mirror-images.log"
     _p_command_failed_when: False
+    _p_command_environment:
+      OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
     _p_cpd_cli_manage: True
 
 - set_fact:

automation-roles/50-install-cloud-pak/cp4d/cp4d-scheduling-service/tasks/install-scheduler.yml

@@ -21,4 +21,6 @@
     _p_command_description: Apply scheduler
     _p_command: "{{ _apply_scheduler_command }}"
     _p_command_log_file: "{{ status_dir }}/log/{{ current_cp4d_cluster.project }}-apply-scheduler.log"
+    _p_command_environment:
+      OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
     _p_cpd_cli_manage: True

automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/get-cr-status.yml

@@ -13,6 +13,8 @@
   vars:
     _p_activity_description: "Get status of CRs for project {{ _p_current_cp4d_cluster.project }}"
     _p_activity_command: "{{ _get_cr_status_command }}"
+    _p_command_environment:
+      OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
     _p_cpd_cli_manage: True
 
 - name: Run get-cr-status command 

docker-scripts/env-command.sh

@@ -48,12 +48,8 @@ else
   echo "No existing OpenShift configuration found, you will need to login to OpenShift first."
 fi
 
-OLM_UTILS_IMAGE_PREFIX=$(cat $(ls -1 /cloud-pak-deployer/.version-info/olm-utils-v*.txt | tail -1) | cut -d: -f1)
-OLM_UTILS_IMAGE_DIGEST=$(jq -r '.manifests[0].digest' $(ls -1 /cloud-pak-deployer/.version-info/olm-utils-v*manifest.json | tail -1))
-export OLM_UTILS_IMAGE="${OLM_UTILS_IMAGE_PREFIX}@${OLM_UTILS_IMAGE_DIGEST}"
-echo "Environment variable OLM_UTILS_IMAGE set to ${OLM_UTILS_IMAGE}"
-
-echo
+# Set environment variables
+source ${SCRIPT_DIR}/../scripts/deployer/set-env-var.sh
 
 export PATH=${PATH}:/cloud-pak-deployer
 cd /cloud-pak-deployer

docker-scripts/run_automation.sh

@@ -27,6 +27,9 @@ cd ${SCRIPT_DIR}/..
 # Retrieve version info
 source ./.version-info/version-info.sh
 
+# Set environment variables
+source ./scripts/deployer/set-env-var.sh
+
 # Show login info
 show_deployer_info() {
   if [[ "$SUBCOMMAND" == "environment" && "${ACTION}" == "apply" ]];then
@@ -100,6 +103,7 @@ env|environment)
   run_cmd+=" --extra-vars cpd_accept_licenses=${CPD_ACCEPT_LICENSES}"
   run_cmd+=" --extra-vars ARCH=${ARCH}"
   run_cmd+=" --extra-vars IMAGE_ARCH=${IMAGE_ARCH}"
+  run_cmd+=" --extra-vars OLM_UTILS_IMAGE=${OLM_UTILS_IMAGE}"
 
   if [ ! -z $VAULT_PASSWORD ];then
     run_cmd+=" --extra-vars VAULT_PASSWORD=${VAULT_PASSWORD}"

scripts/deployer/set-env-var.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )
+
+# Set OLM_UTILS_IMAGE environment variable, needed for most cpd-cli commands
+OLM_UTILS_IMAGE_PREFIX=$(cat $(ls -1 ${SCRIPT_DIR}/../../.version-info/olm-utils-v*.txt | tail -1) | cut -d: -f1)
+OLM_UTILS_IMAGE_DIGEST=$(jq -r '.manifests[0].digest' $(ls -1 ${SCRIPT_DIR}/../../.version-info/olm-utils-v*manifest.json | tail -1))
+export OLM_UTILS_IMAGE="${OLM_UTILS_IMAGE_PREFIX}@${OLM_UTILS_IMAGE_DIGEST}"
+echo "Environment variable OLM_UTILS_IMAGE set to ${OLM_UTILS_IMAGE}"