Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
prsahoo committed Jul 19, 2022
2 parents f877f76 + b02f5cd commit 499c36d
Show file tree
Hide file tree
Showing 81 changed files with 1,965 additions and 4,760 deletions.
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,21 @@ This repository contains automated scripts/deployment steps to get you started o

- [AWS](./ibmcloud-satellite/aws)

- [On-Premises](./ibmcloud-satellite/on-premises)
- [On-Premises](./ibmcloud-satellite/on-premises)

## Note regarding usage of the scripts

1. Installation

The automated scripts provided here are intended to get you started quickly in case of a fresh installation of the latest version of Cloud Pak for Data in an Express manner. The scripts perform end-to-end installation, starting from infrastructure provisioning, Openshift installation, Storage Setup and Cloud Pak for Data platform and services installation.

If you need to perform a customized installation please follow the steps at [Installing IBM Cloud Pak for Data](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.5.x?topic=installing).

2. Upgrade and Post-Installation activities

These scripts do not support upgrade of Cloud Pak for Data installations. Please see [Updating OpenShift Container Platform](https://docs.openshift.com/container-platform/4.10/updating/index.html) for upgrading RedHat Openshift Container Platform and [Upgrading Cloud Pak for Data](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.5.x?topic=upgrading) for upgrading IBM Cloud Pak for Data installation.

For Post-Installation activities on the cluster, please refer to the instructions at [Administering Cloud Pak for Data](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.5.x?topic=administering)



42 changes: 10 additions & 32 deletions common-modules/cpd/analyticsengine.tf
Original file line number Diff line number Diff line change
@@ -1,57 +1,35 @@

resource "local_file" "analyticsengine_catalog_yaml" {
content = data.template_file.analyticsengine_catalog.rendered
filename = "${local.cpd_workspace}/analyticsengine_catalog.yaml"
}
resource "local_file" "analyticsengine_cr_yaml" {
content = data.template_file.analyticsengine_cr.rendered
filename = "${local.cpd_workspace}/analyticsengine_cr.yaml"
}

resource "local_file" "analyticsengine_sub_yaml" {
content = data.template_file.analyticsengine_sub.rendered
filename = "${local.cpd_workspace}/analyticsengine_sub.yaml"
}

resource "null_resource" "install_analyticsengine" {
count = var.analytics_engine.enable == "yes" ? 1 : 0
count = var.analytics_engine == "yes" ? 1 : 0
triggers = {
namespace = var.cpd_namespace
cpd_workspace = local.cpd_workspace
}
provisioner "local-exec" {
command = <<-EOF
echo 'Create analyticsengine catalog'
oc create -f ${self.triggers.cpd_workspace}/analyticsengine_catalog.yaml
sleep 3
bash cpd/scripts/pod-status-check.sh ibm-cpd-ae-operator-catalog openshift-marketplace
echo 'Create analyticsengine sub'
oc create -f ${self.triggers.cpd_workspace}/analyticsengine_sub.yaml
sleep 3
bash cpd/scripts/pod-status-check.sh ibm-cpd-ae-operator ${local.operator_namespace}
echo "Deploying catalogsources and operator subscriptions for analytics engine" &&
bash cpd/scripts/apply-olm.sh ${self.triggers.cpd_workspace} ${var.cpd_version} analyticsengine &&
echo "Create analyics engine cr" &&
bash cpd/scripts/apply-cr.sh ${self.triggers.cpd_workspace} ${var.cpd_version} analyticsengine ${var.cpd_namespace} ${var.storage_option} ${local.storage_class} ${local.rwo_storage_class}
echo 'Create analyticsengine CR'
oc create -f ${self.triggers.cpd_workspace}/analyticsengine_cr.yaml
sleep 3
echo 'check the analyticsengine cr status'
bash cpd/scripts/check-cr-status.sh AnalyticsEngine analyticsengine-cr ${var.cpd_namespace} analyticsengineStatus
EOF
}
depends_on = [
local_file.analyticsengine_catalog_yaml,
local_file.spss_cr_yaml,
module.machineconfig,
null_resource.cpd_foundational_services,
null_resource.login_cluster,
null_resource.install_aiopenscale,
null_resource.install_wml,
null_resource.install_ws,
null_resource.install_spss,
null_resource.install_dods,
null_resource.install_dmc,
null_resource.install_bigsql,
null_resource.install_dv,
null_resource.install_mdm,
null_resource.install_cde,
null_resource.install_wkc,
null_resource.install_db2aaservice,
null_resource.install_ds,
]
}
38 changes: 7 additions & 31 deletions common-modules/cpd/bigsql.tf
Original file line number Diff line number Diff line change
@@ -1,50 +1,26 @@
resource "local_file" "bigsql_catalog_yaml" {
content = data.template_file.bigsql_catalog.rendered
filename = "${local.cpd_workspace}/bigsql_catalog.yaml"
}

resource "local_file" "bigsql_cr_yaml" {
content = data.template_file.bigsql_cr.rendered
filename = "${local.cpd_workspace}/bigsql_cr.yaml"
}

resource "local_file" "bigsql_sub_yaml" {
content = data.template_file.bigsql_sub.rendered
filename = "${local.cpd_workspace}/bigsql_sub.yaml"
}

resource "null_resource" "install_bigsql" {
count = var.bigsql.enable == "yes" ? 1 : 0
count = var.bigsql == "yes" ? 1 : 0
triggers = {
namespace = var.cpd_namespace
cpd_workspace = local.cpd_workspace
}
provisioner "local-exec" {
command = <<-EOF
echo "Creating BIGSQL catalog"
oc create -f ${self.triggers.cpd_workspace}/bigsql_catalog.yaml
bash cpd/scripts/pod-status-check.sh ibm-bigsql-operator-catalog openshift-marketplace
echo "Creating BIGSQL Operator through Subscription"
oc create -f ${self.triggers.cpd_workspace}/bigsql_sub.yaml
bash cpd/scripts/pod-status-check.sh ibm-bigsql-operator-controller-manager ${local.operator_namespace}
echo 'Create BIGSQL CR'
oc create -f ${self.triggers.cpd_workspace}/bigsql_cr.yaml
echo 'check the BIGSQL cr status'
bash cpd/scripts/check-cr-status.sh BigsqlService bigsql-service-cr ${var.cpd_namespace} reconcileStatus
echo "Deploying catalogsources and operator subscriptions for Db2 Big SQL" &&
bash cpd/scripts/apply-olm.sh ${self.triggers.cpd_workspace} ${var.cpd_version} bigsql &&
echo "Create Db2 Big SQL cr" &&
bash cpd/scripts/apply-cr.sh ${self.triggers.cpd_workspace} ${var.cpd_version} bigsql ${var.cpd_namespace} ${var.storage_option} ${local.storage_class} ${local.rwo_storage_class}
EOF
}
depends_on = [
local_file.bigsql_catalog_yaml,
local_file.bigsql_cr_yaml,
local_file.bigsql_sub_yaml,
null_resource.install_aiopenscale,
null_resource.install_wml,
null_resource.install_ws,
null_resource.install_spss,
null_resource.install_dods,
null_resource.install_dmc,
module.machineconfig,
null_resource.cpd_foundational_services,
null_resource.login_cluster,
Expand Down
43 changes: 9 additions & 34 deletions common-modules/cpd/cde.tf
Original file line number Diff line number Diff line change
@@ -1,54 +1,29 @@
resource "local_file" "cde_catalog_yaml" {
content = data.template_file.cde_catalog.rendered
filename = "${local.cpd_workspace}/cde_catalog.yaml"
}

resource "local_file" "cde_cr_yaml" {
content = data.template_file.cde_cr.rendered
filename = "${local.cpd_workspace}/cde_cr.yaml"
}

resource "local_file" "cde_sub_yaml" {
content = data.template_file.cde_sub.rendered
filename = "${local.cpd_workspace}/cde_sub.yaml"
}

resource "null_resource" "install_cde" {
count = var.cognos_dashboard_embedded.enable == "yes" ? 1 : 0
count = var.cognos_dashboard_embedded == "yes" ? 1 : 0
triggers = {
namespace = var.cpd_namespace
cpd_workspace = local.cpd_workspace
}
provisioner "local-exec" {
command = <<-EOF
echo "Deploying catalogsources and operator subscriptions for Cognos Dashboards" &&
bash cpd/scripts/apply-olm.sh ${self.triggers.cpd_workspace} ${var.cpd_version} cde &&
echo "Create Cognos Dashboards cr" &&
bash cpd/scripts/apply-cr.sh ${self.triggers.cpd_workspace} ${var.cpd_version} cde ${var.cpd_namespace} ${var.storage_option} ${local.storage_class} ${local.rwo_storage_class}
echo "Creating CDE Catalog"
oc create -f ${self.triggers.cpd_workspace}/cde_catalog.yaml
sleep 3
bash cpd/scripts/pod-status-check.sh ibm-cde-operator-catalog openshift-marketplace
echo "Creating CDE through Subscription"
oc create -f ${self.triggers.cpd_workspace}/cde_sub.yaml
sleep 3
bash cpd/scripts/pod-status-check.sh ibm-cde-operator ${local.operator_namespace}
echo 'Create CDE CR'
oc create -f ${self.triggers.cpd_workspace}/cde_cr.yaml
sleep 3
echo 'Check the CDE cr status'
bash cpd/scripts/check-cr-status.sh CdeProxyService cdeproxyservice-cr ${var.cpd_namespace} cdeStatus
EOF
}
depends_on = [
local_file.cde_catalog_yaml,
local_file.cde_cr_yaml,
local_file.cde_sub_yaml,
null_resource.install_aiopenscale,
null_resource.install_wml,
null_resource.install_ws,
null_resource.install_spss,
null_resource.install_dods,
null_resource.install_dmc,
null_resource.install_bigsql,
null_resource.install_dv,
null_resource.install_mdm,
module.machineconfig,
null_resource.cpd_foundational_services,
null_resource.login_cluster,
Expand Down
53 changes: 15 additions & 38 deletions common-modules/cpd/cognosanalytics.tf
Original file line number Diff line number Diff line change
@@ -1,59 +1,36 @@
resource "local_file" "ca_catalog_yaml" {
content = data.template_file.ca_catalog.rendered
filename = "${local.cpd_workspace}/ca_catalog.yaml"
}

resource "local_file" "ca_cr_yaml" {
content = data.template_file.ca_cr.rendered
filename = "${local.cpd_workspace}/ca_cr.yaml"
}

resource "local_file" "ca_sub_yaml" {
content = data.template_file.ca_sub.rendered
filename = "${local.cpd_workspace}/ca_sub.yaml"
}

resource "null_resource" "install_ca" {
count = var.cognos_analytics.enable == "yes" ? 1 : 0
count = var.cognos_analytics == "yes" ? 1 : 0
triggers = {
namespace = var.cpd_namespace
cpd_workspace = local.cpd_workspace
}
provisioner "local-exec" {
command = <<-EOF
echo 'Create CA catalog'
oc create -f ${self.triggers.cpd_workspace}/ca_catalog.yaml
sleep 3
bash cpd/scripts/pod-status-check.sh ibm-ca-operator-catalog openshift-marketplace
echo 'Create CA sub'
oc create -f ${self.triggers.cpd_workspace}/ca_sub.yaml
sleep 3
bash cpd/scripts/pod-status-check.sh ibm-ca-operator ${local.operator_namespace}
echo "Deploying catalogsources and operator subscriptions for Cognos Analytics" &&
bash cpd/scripts/apply-olm.sh ${self.triggers.cpd_workspace} ${var.cpd_version} cognos_analytics &&
echo "Create Cognos Analytics cr" &&
bash cpd/scripts/apply-cr.sh ${self.triggers.cpd_workspace} ${var.cpd_version} cognos_analytics ${var.cpd_namespace} ${var.storage_option} ${local.storage_class} ${local.rwo_storage_class}
echo "CA CR"
oc create -f ${self.triggers.cpd_workspace}/ca_cr.yaml
echo 'check the CA cr status'
bash cpd/scripts/check-cr-status.sh CAService ca-cr ${var.cpd_namespace} caAddonStatus
EOF
}
depends_on = [
local_file.ca_catalog_yaml,
local_file.ca_cr_yaml,
local_file.ca_sub_yaml,
null_resource.install_analyticsengine,
module.machineconfig,
null_resource.cpd_foundational_services,
null_resource.login_cluster,
null_resource.install_aiopenscale,
null_resource.install_wml,
null_resource.install_ws,
null_resource.install_spss,
null_resource.install_wkc,
null_resource.install_db2wh,
null_resource.install_dv,
null_resource.install_dods,
null_resource.install_dmc,
module.machineconfig,
null_resource.cpd_foundational_services,
null_resource.login_cluster,
null_resource.install_bigsql,
null_resource.install_dv,
null_resource.install_mdm,
null_resource.install_cde,
null_resource.install_wkc,
null_resource.install_ds,
null_resource.install_analyticsengine,
]
}
41 changes: 20 additions & 21 deletions common-modules/cpd/db2aaservice.tf
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
resource "local_file" "db2aaservice_cr_yaml" {
content = data.template_file.db2aaservice_cr.rendered
filename = "${local.cpd_workspace}/db2aaservice_cr.yaml"
}

resource "local_file" "db2aaservice_sub_yaml" {
content = data.template_file.db2aaservice_sub.rendered
filename = "${local.cpd_workspace}/db2aaservice_sub.yaml"
}

resource "null_resource" "install_db2aaservice" {
count = local.db2aaservice == "yes" ? 1 : 0
count = var.db2_aaservice == "yes" ? 1 : 0
triggers = {
namespace = var.cpd_namespace
cpd_workspace = local.cpd_workspace
}
provisioner "local-exec" {
command = <<EOF
echo "Db2uaaService"
oc create -f ${self.triggers.cpd_workspace}/db2aaservice_sub.yaml
sleep 3
bash cpd/scripts/pod-status-check.sh ibm-db2aaservice-cp4d-operator-controller-manager ${local.operator_namespace}
oc create -f ${self.triggers.cpd_workspace}/db2aaservice_cr.yaml
echo "Checking if the Db2uaaService pods are ready and running"
bash cpd/scripts/check-cr-status.sh Db2aaserviceService db2aaservice-cr ${var.cpd_namespace} db2aaserviceStatus
echo "Deploying catalogsources and operator subscriptions for CPD db2 aas component" &&
bash cpd/scripts/apply-olm.sh ${self.triggers.cpd_workspace} ${var.cpd_version} db2aaservice &&
echo "Create CPD db2 aas component cr" &&
bash cpd/scripts/apply-cr.sh ${self.triggers.cpd_workspace} ${var.cpd_version} db2aaservice ${var.cpd_namespace} ${var.storage_option} ${local.storage_class} ${local.rwo_storage_class}
EOF
}
depends_on = [
local_file.db2aaservice_cr_yaml,
local_file.db2aaservice_sub_yaml,
module.machineconfig,
null_resource.cpd_foundational_services,
null_resource.login_cluster,
null_resource.install_aiopenscale,
null_resource.install_wml,
null_resource.install_ws,
null_resource.install_spss,
null_resource.install_dods,
null_resource.install_dmc,
null_resource.install_bigsql,
null_resource.install_dv,
null_resource.install_mdm,
null_resource.install_cde,
null_resource.install_wkc,
null_resource.install_ds,
null_resource.install_analyticsengine,
null_resource.install_ca,
null_resource.install_pa,
]
}
Loading

0 comments on commit 499c36d

Please sign in to comment.