Converts service provision back to terraform provider instead of operator

Author: Sean Sundberg

terraform/stages/stage1-cloud_operator.tf renamed to terraform/stages/_backup/stage1-cloud_operator.tf

@@ -1,5 +1,5 @@
 module "dev_infrastructure_postgres" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/operator-services/postgres?ref=v2.1.2"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/postgres?ref=v2.1.8"
 
   resource_group_name = "${var.resource_group_name}"
   resource_location   = "${var.vlan_region}"
@@ -10,6 +10,4 @@ module "dev_infrastructure_postgres" {
   test_namespace      = "${module.dev_cluster_namespaces.test_namespace_name}"
   staging_namespace   = "${module.dev_cluster_namespaces.staging_namespace_name}"
   name_prefix         = "${var.name_prefix}"
-  service_namespace   = "${module.dev_software_cloud_operator.namespace}"
-  cluster_config_file = "${module.dev_cluster.config_file_path}"
 }

terraform/stages/stage1-postgres.tf

@@ -1,15 +1,11 @@
 module "dev_infrastructure_appid" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/operator-services/appid?ref=v2.1.8"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/appid?ref=v2.1.8"
 
   resource_group_name = "${module.dev_cluster.resource_group_name}"
   resource_location   = "${module.dev_cluster.region}"
   cluster_id          = "${module.dev_cluster.id}"
-  tools_namespace     = "${module.dev_cluster_namespaces.tools_namespace_name}"
   dev_namespace       = "${module.dev_cluster_namespaces.dev_namespace_name}"
   test_namespace      = "${module.dev_cluster_namespaces.test_namespace_name}"
   staging_namespace   = "${module.dev_cluster_namespaces.staging_namespace_name}"
   name_prefix         = "${var.name_prefix}"
-  service_namespace   = "${module.dev_software_cloud_operator.namespace}"
-  cluster_config_file = "${module.dev_cluster.config_file_path}"
-  cluster_name        = "${module.dev_cluster.name}"
 }

terraform/stages/stage3-appid.tf

@@ -1,5 +1,5 @@
 module "dev_infrastructure_cos" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/operator-services/cloud_object_storage?ref=v2.1.8"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/cloud_object_storage?ref=v2.1.8"
 
   resource_group_name = "${module.dev_cluster.resource_group_name}"
   resource_location   = "${module.dev_cluster.region}"
@@ -8,6 +8,4 @@ module "dev_infrastructure_cos" {
   test_namespace      = "${module.dev_cluster_namespaces.test_namespace_name}"
   staging_namespace   = "${module.dev_cluster_namespaces.staging_namespace_name}"
   name_prefix         = "${var.name_prefix}"
-  service_namespace   = "${module.dev_software_cloud_operator.namespace}"
-  cluster_config_file = "${module.dev_cluster.config_file_path}"
 }

terraform/stages/stage3-cloud_object_storage.tf

@@ -1,5 +1,5 @@
 module "dev_infrastructure_cloudant" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/operator-services/cloudant?ref=v2.1.8"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/cloudant?ref=v2.1.8"
 
   resource_group_name = "${module.dev_cluster.resource_group_name}"
   resource_location   = "${module.dev_cluster.region}"
@@ -8,6 +8,4 @@ module "dev_infrastructure_cloudant" {
   test_namespace      = "${module.dev_cluster_namespaces.test_namespace_name}"
   staging_namespace   = "${module.dev_cluster_namespaces.staging_namespace_name}"
   name_prefix         = "${var.name_prefix}"
-  service_namespace   = "${module.dev_software_cloud_operator.namespace}"
-  cluster_config_file = "${module.dev_cluster.config_file_path}"
 }

terraform/stages/stage3-cloudant.tf

@@ -9,14 +9,13 @@ module "dev_serviceaccount_logdna-agent" {
 }
 
 module "dev_infrastructure_logdna" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/operator-services/logdna?ref=v2.1.8"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/logdna?ref=v2.1.8"
 
   resource_group_name      = "${module.dev_cluster.resource_group_name}"
   resource_location        = "${module.dev_cluster.region}"
-  cluster_type             = "${var.cluster_type}"
   cluster_config_file_path = "${module.dev_cluster.config_file_path}"
+  cluster_type             = "${var.cluster_type}"
   service_account_name     = "${module.dev_serviceaccount_logdna-agent.name}"
   name_prefix              = "${var.name_prefix}"
   namespace                = "${module.dev_cluster_namespaces.tools_namespace_name}"
-  service_namespace        = "${module.dev_software_cloud_operator.namespace}"
 }

terraform/stages/stage3-logdna.tf

@@ -1,11 +1,12 @@
 module "dev_infrastructure_sysdig" {
-  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/operator-services/sysdig?ref=v2.1.8"
+  source = "github.com/ibm-garage-cloud/garage-terraform-modules.git//cloud-managed/services/sysdig?ref=v2.1.8"
 
   resource_group_name      = "${module.dev_cluster.resource_group_name}"
   resource_location        = "${module.dev_cluster.region}"
   cluster_config_file_path = "${module.dev_cluster.config_file_path}"
-  tools_namespace          = "${module.dev_cluster_namespaces.tools_namespace_name}"
+  dev_namespace            = "${module.dev_cluster_namespaces.tools_namespace_name}"
+  test_namespace           = "${module.dev_cluster_namespaces.tools_namespace_name}"
+  staging_namespace        = "${module.dev_cluster_namespaces.tools_namespace_name}"
   cluster_type             = "${var.cluster_type}"
   name_prefix              = "${var.name_prefix}"
-  service_namespace        = "${module.dev_software_cloud_operator.namespace}"
 }