Merge pull request #4 from pmarques/fix_paths

Fix consul packer paths
hashicorp · Oct 26, 2017 · c10c0e2 · c10c0e2
2 parents e6ec96b + a253402
commit c10c0e2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
-terraform-consul-azure
+terraform-azurerm-consul
 Copyright 2017 Gruntwork, LLC
 
 This product includes software developed at
-Gruntwork (http://www.gruntwork.io/).
+Gruntwork (http://www.gruntwork.io/).
diff --git a/examples/consul-image/README.md b/examples/consul-image/README.md
@@ -42,13 +42,13 @@ provisioner. Instead of:
 {
   "provisioners": [{
     "type": "file",
-    "source": "{{template_dir}}/../../../terraform-consul-azure",
+    "source": "{{template_dir}}/../../../terraform-azurerm-consul",
     "destination": "/tmp"
   },{
     "type": "shell",
     "inline": [
-      "/tmp/terraform-consul-azure/tree/master/modules/install-consul/install-consul --version {{user `consul_version`}}",
-      "/tmp/terraform-consul-azure/tree/master/modules/install-dnsmasq/install-dnsmasq"
+      "/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"
     ],
     "pause_before": "30s"
   }]
@@ -62,9 +62,9 @@ Your code should look more like this:
   "provisioners": [{
     "type": "shell",
     "inline": [
-      "git clone --branch <MODULE_VERSION> https://github.com/hashicorp/terraform-azurerm-consul.git /tmp/terraform-consul-azure",
-      "/tmp/terraform-consul-azure/tree/master/modules/install-consul/install-consul --version {{user `consul_version`}}",
-      "/tmp/terraform-consul-azure/tree/master/modules/install-dnsmasq/install-dnsmasq"
+      "git clone --branch <MODULE_VERSION> https://github.com/hashicorp/terraform-azurerm-consul.git /tmp/terraform-azurerm-consul",
+      "/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"
     ],
     "pause_before": "30s"
   }]
@@ -75,4 +75,4 @@ You should replace `<MODULE_VERSION>` in the code above with the version of this
 the [Releases Page](../../releases) for all available versions). That's because for production usage, you should always
 use a fixed, known version of this Module, downloaded from the official Git repo. On the other hand, when you're 
 just experimenting with the Module, it's OK to use a local checkout of the Module, uploaded from your own 
-computer.
+computer.
diff --git a/examples/consul-image/consul.json b/examples/consul-image/consul.json
@@ -29,7 +29,7 @@
   "provisioners": [
     {
       "type": "file",
-      "source": "{{template_dir}}/../../../terraform-consul-azure",
+      "source": "{{template_dir}}/../../../terraform-azurerm-consul",
       "destination": "/tmp"
     },
     {
@@ -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-consul-azure/tree/master/modules/install-consul/install-consul --version {{user `consul_version`}}",
-        "/tmp/terraform-consul-azure/tree/master/modules/install-dnsmasq/install-dnsmasq",
+        "/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",
         "/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
       ],
       "inline_shebang": "/bin/sh -x",

diff --git a/modules/install-consul/README.md b/modules/install-consul/README.md
@@ -12,7 +12,7 @@ for all available tags) and run the `install-consul` script:
 
 ```
 git clone --branch <VERSION> https://github.com/hashicorp/terraform-azurerm-consul.git
-terraform-consul-azure/tree/master/modules/install-consul/install-consul --version 0.8.0
+terraform-azurerm-consul/tree/master/modules/install-consul/install-consul --version 0.8.0
 ```
 
 The `install-consul` script will install Consul, its dependencies, and the [run-consul script](https://github.com/hashicorp/terraform-azurerm-consul/tree/master/modules/run-consul).

diff --git a/modules/install-dnsmasq/README.md b/modules/install-dnsmasq/README.md
@@ -23,7 +23,7 @@ for all available tags) and run the `install-dnsmasq` script:
 
 ```
 git clone --branch <VERSION> https://github.com/hashicorp/terraform-azurerm-consul.git
-terraform-consul-azure/tree/master/modules/install-dnsmasq/install-dnsmasq
+terraform-azurerm-consul/tree/master/modules/install-dnsmasq/install-dnsmasq
 ```
 
 Note: by default, the `install-dnsmasq` script assumes that a Consul agent is already running locally and connected to 
@@ -65,4 +65,4 @@ Add the `+trace` argument to `dig` commands to more clearly see what's going on:
 
 ```
 dig vault.service.consul +trace
-```
+```