Skip to content

Commit a8de1f6

Browse files
committed
{ansible,terraform}: Add a-mci-us to the managed fleet
1 parent 62a5eb4 commit a8de1f6

8 files changed

Lines changed: 46 additions & 19 deletions

File tree

ansible/group_vars/hashimirror.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
nomad_datacenter: VOID-MIRROR

ansible/group_vars/prod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ void_mesh:
7474
f-sfo3-us.m.voidlinux.org: 192.168.99.111
7575
a-fsn-de.m.voidlinux.org: 192.168.99.112
7676
b-hel-fi.m.voidlinux.org: 192.168.99.113
77+
a-mci-us.m.voidlinux.org: 192.168.99.114
7778

7879
consul_servers:
7980
- 192.168.99.104

ansible/hashi-worker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- hosts: hashiworker,hashiproxy,hashimx
2+
- hosts: hashiworker,hashiproxy,hashimirror,hashimx
33
become: yes
44
become_user: root
55
become_method: sudo
@@ -10,7 +10,7 @@
1010
- nomad-client
1111

1212

13-
- hosts: hashiproxy
13+
- hosts: hashiproxy,hashimirror
1414
become: yes
1515
become_user: root
1616
become_method: sudo
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
network_interfaces:
3+
- name: eno1
4+
mode: static
5+
mode6: disabled
6+
resolvermode: static
7+
resolvermode6: disabled
8+
addresses:
9+
- 199.168.97.186/29
10+
resolvers:
11+
- 8.8.8.8
12+
routers:
13+
- 199.168.97.185
14+
15+
xbps_repository_address: alpha.de.repo.voidlinux.org
16+
xbps_repository_main: http://{{ xbps_repository_address }}/current/musl
17+
xbps_repository_nonfree: http://{{ xbps_repository_address }}/current/musl/nonfree
18+
xbps_repository_multilib: http://{{ xbps_repository_address }}/current/musl/multilib
19+
xbps_repository_multilib_nonfree: http://{{ xbps_repository_address }}/current/musl/multilib/nonfree
20+
21+
netlogon_use_cache: false
22+
23+
nomad_host_volumes:
24+
- name: root_mirror
25+
path: /data/root_mirror
26+
read_only: false

ansible/host_vars/b-hel-fi.m.voidlinux.org.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,4 @@ netlogon_use_cache: false
2525
nomad_host_volumes:
2626
- name: root_mirror
2727
path: /data/root_mirror
28-
read_only: true
29-
- name: dist_pkgs
30-
path: /data/root_mirror/current
31-
read_only: false
32-
- name: dist_sources
33-
path: /data/sources_mirror
3428
read_only: false

ansible/inventory

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,9 @@ a-hel-fi.m.voidlinux.org
1616
[man]
1717
a-hel-fi.m.voidlinux.org
1818

19-
[mirror]
20-
vm1.a-mci-us.m.voidlinux.org
21-
2219
[popcorn]
2320
a-hel-fi.m.voidlinux.org
2421

25-
[lxc]
26-
vm1.a-mci-us.m.voidlinux.org
27-
2822
[mirrormanager]
2923
a-hel-fi.m.voidlinux.org
3024

@@ -44,11 +38,13 @@ c-sfo3-us.m.voidlinux.org
4438
d-sfo3-us.m.voidlinux.org
4539
e-sfo3-us.m.voidlinux.org
4640
f-sfo3-us.m.voidlinux.org
41+
a-mci-us.m.voidlinux.org
4742

4843
[hashi:children]
4944
hashimaster
5045
hashiworker
5146
hashiproxy
47+
hashimirror
5248
hashimx
5349

5450
[hashimaster]
@@ -58,19 +54,21 @@ d-sfo3-us.m.voidlinux.org
5854

5955
[hashiworker]
6056
a-hel-fi.m.voidlinux.org
61-
b-hel-fi.m.voidlinux.org
6257
a-fsn-de.m.voidlinux.org
6358
b-lej-de.m.voidlinux.org
6459
c-lej-de.m.voidlinux.org
6560

6661
[hashiproxy]
6762
e-sfo3-us.m.voidlinux.org
6863

64+
[hashimirror]
65+
b-hel-fi.m.voidlinux.org
66+
a-mci-us.m.voidlinux.org
67+
6968
[hashimx]
7069
f-sfo3-us.m.voidlinux.org
7170

7271
[unmanaged]
73-
a-mci-us.m.voidlinux.org
7472
a-lej-de.m.voidlinux.org
7573

7674
[prod]
@@ -87,5 +85,3 @@ c-sfo3-us.m.voidlinux.org
8785
d-sfo3-us.m.voidlinux.org
8886
e-sfo3-us.m.voidlinux.org
8987
f-sfo3-us.m.voidlinux.org
90-
91-
vm1.a-mci-us.m.voidlinux.org

ansible/roles/docker/tasks/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44
pkg: docker
55
state: present
66

7+
- name: Create config directory
8+
file:
9+
path: /etc/docker
10+
state: directory
11+
owner: root
12+
group: root
13+
mode: 0755
14+
715
- name: Install daemon.json
816
template:
917
src: daemon.json

terraform/do/dns.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ resource "digitalocean_record" "a_mci_us" {
9191
domain = digitalocean_domain.voidlinux_org.name
9292
type = "A"
9393
name = "a-mci-us.m"
94-
value = "198.204.250.218"
94+
value = "199.168.97.186"
9595
}
9696

9797
resource "digitalocean_record" "vm1_a_mci_us" {

0 commit comments

Comments
 (0)