Replace opsman_image_url with opsman_image

Replace optional_opsman_image_url with optional_opsman_image Co-authored-by: Maria Shaldybin <[email protected]> Co-authored-by: Nancy Hsieh <[email protected]> [#174720465](https://www.pivotaltracker.com/story/show/174720465)
vmware-archive · Sep 11, 2020 · 9bd18ee · 9bd18ee
1 parent f76c2df
commit 9bd18ee
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -86,7 +86,6 @@ region           = "us-central1"
 zones            = ["us-central1-a", "us-central1-b", "us-central1-c"]
 dns_suffix       = "gcp.some-project.cf-app.com"
 opsman_image     = "ops-manager-2-10-build-48"
-opsman_image_url = "https://storage.googleapis.com/ops-manager-us/pcf-gcp-2.0-build.264.tar.gz"
 
 buckets_location = "US"
 

diff --git a/modules/ops_manager/image.tf b/modules/ops_manager/image.tf
diff --git a/terraforming-control-plane/example.tfvars b/terraforming-control-plane/example.tfvars
@@ -2,7 +2,7 @@ env_name="" # Environment name. This will be prefixed to most resources created
 project="" # GCP Project ID
 region="" # GCP Region (e.g. us-west1)
 zones=[] # GCP Zones (e.g. ["us-west1-a", "us-west1-b"])
-opsman_image_url="" # Ops Manager URL (from the GCP YML on PivNet; e.g. https://storage.googleapis.com/ops-manager-us/pcf-gcp-2.3-build.188.tar.gz)
+opsman_image="" # Public Ops Manager image name (from the GCP YML on PivNet; e.g. ops-manager-2-10-build-48)
 dns_suffix="" # DNS Suffix to be combined with "env_name" (entries will be created for opsman.<env_name>.<dns_suffix> and concourse.<env_name>.<dns_suffix>)
 
 # GCP Service Account Key JSON

diff --git a/terraforming-control-plane/main.tf b/terraforming-control-plane/main.tf
@@ -40,8 +40,8 @@ module "ops_manager" {
   opsman_storage_bucket_count        = "${var.opsman_storage_bucket_count}"
   create_iam_service_account_members = "${var.create_iam_service_account_members}"
   opsman_machine_type                = "${var.opsman_machine_type}"
-  opsman_image_url                   = "${var.opsman_image_url}"
-  optional_opsman_image_url          = "${var.optional_opsman_image_url}"
+  opsman_image                       = "${var.opsman_image}"
+  optional_opsman_image              = "${var.optional_opsman_image}"
 
   pcf_network_name  = "${module.infra.network}"
   subnet            = "${module.infra.subnet}"

diff --git a/terraforming-control-plane/variables.tf b/terraforming-control-plane/variables.tf
@@ -32,14 +32,14 @@ variable "tls_private_key" {
   description = "Private key used for tls wildcard certificate."
 }
 
-variable "opsman_image_url" {
+variable "opsman_image" {
   type        = "string"
-  description = "Location of ops manager image on google cloud storage"
+  description = "Name of public ops manager image in pivotal-ops-manager-images project"
 }
 
-variable "optional_opsman_image_url" {
+variable "optional_opsman_image" {
   type        = "string"
-  description = "Location of ops manager image (to be used for optional extra instance) on google cloud storage"
+  description = "Name of public ops manager image in pivotal-ops-manager-images project (to be used for optional extra instance)"
   default     = ""
 }
 

diff --git a/terraforming-pks/main.tf b/terraforming-pks/main.tf
@@ -33,9 +33,9 @@ module "ops_manager" {
   opsman_storage_bucket_count        = "${var.opsman_storage_bucket_count}"
   create_iam_service_account_members = "${var.create_iam_service_account_members}"
 
-  opsman_machine_type       = "${var.opsman_machine_type}"
-  opsman_image_url          = "${var.opsman_image_url}"
-  optional_opsman_image_url = "${var.optional_opsman_image_url}"
+  opsman_machine_type   = "${var.opsman_machine_type}"
+  opsman_image          = "${var.opsman_image}"
+  optional_opsman_image = "${var.optional_opsman_image}"
 
   pcf_network_name  = "${module.infra.network}"
   subnet            = "${module.infra.subnet}"

diff --git a/terraforming-pks/variables.tf b/terraforming-pks/variables.tf
@@ -20,14 +20,14 @@ variable "zones" {
   type = "list"
 }
 
-variable "opsman_image_url" {
+variable "opsman_image" {
   type        = "string"
-  description = "Location of ops manager image on google cloud storage"
+  description = "Name of public ops manager image in pivotal-ops-manager-images project"
 }
 
-variable "optional_opsman_image_url" {
+variable "optional_opsman_image" {
   type        = "string"
-  description = "Location of ops manager image (to be used for optional extra instance) on google cloud storage"
+  description = "Name of public ops manager image in pivotal-ops-manager-images project (to be used for optional extra instance)"
   default     = ""
 }