Skip to content

Commit

Permalink
Merge pull request #5 from pmarques/master
Browse files Browse the repository at this point in the history
Fix build and update README
  • Loading branch information
mcalhoun authored Nov 8, 2017
2 parents c10c0e2 + d83aa5e commit 70417ac
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Terraform code that uses the [consul-cluster](https://github.com/hashicorp/terra
module to deploy a [Consul](https://www.consul.io/) cluster in [Azure](https://azure.microsoft.com/)
* [modules](https://github.com/hashicorp/terraform-azurerm-consul/tree/master/modules): This folder contains the reusable code for this Module, broken down into one or more modules.
* [examples](https://github.com/hashicorp/terraform-azurerm-consul/tree/master/examples): This folder contains examples of how to use the modules.
* [test](https://github.com/hashicorp/terraform-azurerm-consul/test): Automated tests for the modules and examples.

To deploy Consul servers using this Module:

Expand Down
2 changes: 1 addition & 1 deletion examples/consul-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To build the Consul Image:
1. Run `packer build consul.json`.

When the build finishes, it will output the IDs of the new AMIs. To see how to deploy one of these Images, check out the
[consul-cluster example](https://github.com/hashicorp/terraform-azurerm-consul/tree/master/examples/consul-cluster).
[consul-cluster example](https://github.com/hashicorp/terraform-azurerm-consul/tree/master/).



Expand Down
4 changes: 2 additions & 2 deletions examples/consul-image/consul.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"apt-get update && apt-get install -y libssl-dev libffi-dev python-dev build-essential apt-transport-https azure-cli",
"DEBIAN_FRONTEND=noninteractive apt-get -y upgrade",

"/tmp/terraform-azurerm-consul/tree/master/modules/install-consul/install-consul --version {{user `consul_version`}}",
"/tmp/terraform-azurerm-consul/tree/master/modules/install-dnsmasq/install-dnsmasq",
"/tmp/terraform-azurerm-consul/modules/install-consul/install-consul --version {{user `consul_version`}}",
"/tmp/terraform-azurerm-consul/modules/install-dnsmasq/install-dnsmasq",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
Expand Down

0 comments on commit 70417ac

Please sign in to comment.