From 9bd18ee055e5932b6b1f5adb11420385d7c81c34 Mon Sep 17 00:00:00 2001 From: Maria Shaldybin Date: Fri, 11 Sep 2020 10:41:18 -0700 Subject: [PATCH] Replace opsman_image_url with opsman_image Replace optional_opsman_image_url with optional_opsman_image Co-authored-by: Maria Shaldybin Co-authored-by: Nancy Hsieh [#174720465](https://www.pivotaltracker.com/story/show/174720465) --- README.md | 1 - modules/ops_manager/image.tf | 25 ----------------------- terraforming-control-plane/example.tfvars | 2 +- terraforming-control-plane/main.tf | 4 ++-- terraforming-control-plane/variables.tf | 8 ++++---- terraforming-pks/main.tf | 6 +++--- terraforming-pks/variables.tf | 8 ++++---- 7 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 modules/ops_manager/image.tf diff --git a/README.md b/README.md index 0c4b6bf..b4e6b3b 100644 --- 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 deleted file mode 100644 index fd45a56..0000000 --- a/modules/ops_manager/image.tf +++ /dev/null @@ -1,25 +0,0 @@ -# resource "google_compute_image" "ops-manager-image" { -# name = "${var.env_name}-ops-manager-image" -# count = "${var.opsman_image_url == "" ? 0 : 1}" - -# timeouts { -# create = "20m" -# } - -# raw_disk { -# source = "${var.optional_opsman_image_url}" -# } -# } - -# resource "google_compute_image" "optional-ops-manager-image" { -# name = "${var.env_name}-optional-ops-manager-image" -# count = "${var.optional_opsman_image_url == "" ? 0 : 1}" - -# timeouts { -# create = "20m" -# } - -# raw_disk { -# source = "${var.optional_opsman_image_url}" -# } -# } diff --git a/terraforming-control-plane/example.tfvars b/terraforming-control-plane/example.tfvars index 122250e..c58685b 100644 --- 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.. and concourse..) # GCP Service Account Key JSON diff --git a/terraforming-control-plane/main.tf b/terraforming-control-plane/main.tf index 9ba19ae..9433a13 100644 --- 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 index ef18f6d..b0b291b 100644 --- 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 index d6c7357..ceb9960 100644 --- 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 index 8ac1509..b0254ad 100644 --- 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 = "" }