Revert "Namespace GCE using new lattice_namespace variable"

This reverts commit 095abdb.

[#101697536]

Author: davidwadden

terraform/google/example/lattice.google.tf

@@ -10,25 +10,22 @@ module "lattice-google" {
     # lattice_password = "<CHANGE-ME>"
 
     # Path to the JSON file used to describe your account credentials, downloaded from Google Cloud Console
-    # gce_account_file = "<CHANGE-ME>"
+    gce_account_file = "<CHANGE-ME>"
 
     # The name of the project to apply any resources to
-    # gce_project = "<CHANGE-ME>"
+    gce_project = "<CHANGE-ME>"
 
     # SSH user
-    # gce_ssh_user = "<CHANGE-ME>"
+    gce_ssh_user = "<CHANGE-ME>"
 
     # Path to the SSH private key file
-    # gce_ssh_private_key_file = "<CHANGE-ME>"
+    gce_ssh_private_key_file = "<CHANGE-ME>"
 
-    # The number of Lattice Cells to launch (optional, default: 1)
-    # num_cells = "1"
+    # The number of Lattice Cells to launch
+    num_cells = "1"
 
-    # Google Compute Engine zone (optional, default: "us-central1-a")
-    # gce_zone = "us-central1-a"
-
-    # Namespace (optional, default: "lattice")
-    # lattice_namespace = "lattice"
+    # Google Compute Engine zone (optional)
+    # gce_zone = "<CHANGE-ME>"
 }
 
 output "lattice_target" {

terraform/google/resources.tf

@@ -1,10 +1,10 @@
 resource "google_compute_network" "lattice-network" {
-    name = "${var.lattice_namespace}-network"
+    name = "lattice"
     ipv4_range = "${var.gce_ipv4_range}"
 }
 
 resource "google_compute_firewall" "lattice-network" {
-    name = "${var.lattice_namespace}-firewall"
+    name = "lattice"
     network = "${google_compute_network.lattice-network.name}"
     source_ranges = ["0.0.0.0/0"]
     allow {
@@ -19,12 +19,12 @@ resource "google_compute_firewall" "lattice-network" {
 }
 
 resource "google_compute_address" "lattice-brain" {
-    name = "${var.lattice_namespace}-brain"
+    name = "lattice-brain"
 }
 
 resource "google_compute_instance" "lattice-brain" {
     zone = "${var.gce_zone}"
-    name = "${var.lattice_namespace}-brain"
+    name = "lattice-brain"
     tags = ["lattice"]
     description = "Lattice Brain"
     machine_type = "${var.gce_machine_type_brain}"
@@ -91,7 +91,7 @@ resource "google_compute_instance" "lattice-brain" {
 resource "google_compute_instance" "cell" {
     count = "${var.num_cells}"
     zone  = "${var.gce_zone}"
-    name = "${var.lattice_namespace}-cell-${count.index}"
+    name  = "cell-${count.index}"
     tags  = ["lattice"]
     description = "Lattice Cell ${count.index}"
     machine_type = "${var.gce_machine_type_cell}"
@@ -145,7 +145,7 @@ resource "google_compute_instance" "cell" {
             "sudo mkdir -p /var/lattice/setup/",
             "sudo sh -c 'echo \"CONSUL_SERVER_IP=${google_compute_address.lattice-brain.address}\" >> /var/lattice/setup/lattice-environment'",
             "sudo sh -c 'echo \"SYSTEM_DOMAIN=${google_compute_address.lattice-brain.address}.xip.io\" >> /var/lattice/setup/lattice-environment'",
-            "sudo sh -c 'echo \"LATTICE_CELL_ID=${var.lattice_namespace}-cell-${count.index}\" >> /var/lattice/setup/lattice-environment'",
+            "sudo sh -c 'echo \"LATTICE_CELL_ID=cell-${count.index}\" >> /var/lattice/setup/lattice-environment'",
             "sudo sh -c 'echo \"GARDEN_EXTERNAL_IP=$(hostname -I | awk '\"'\"'{ print $1 }'\"'\"')\" >> /var/lattice/setup/lattice-environment'",
 
             "sudo chmod +x /tmp/install-from-tar",

terraform/google/variables.tf

@@ -60,8 +60,3 @@ variable "lattice_password" {
 variable "lattice_tar_source" {
     description = "URL or local path of the lattice tar used to deploy your cluster."
 }
-
-variable "lattice_namespace" {
-    description = "Unique prefix for lattice infrastructure components, for deploying multiple clusters with different prefixes."
-    default = "lattice"
-}