Merge pull request #178 from IIG/CPD4.0_dev

minor changes

managed-openshift/ibmcloud/cpd_install/cpd.tf

@@ -20,7 +20,7 @@ resource "null_resource" "bedrock_zen_operator" {
 
     working_dir = "${path.module}/scripts/"
     interpreter = ["/bin/bash", "-c"]
-    command = "./install_bedrock_zen_operator.sh"
+    command = "./install-bedrock-zen-operator.sh"
   }
 
   depends_on = [
@@ -41,7 +41,7 @@ resource "null_resource" "install_ccs" {
 
     working_dir = "${path.module}/scripts/"
     interpreter = ["/bin/bash", "-c"]
-    command = "./install_ccs.sh"
+    command = "./install-ccs.sh"
   }
 
   depends_on = [
@@ -161,7 +161,7 @@ resource "null_resource" "install_wsl" {
 
     working_dir = "${path.module}/scripts/"
     interpreter = ["/bin/bash", "-c"]
-    command = "./install_wsl.sh"
+    command = "./install-wsl.sh"
   }
 
   depends_on = [

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 

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}