diff --git a/managed-openshift/ibmcloud/cpd_install/scripts/dmc-cr.yaml b/managed-openshift/ibmcloud/cpd_install/scripts/dmc-cr.yaml new file mode 100644 index 00000000..b19f8f16 --- /dev/null +++ b/managed-openshift/ibmcloud/cpd_install/scripts/dmc-cr.yaml @@ -0,0 +1,12 @@ +apiVersion: dmc.databases.ibm.com/v1 +kind: Dmcaddon +metadata: + name: dmcaddon-cr +spec: + namespace: CPD_NAMESPACE + storageClass: "portworx-shared-gp3" + pullPrefix: cp.icr.io/cp/cpd + version: "4.0.0" + license: + accept: true + license: Enterprise \ No newline at end of file diff --git a/managed-openshift/ibmcloud/cpd_install/scripts/install-dmc.sh b/managed-openshift/ibmcloud/cpd_install/scripts/install-dmc.sh index 74b56e6c..74f8d897 100755 --- a/managed-openshift/ibmcloud/cpd_install/scripts/install-dmc.sh +++ b/managed-openshift/ibmcloud/cpd_install/scripts/install-dmc.sh @@ -29,20 +29,11 @@ sleep 5m oc project ${NAMESPACE} -cat << EOF | oc apply -f - -apiVersion: dmc.databases.ibm.com/v1 -kind: Dmcaddon -metadata: - name: dmcaddon-cr -spec: - namespace: zen - storageClass: "portworx-shared-gp3" - pullPrefix: cp.icr.io/cp/cpd - version: "4.0.0" - license: - accept: true - license: Enterprise -EOF +# Create dmc CR: +sed -i -e s#CPD_NAMESPACE#${NAMESPACE}#g dmc-cr.yaml +echo '*** executing **** oc create -f dmc-cr.yaml' +result=$(oc create -f dmc-cr.yaml) +echo $result # checking status of dmc-operator ./pod-status-check.sh ibm-dmc-controller ${OP_NAMESPACE} diff --git a/managed-openshift/ibmcloud/cpd_install/scripts/install-wkc.sh b/managed-openshift/ibmcloud/cpd_install/scripts/install-wkc.sh index 663d050b..183785fd 100755 --- a/managed-openshift/ibmcloud/cpd_install/scripts/install-wkc.sh +++ b/managed-openshift/ibmcloud/cpd_install/scripts/install-wkc.sh @@ -30,7 +30,7 @@ cloudctl case launch --case ${CASE_PACKAGE_NAME} \ # switch to zen namespace -oc project zen +oc project ${NAMESPACE} # # Install wkc Customer Resource