Skip to content

Commit 2df4667

Browse files
committed
fixes to leverage ocp-v certs
1 parent c74b22b commit 2df4667

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

9.0.x/pipeline-run.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ spec:
1515
- name: uds-lastname
1616
value: "Developer"
1717
- name: use-letsencrypt-certs
18-
value: "false"
18+
value: "true"
19+
#lets encrypt secret location and namespace
20+
- name: tlscert-secret
21+
value: "user-serving-cert-000"
22+
- name: tlscert-namespace
23+
value: "openshift-kube-apiserver"
1924
- name: ibm-entitlement-key
2025
value: "false"
2126
#mas-license-secret
@@ -29,7 +34,7 @@ spec:
2934

3035
# install MAS Core. This task may be skipped once done successfully
3136
- name: mas-install-core
32-
value: "false"
37+
value: "true"
3338

3439
# install MAS Manage, depending on MAS Core, optionally CP4D/DB2
3540
- name: mas-install-manage

9.0.x/pipeline.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ spec:
307307
cp $(workspaces.ws.path)/masconfig/certs/core/* $(workspaces.ws.path)/masconfig/certs/aibroker/
308308
309309
# copy letsencrypt-certs secret to the name where maximo is expecting to find it.
310-
if oc get secret -n openshift-ingress router-certs-default; then
311-
echo "router-certs-default secret already exists"
312-
else
313-
oc get secret $(params.TLSCERT_SECRET_LOCATION) -n $(params.TLSCERT_SECRET_NAMESPACE) -o yaml | yq '.metadata["name"]="router-certs-default"' | oc apply -n openshift-ingress -f -
314-
fi
310+
#if oc get secret -n openshift-ingress router-certs-default; then
311+
# echo "router-certs-default secret already exists"
312+
#else
313+
# oc get secret $(params.TLSCERT_SECRET_LOCATION) -n $(params.TLSCERT_SECRET_NAMESPACE) -o yaml | yq '.metadata["name"]="router-certs-default"' | oc apply -n openshift-ingress -f -
314+
#fi
315315
exit
316316
- name: install-mas-core
317317
when:
@@ -482,6 +482,8 @@ spec:
482482
export CPD_SERVICE_STORAGE_CLASS=$(params.rwx-storageclass)
483483
export CPD_SERVICE_BLOCK_STORAGE_CLASS=$(params.rwo-storageclass)
484484
485+
mkdir -p $MAS_CONFIG_DIR
486+
485487
# Cloud Pak for Data Platform (~1 1/2 hours)
486488
ROLE_NAME=ibm_catalogs ansible-playbook ibm.mas_devops.run_role
487489
ROLE_NAME=cp4d ansible-playbook ibm.mas_devops.run_role

0 commit comments

Comments
 (0)