Skip to content

Commit

Permalink
Merge pull request #5 from hashicorp/fix-example
Browse files Browse the repository at this point in the history
Fix example
  • Loading branch information
amy-hashi authored Sep 4, 2019
2 parents 4dc067c + 863dc04 commit 460287d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 18 deletions.
26 changes: 20 additions & 6 deletions examples/root-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -47,10 +47,24 @@ 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)

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.
```
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
}
```

![application started](app_started.png)
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.
24 changes: 12 additions & 12 deletions examples/root-example/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ provider "aws" {
region = "us-west-2"
}

module "tfe-ha" {
source = "hashicorp/tfe-ha/aws"
version = "0.0.1-beta"
module "tfe-beta" {
source = "hashicorp/terraform-enterprise/aws"
version = "0.0.2-beta"

vpc_id = "vpc-123456789abcd1234"
domain = "example.com"
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}"
}
}

0 comments on commit 460287d

Please sign in to comment.