Merge pull request #27 from hashicorp/b-remove-beta-expl

Update examples to use GA release
hashicorp · Oct 31, 2019 · a088929 · a088929
2 parents a11e5ec + 4c17806
commit a088929
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/examples/rhel-production-example/main.tf b/examples/rhel-production-example/main.tf
@@ -14,9 +14,9 @@ provider "google-beta" {
   project = "${var.project}"
 }
 
-module "tfe-beta" {
+module "tfe-cluster" {
   source           = "hashicorp/terraform-enterprise/google"
-  version          = "0.0.3-beta"
+  version          = "0.1.0"
   credentials_file = "auth-file-123456678.json"
   region           = "${var.region}"
   zone             = "${var.region}-a"
@@ -27,7 +27,7 @@ module "tfe-beta" {
   certificate      = "https://www.googleapis.com/compute/v1/project/terraform-test/global/sslCertificates/tfe"
   ssl_policy       = "tfe-ssl-policy"
   subnet           = "tfe-subnet"
-  frontend_dns     = "tfe-beta"
+  frontend_dns     = "tfe-cluster"
 
   primary_count   = "3"
   secondary_count = "2"
@@ -38,17 +38,17 @@ module "tfe-beta" {
 
   gcs_bucket          = "tfe-bucket"
   postgresql_address  = "192.168.100.100"
-  postgresql_database = "tfe-beta-db"
+  postgresql_database = "tfe-cluster-db"
   postgresql_user     = "postgres"
   postgresql_password = "RdJeirkEZGdvCg=="
 }
 
-output "tfe-beta" {
+output "tfe-cluster" {
   value = {
-    application_endpoint         = "${module.tfe-beta.application_endpoint}"
-    application_health_check     = "${module.tfe-beta.application_health_check}"
-    installer_dashboard_password = "${module.tfe-beta.installer_dashboard_password}"
-    installer_dashboard__url     = "${module.tfe-beta.installer_dashboard_url}"
-    primary_public_ip            = "${module.tfe-beta.primary_public_ip}"
+    application_endpoint         = "${module.tfe-cluster.application_endpoint}"
+    application_health_check     = "${module.tfe-cluster.application_health_check}"
+    installer_dashboard_password = "${module.tfe-cluster.installer_dashboard_password}"
+    installer_dashboard__url     = "${module.tfe-cluster.installer_dashboard_url}"
+    primary_public_ip            = "${module.tfe-cluster.primary_public_ip}"
   }
 }
diff --git a/examples/root-example/README.md b/examples/root-example/README.md
@@ -1,4 +1,4 @@
-# Terraform Enterprise HA (Beta) Example
+# Terraform Enterprise Clustering Example
 
 This example assumes you have already set up your gcp project with the required prereqs:
 
@@ -12,7 +12,7 @@ This example assumes you have already set up your gcp project with the required
 
 With this example you will create a five node cluster, and can easily add secondaries:
 
-![basic architecture diagram](https://github.com/hashicorp/terraform-google-terraform-enterprise/blob/v0.0.3-beta/assets/gcp_diagram.jpg?raw=true)
+![basic architecture diagram](https://github.com/hashicorp/terraform-google-terraform-enterprise/blob/master/assets/gcp_diagram.jpg?raw=true)
 
 ## Change to the example directory
 
@@ -43,7 +43,7 @@ You'll need to update the following settings to your set up:
 * frontend_dns: DNS name for load balancer
 * license_file: your TFE license
 
- This example is set to spin up a five node instance of 3 primaries and 2 secondaries, but the `primary_count` and `secondary_count` can be updated to build a larger cluster instead.  
+ This example is set to spin up a five node instance of 3 primaries and 2 secondaries, but the `primary_count` and `secondary_count` can be updated to build a larger cluster instead.
 
 ## Run Terraform
 

diff --git a/examples/root-example/main.tf b/examples/root-example/main.tf
@@ -14,9 +14,9 @@ provider "google-beta" {
   project = "${var.project}"
 }
 
-module "tfe-beta" {
+module "tfe-cluster" {
   source           = "hashicorp/terraform-enterprise/google"
-  version          = "0.0.3-beta"
+  version          = "0.1.0"
   credentials_file = "auth-file-123456678.json"
   region           = "${var.region}"
   zone             = "${var.region}-a"
@@ -27,20 +27,20 @@ module "tfe-beta" {
   certificate      = "https://www.googleapis.com/compute/v1/project/terraform-test/global/sslCertificates/tfe"
   ssl_policy       = "tfe-ssl-policy"
   subnet           = "tfe-subnet"
-  frontend_dns     = "tfe-beta"
+  frontend_dns     = "tfe-cluster"
 
   primary_count   = "3"
   secondary_count = "2"
 
   license_file = "customer.rli"
 }
 
-output "tfe-beta" {
+output "tfe-cluster" {
   value = {
-    application_endpoint         = "${module.tfe-beta.application_endpoint}"
-    application_health_check     = "${module.tfe-beta.application_health_check}"
-    installer_dashboard_password = "${module.tfe-beta.installer_dashboard_password}"
-    installer_dashboard__url     = "${module.tfe-beta.installer_dashboard_url}"
-    primary_public_ip            = "${module.tfe-beta.primary_public_ip}"
+    application_endpoint         = "${module.tfe-cluster.application_endpoint}"
+    application_health_check     = "${module.tfe-cluster.application_health_check}"
+    installer_dashboard_password = "${module.tfe-cluster.installer_dashboard_password}"
+    installer_dashboard__url     = "${module.tfe-cluster.installer_dashboard_url}"
+    primary_public_ip            = "${module.tfe-cluster.primary_public_ip}"
   }
 }