Skip to content

Commit

Permalink
Vendor the open source core module (#46)
Browse files Browse the repository at this point in the history
  • Loading branch information
lawliet89 authored and sturdek committed Feb 22, 2018
1 parent 58f208a commit b1a540f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "vendor/terraform-modules"]
path = vendor/terraform-modules
url = https://github.com/GovTechSG/terraform-modules.git
6 changes: 3 additions & 3 deletions environments/staging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ for pre-requisites.
```bash
packer build \
--var-file "core/packer/consul.json" \
"$(git rev-parse --show-toplevel)/modules/core/packer/consul/packer.json"
"$(git rev-parse --show-toplevel)/vendor/terraform-modules/modules/core/packer/consul/packer.json"
```

#### Nomad Servers

```bash
packer build \
--var-file "core/packer/nomad_servers.json" \
"$(git rev-parse --show-toplevel)/modules/core/packer/nomad_servers/packer.json"
"$(git rev-parse --show-toplevel)/vendor/terraform-modules/modules/core/packer/nomad_servers/packer.json"
```

#### Nomad Clients

```bash
packer build \
--var-file "core/packer/nomad_clients.json" \
"$(git rev-parse --show-toplevel)/modules/core/packer/nomad_clients/packer.json"
"$(git rev-parse --show-toplevel)/vendor/terraform-modules/modules/core/packer/nomad_clients/packer.json"
```

<!-- #### Vault Servers
Expand Down
2 changes: 1 addition & 1 deletion environments/staging/core/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ provider "consul" {
}

module "core" {
source = "github.com/GovTechSG/terraform-modules//modules/core?ref=v0.0.1"
source = "../../../vendor/terraform-modules/modules/core"

vpc_name = "L Cloud"
vpc_cidr = "10.158.0.0/16"
Expand Down
1 change: 1 addition & 0 deletions vendor/terraform-modules
Submodule terraform-modules added at d17bff

0 comments on commit b1a540f

Please sign in to comment.