Skip to content

Commit 1567417

Browse files
committed
no more submodules
1 parent ed85fe3 commit 1567417

File tree

5 files changed

+8
-28
lines changed

5 files changed

+8
-28
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "scripts"]
22
path = scripts
33
url = https://github.com/armorfret/ci-helpers
4-
[submodule "ansible"]
5-
path = ansible
6-
url = https://github.com/akerl/deploy-wireguard-server

.prospectus

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,5 @@ item do
2222
regex /^\s+- TERRAFORM_VERSION=([\d.]+)$/
2323
end
2424
end
25-
26-
raw = File.read('.gitmodules').split(/^\[.*\]$/).reject(&:empty?)
27-
submodules = raw.map { |x| x.split("\n")[1, 2].map { |y| y.split(' ').last } }
28-
29-
submodules.each do |path, repo|
30-
repo_name = repo.split('.com/').last
31-
32-
item do
33-
name "dotfiles::#{repo_name}"
34-
35-
expected do
36-
github_hash
37-
repo repo_name
38-
end
39-
40-
actual do
41-
git_hash
42-
dir path
43-
end
44-
end
45-
end
4625
end
4726
end

ansible

Lines changed: 0 additions & 1 deletion
This file was deleted.

main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ resource "linode_instance" "vpn" {
2626
provisioner "ansible" {
2727
plays {
2828
playbook = {
29-
file_path = "${path.module}/ansible/linode/bootstrap.yml"
29+
file_path = "${var.ansible_repo_path}/linode/bootstrap.yml"
3030
}
3131
}
3232

3333
plays {
3434
playbook = {
35-
file_path = "${path.module}/ansible/linode/setup.yml"
35+
file_path = "${var.ansible_repo_path}/linode/setup.yml"
3636
}
3737
}
3838

3939
plays {
4040
playbook = {
41-
file_path = "${path.module}/ansible/main.yml"
41+
file_path = "${var.ansible_repo_path}/main.yml"
4242
skip_tags = ["users"]
4343
}
4444
}

variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,8 @@ variable "source_image_id" {
3232
default = "linode/ubuntu18.04"
3333
description = "Source image to build on"
3434
}
35+
36+
variable "ansible_repo_path" {
37+
type = "string"
38+
description = "Path to deploy-wireguard-server repo"
39+
}

0 commit comments

Comments
 (0)