Detect jump host zone from copier responses (#125)

* Detect jump host zone from copier responses * Change zone variable to jump_host_zone
GoogleCloudPlatform · Sep 19, 2023 · 382999e · 382999e
1 parent c9656e9
commit 382999e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/solutions_builder/template_root/copier.yaml b/solutions_builder/template_root/copier.yaml
@@ -23,6 +23,17 @@ gcp_region:
   help: Which Google Cloud region?
   default: us-central1
 
+use_jump_host:
+  type: bool
+  help: Use a jump-host for running terraform foundations?
+  default: true
+
+jump_host_zone:
+  type: str
+  help: Google Cloud zone for creating the jump host?
+  default: us-central1-a
+  when: "{{use_jump_host}}"
+
 has_common:
   type: bool
   help: Include a common container image for shared libraries, data models, utils, etc?
@@ -35,7 +46,7 @@ terraform_backend_gcs:
 
 advanced_settings:
   type: bool
-  help: Show advanced settings (VPC, Storage region, etc)?
+  help: Show advanced settings (VPC, Storage, Region, etc)?
   default: false
 
 create_vpc_network:

diff --git a/solutions_builder/template_root/terraform/stages/0-jumphost/bastion_startup.sh b/solutions_builder/template_root/terraform/stages/0-jumphost/bastion_startup.sh
@@ -55,6 +55,7 @@ sudo ln -s python3.9 python
 sudo rm /usr/bin/python3 && sudo ln -s python3.9 python3
 popd
 python -m pip install --upgrade pip
+python -m pip install --upgrade pyopenssl
 python -m pip install google-cloud-firestore google-cloud-bigquery firebase-admin
 python -m pip install solutions-builder --ignore-installed PyYAML
 touch jumphost_ready
diff --git a/solutions_builder/template_root/terraform/stages/0-jumphost/main.tf b/solutions_builder/template_root/terraform/stages/0-jumphost/main.tf
@@ -52,12 +52,12 @@ resource "time_sleep" "wait_60_seconds" {
 resource "google_compute_network" "vpc" {
   depends_on              = [time_sleep.wait_60_seconds]
   project                 = var.project_id
-  name                    = "jumphost-vpc"
+  name                    = "jump-vpc"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "subnet" {
-  name          = "jumphost-vpc-subnet"
+  name          = "jump-vpc-subnet"
   region        = var.region
   network       = google_compute_network.vpc.name
   ip_cidr_range = "10.0.0.0/24"
@@ -67,7 +67,7 @@ resource "google_compute_disk" "default" {
   depends_on = [time_sleep.wait_60_seconds]
   name       = "disk-data"
   type       = "pd-balanced"
-  zone       = var.zone
+  zone       = var.jump_host_zone
   size       = var.disk_size_gb
 }
 

diff --git a/solutions_builder/template_root/terraform/stages/0-jumphost/terraform.tfvars b/solutions_builder/template_root/terraform/stages/0-jumphost/terraform.tfvars
@@ -0,0 +1,3 @@
+project_id     = "{{project_id}}"
+region         = "{{gcp_region}}"
+jump_host_zone = "{{jump_host_zone}}"
diff --git a/solutions_builder/template_root/terraform/stages/0-jumphost/variables.tf b/solutions_builder/template_root/terraform/stages/0-jumphost/variables.tf
@@ -18,7 +18,7 @@ variable "region" {
   }
 }
 
-variable "zone" {
+variable "jump_host_zone" {
   type        = string
   description = "GCP Zone for the jump host"
 }