File tree Expand file tree Collapse file tree 5 files changed +8
-28
lines changed Expand file tree Collapse file tree 5 files changed +8
-28
lines changed Original file line number Diff line number Diff line change 1
1
[submodule "scripts "]
2
2
path = scripts
3
3
url = https://github.com/armorfret/ci-helpers
4
- [submodule "ansible "]
5
- path = ansible
6
- url = https://github.com/akerl/deploy-wireguard-server
Original file line number Diff line number Diff line change @@ -22,26 +22,5 @@ item do
22
22
regex /^\s+- TERRAFORM_VERSION=([\d.]+)$/
23
23
end
24
24
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
46
25
end
47
26
end
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -26,19 +26,19 @@ resource "linode_instance" "vpn" {
26
26
provisioner "ansible" {
27
27
plays {
28
28
playbook = {
29
- file_path = " ${ path . module } /ansible /linode/bootstrap.yml"
29
+ file_path = " ${ var . ansible_repo_path } /linode/bootstrap.yml"
30
30
}
31
31
}
32
32
33
33
plays {
34
34
playbook = {
35
- file_path = " ${ path . module } /ansible /linode/setup.yml"
35
+ file_path = " ${ var . ansible_repo_path } /linode/setup.yml"
36
36
}
37
37
}
38
38
39
39
plays {
40
40
playbook = {
41
- file_path = " ${ path . module } /ansible /main.yml"
41
+ file_path = " ${ var . ansible_repo_path } /main.yml"
42
42
skip_tags = [" users" ]
43
43
}
44
44
}
Original file line number Diff line number Diff line change @@ -32,3 +32,8 @@ variable "source_image_id" {
32
32
default = " linode/ubuntu18.04"
33
33
description = " Source image to build on"
34
34
}
35
+
36
+ variable "ansible_repo_path" {
37
+ type = " string"
38
+ description = " Path to deploy-wireguard-server repo"
39
+ }
You can’t perform that action at this time.
0 commit comments