diff options
Diffstat (limited to 'inventory')
-rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 1 | ||||
-rw-r--r-- | inventory/group_vars/vmhost-ch-atlas/vars.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/ch-testvm-atlas.yml (renamed from inventory/host_vars/ch-testvm.yml) | 0 | ||||
-rw-r--r-- | inventory/host_vars/ch-testvm-prometheus.yml | 33 | ||||
-rw-r--r-- | inventory/hosts.ini | 6 |
5 files changed, 39 insertions, 3 deletions
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index ea7b4958..ba06f20c 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -52,6 +52,7 @@ network_zones: ch-imap-proxy: 9 ch-jump: 22 ch-gw-lan: 28 + ch-testvm-prometheus: 42 ch-nic: 53 __svc_http__: 80 __svc_imap__: 143 diff --git a/inventory/group_vars/vmhost-ch-atlas/vars.yml b/inventory/group_vars/vmhost-ch-atlas/vars.yml index ce0421b5..dd69b6e6 100644 --- a/inventory/group_vars/vmhost-ch-atlas/vars.yml +++ b/inventory/group_vars/vmhost-ch-atlas/vars.yml @@ -15,7 +15,7 @@ vm_host: gateway6: 2a02:3e0:407::1 offsets: ch-keyserver: 3 - ch-testvm: 4 + ch-testvm-atlas: 4 ele-mur: 5 r3-vex2: 11 ch-atlas: 13 diff --git a/inventory/host_vars/ch-testvm.yml b/inventory/host_vars/ch-testvm-atlas.yml index e86eb632..e86eb632 100644 --- a/inventory/host_vars/ch-testvm.yml +++ b/inventory/host_vars/ch-testvm-atlas.yml diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml new file mode 100644 index 00000000..597cd134 --- /dev/null +++ b/inventory/host_vars/ch-testvm-prometheus.yml @@ -0,0 +1,33 @@ +--- +install_jumphost: ch-jump + +install: + vm: + memory: 1G + numcpus: 1 + autostart: False + disks: + primary: /dev/sda + scsi: + sda: + type: zfs + name: root + size: 5g + interfaces: + - bridge: br-svc + name: svc0 + +network: + nameservers: "{{ network_zones.svc.dns }}" + domain: "{{ host_domain }}" + systemd_link: + interfaces: "{{ install.interfaces }}" + primary: &_network_primary_ + name: svc0 + address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + gateway: "{{ network_zones.svc.gateway }}" + static_routes: + - destination: "{{ network_zones.lan.prefix }}" + gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}" + interfaces: + - *_network_primary_ diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 1cd73899..812e7bab 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -26,10 +26,11 @@ ch-http-proxy host_name=http-proxy ch-imap-proxy host_name=imap-proxy ch-auth-legacy host_name=auth ch-prometheus-legacy host_name=prometheus +ch-testvm-prometheus host_name=testvm-prometheus ch-atlas host_name=atlas ch-pan host_name=pan ch-keyserver host_name=keyserver -ch-testvm host_name=testvm +ch-testvm-atlas host_name=testvm-atlas ch-mimas host_name=mimas ch-mimas2 host_name=mimas @@ -269,13 +270,14 @@ ch-http-proxy ch-imap-proxy ch-auth-legacy ch-prometheus-legacy +ch-testvm-prometheus [vmhost-ch-prometheus] ch-prometheus [vmhost-ch-prometheus:children] vmhost-ch-prometheus-guests [vmhost-ch-atlas-guests] -ch-testvm +ch-testvm-atlas ele-mur r3-vex2 ch-keyserver |