From 696a9d0dcfd7ff7920fcffc1dc4d75c0a6c21f49 Mon Sep 17 00:00:00 2001 From: Amy Brown Date: Mon, 26 Aug 2019 13:54:35 -0500 Subject: [PATCH 1/3] fixed example --- examples/root-example/README.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/examples/root-example/README.md b/examples/root-example/README.md index 3de822fc..b92668e7 100644 --- a/examples/root-example/README.md +++ b/examples/root-example/README.md @@ -47,9 +47,25 @@ terraform apply ## Wait for the application to load -The replicated console url will output along with the password. +The installer dashboard url will output along with the password. -![output](../../assets/output.jpg) +``` +Apply complete! Resources: 33 added, 0 changed, 0 destroyed. + +Outputs: + +tfe-beta = { + application_endpoint = https://tfe-hvg9o7lo.example.com + application_health_check = https://tfe-hvg9o7lo.example.com/_health_check + iam_role = tfe-hvg9o7lo + install_id = hvg9o7lo + installer_dashboard_url = https://tfe-hvg9o7lo.example.com:8800 + installer_dashboard_password = manually-grand-gator + primary_public_ip = 12.34.56.78 + ssh_config_file = /Users/jsmith/Documents/tfe-beta/.terraform/modules/c8066b63fe35e7cb30635ab501caa438/hashicorp-terraform-aws-terraform-enterprise-4dc067c/work/ssh-config + ssh_private_key = /Users/jsmith/Documents/tfe-beta/.terraform/modules/a1d4d4cc38b069facc8774038e3ad299/work/tfe-hvg9o7lo.priv +} +``` You can log into that dashboard at that url and wait for the application to be ready. This can take up to 30 minutes! Once complete use the `Open` link to set up the admin user and initial organization. From c355c32f0ae36d714bad45cfafd6ae5aebd38d4d Mon Sep 17 00:00:00 2001 From: Amy Brown Date: Wed, 4 Sep 2019 08:48:43 -0500 Subject: [PATCH 2/3] Example update/fixes --- examples/root-example/README.md | 6 ++---- examples/root-example/main.tf | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/examples/root-example/README.md b/examples/root-example/README.md index b92668e7..3cdcb3eb 100644 --- a/examples/root-example/README.md +++ b/examples/root-example/README.md @@ -10,7 +10,7 @@ This example assumes you have already set up your gcp project with the required With this code you can either create a single instance, or a build a cluster: -![basic architecture diagram](../../assets/aws_diagram.jpg) +![basic architecture diagram](https://github.com/hashicorp/terraform-aws-terraform-enterprise/blob/v0.0.1-beta/assets/aws_diagram.jpg?raw=true) ## Change to the example directory @@ -67,6 +67,4 @@ tfe-beta = { } ``` -You can log into that dashboard at that url and wait for the application to be ready. This can take up to 30 minutes! Once complete use the `Open` link to set up the admin user and initial organization. - -![application started](app_started.png) \ No newline at end of file +You can log into that dashboard at that url and wait for the application to be ready. This can take up to 30 minutes! Once complete use the `Open` link to set up the admin user and initial organization. \ No newline at end of file diff --git a/examples/root-example/main.tf b/examples/root-example/main.tf index 20ae42d5..40bfaaaf 100644 --- a/examples/root-example/main.tf +++ b/examples/root-example/main.tf @@ -2,8 +2,8 @@ provider "aws" { region = "us-west-2" } -module "tfe-ha" { - source = "hashicorp/tfe-ha/aws" +module "tfe-beta" { + source = "hashicorp/terraform-enterprise/aws" version = "0.0.1-beta" vpc_id = "vpc-123456789abcd1234" @@ -11,15 +11,15 @@ module "tfe-ha" { license_file = "company.rli" } -output "tfe-ha" { +output "tfe-beta" { value = { - application_endpoint = "${module.tfe-ha.application_endpoint}" - application_health_check = "${module.tfe-ha.application_health_check}" - iam_role = "${module.tfe-ha.iam_role}" - install_id = "${module.tfe-ha.install_id}" - installer_dashboard_password = "${module.tfe-ha.installer_dashboard_password}" - installer_dashboard_url = "${module.tfe-ha.installer_dashboard_url}" - primary_public_ip = "${module.tfe-ha.primary_public_ip}" - ssh_private_key = "${module.tfe-ha.ssh_private_key}" + application_endpoint = "${module.tfe-beta.application_endpoint}" + application_health_check = "${module.tfe-beta.application_health_check}" + iam_role = "${module.tfe-beta.iam_role}" + install_id = "${module.tfe-beta.install_id}" + 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}" + ssh_private_key = "${module.tfe-beta.ssh_private_key}" } } From 863dc04a420f801c037ed9cf7d933dbebd3aec64 Mon Sep 17 00:00:00 2001 From: Amy Brown Date: Wed, 4 Sep 2019 08:55:51 -0500 Subject: [PATCH 3/3] fix example version --- examples/root-example/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/root-example/main.tf b/examples/root-example/main.tf index 40bfaaaf..eee5dd0e 100644 --- a/examples/root-example/main.tf +++ b/examples/root-example/main.tf @@ -4,7 +4,7 @@ provider "aws" { module "tfe-beta" { source = "hashicorp/terraform-enterprise/aws" - version = "0.0.1-beta" + version = "0.0.2-beta" vpc_id = "vpc-123456789abcd1234" domain = "example.com"