Skip to content

Commit

Permalink
Merge pull request #2 from hashicorp/chore/cleanup
Browse files Browse the repository at this point in the history
cleanup
  • Loading branch information
mcalhoun authored Sep 19, 2017
2 parents c486194 + a6e6289 commit e7693a6
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ We also recommend updating the automated tests *before* updating any code (see [
Development](https://en.wikipedia.org/wiki/Test-driven_development)). That means you add or update a test case,
verify that it's failing with a clear error message, and *then* make the code changes to get that test to pass. This
ensures the tests stay up to date and verify all the functionality in this Module, including whatever new
functionality you're adding in your contribution. Check out the [tests](/tests) folder for instructions on running the
functionality you're adding in your contribution. Check out the [tests](https://github.com/hashicorp/terraform-azurerm-vault/tree/master/tests) folder for instructions on running the
automated tests.

## Update the code
Expand Down
2 changes: 1 addition & 1 deletion _docs/package-managers.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ We need to write and package the scripts in this Module in a way that satisfies
manual approval (e.g. a PR for each new version).

- **Testable in dev mode**. We must be able to do local, iterative development on the example code in the
[examples](/examples) folder. That means there is a way to "package" these scripts so that, in dev mode, they are
[examples](https://github.com/hashicorp/terraform-azurerm-vault/tree/master/examples) folder. That means there is a way to "package" these scripts so that, in dev mode, they are
downloaded from the local file system, rather than some package repo such as apt or yum.

- **Mature**: We want to use a solution that is mature, battle-tested, and has an active community around it.
Expand Down
2 changes: 1 addition & 1 deletion modules/consul-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Finally, you can try opening up the Consul UI in your browser at the URL `http:/

This module creates the following architecture:

![Consul architecture](/_docs/architecture.png)
![Consul architecture](https://github.com/hashicorp/terraform-azurerm-vault/tree/master/_docs/architecture.png)

## How do you roll out updates?

Expand Down
8 changes: 8 additions & 0 deletions modules/consul-cluster/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,11 @@ output "cluster_size" {
output "load_balancer_ip_address" {
value = "${azurerm_public_ip.consul_access.*.ip_address}"
}

output "load_balancer_id" {
value = "${azurerm_lb.consul_access.*.id}"
}

output "backend_pool_id" {
value = "${azurerm_lb_backend_address_pool.consul_bepool.*.id}"
}
2 changes: 1 addition & 1 deletion modules/install-consul/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@ After the `install-consul` script finishes running, you may wish to do the follo

We needed an easy way to install these scripts that satisfied a number of requirements, including working on a variety
of operating systems and supported versioning. Our current solution is to use `git`, but this may change in the future.
See [Package Managers](/_docs/package-managers.md) for a full discussion of the requirements, trade-offs, and why we
See [Package Managers](https://github.com/hashicorp/terraform-azurerm-vault/tree/master/_docs/package-managers.md) for a full discussion of the requirements, trade-offs, and why we
picked `git`.
2 changes: 1 addition & 1 deletion outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ output "load_balancer_ip_address_servers" {

output "load_balancer_ip_address_clients" {
value = "${module.consul_clients.load_balancer_ip_address}"
}
}

0 comments on commit e7693a6

Please sign in to comment.