diff options
author | Christian Pointner <equinox@spreadspace.org> | 2019-09-12 00:08:14 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2019-09-12 00:08:33 +0200 |
commit | 1df0a0fe2b1288de3f7e599bac86f864dca22543 (patch) | |
tree | 3d71d5f26642f79bfe7d2c248834718fbeeccfba /inventory | |
parent | fix zfs role (diff) |
refactored spreadspace hostnames
Diffstat (limited to 'inventory')
-rw-r--r-- | inventory/group_vars/elevate-festival/main.yml | 8 | ||||
-rw-r--r-- | inventory/group_vars/k8s-emc/main.yml | 8 | ||||
-rw-r--r-- | inventory/group_vars/r3-cccamp19/network.yml | 8 | ||||
-rw-r--r-- | inventory/host_vars/ch-pan.yml | 4 | ||||
-rw-r--r-- | inventory/host_vars/ele-dione.yml (renamed from inventory/host_vars/dione.yml) | 3 | ||||
-rw-r--r-- | inventory/host_vars/ele-helene.yml (renamed from inventory/host_vars/helene.yml) | 3 | ||||
-rw-r--r-- | inventory/host_vars/r3-cccamp19-dione.yml | 20 | ||||
-rw-r--r-- | inventory/host_vars/r3-cccamp19-helene.yml | 20 | ||||
-rw-r--r-- | inventory/host_vars/s2-calypso.yml (renamed from inventory/host_vars/calypso.yml) | 0 | ||||
-rw-r--r-- | inventory/host_vars/s2-dione.yml | 34 | ||||
-rw-r--r-- | inventory/host_vars/s2-helene.yml | 34 | ||||
-rw-r--r-- | inventory/host_vars/s2-telesto.yml (renamed from inventory/host_vars/telesto.yml) | 0 | ||||
-rw-r--r-- | inventory/host_vars/s2-thetys.yml (renamed from inventory/host_vars/thetys.yml) | 0 | ||||
-rw-r--r-- | inventory/hosts.ini | 25 |
14 files changed, 137 insertions, 30 deletions
diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml index 5a513cfe..1e535a93 100644 --- a/inventory/group_vars/elevate-festival/main.yml +++ b/inventory/group_vars/elevate-festival/main.yml @@ -54,8 +54,8 @@ network_zones: ele-sw-dom0: 20 ele-sw-kunsthaus0: 30 ele-sw-orpheum0: 40 - dione: 100 ## ipmi - helene: 101 ## ipmi + ele-dione: 100 ## ipmi + ele-helene: 101 ## ipmi ele-ap-forum0: 110 ele-ap-forum1: 111 ele-ap-forum2: 112 @@ -125,6 +125,6 @@ network_zones: - 217.29.144.66 offsets: ## citycom uses offset 1,2 and 3 - helene: 4 # 85.237.28.196 - dione: 5 # 85.237.28.197 + ele-helene: 4 # 85.237.28.196 + ele-dione: 5 # 85.237.28.197 ele-laptop: 7 # 85.237.28.199 diff --git a/inventory/group_vars/k8s-emc/main.yml b/inventory/group_vars/k8s-emc/main.yml index 18c28177..b7c52b09 100644 --- a/inventory/group_vars/k8s-emc/main.yml +++ b/inventory/group_vars/k8s-emc/main.yml @@ -33,8 +33,8 @@ kubernetes: emc-06: 6 emc-00: 100 emc-dist0: 110 - dione: 111 - helene: 112 + ele-dione: 111 + ele-helene: 112 emc-stats: 120 emc-master: 127 @@ -42,5 +42,5 @@ kubernetes: encoder: transfer_net: 172.18.191.0/24 node_interface: - dione: eno2 - helene: eno2 + ele-dione: eno2 + ele-helene: eno2 diff --git a/inventory/group_vars/r3-cccamp19/network.yml b/inventory/group_vars/r3-cccamp19/network.yml index 4efd0bae..f2d84334 100644 --- a/inventory/group_vars/r3-cccamp19/network.yml +++ b/inventory/group_vars/r3-cccamp19/network.yml @@ -13,8 +13,8 @@ network_zones: start: 1 limit: 199 offsets: - dione: 200 - helene: 201 + r3-cccamp19-dione: 200 + r3-cccamp19-helene: 201 r3-cccamp19-flora: 220 r3-cccamp19-verr: 221 r3-cccamp19-feedcode: 222 @@ -25,8 +25,8 @@ network_zones: vlan: 41 prefix: 192.168.41.0/24 offsets: - dione: 100 - helene: 101 + r3-cccamp19-dione: 100 + r3-cccamp19-helene: 101 r3-cccamp19-sw0: 200 r3-cccamp19-sw1: 201 r3-cccamp19-sw2: 202 diff --git a/inventory/host_vars/ch-pan.yml b/inventory/host_vars/ch-pan.yml index dae1666e..560cf90b 100644 --- a/inventory/host_vars/ch-pan.yml +++ b/inventory/host_vars/ch-pan.yml @@ -8,5 +8,5 @@ dyndns: r3-cccamp19-flora: r3-cccamp19-flora r3-cccamp19-verr: r3-cccamp19-verr r3-cccamp19-av: r3-cccamp19-av - dione: r3-cccamp19-dione - helene: r3-cccamp19-helene + r3-cccamp19-dione: r3-cccamp19-dione + r3-cccamp19-helene: r3-cccamp19-helene diff --git a/inventory/host_vars/dione.yml b/inventory/host_vars/ele-dione.yml index b0f68f04..7a2e4a92 100644 --- a/inventory/host_vars/dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -32,6 +32,3 @@ kubelet_lvm: lv: kubelet size: 10G fs: ext4 - -dyndns: - server: ch-pan diff --git a/inventory/host_vars/helene.yml b/inventory/host_vars/ele-helene.yml index 6b433e79..c5b4fea3 100644 --- a/inventory/host_vars/helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -32,6 +32,3 @@ kubelet_lvm: lv: kubelet size: 10G fs: ext4 - -dyndns: - server: ch-pan diff --git a/inventory/host_vars/r3-cccamp19-dione.yml b/inventory/host_vars/r3-cccamp19-dione.yml new file mode 100644 index 00000000..b674aeb1 --- /dev/null +++ b/inventory/host_vars/r3-cccamp19-dione.yml @@ -0,0 +1,20 @@ +--- +install_interface: eno1 +install_dhcp: true + +install: + efi: true + disks: + primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 + +network: + domain: camp.realraum.at + + +base_packages_extra_host: +- vlan + +ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" + +dyndns: + server: ch-pan diff --git a/inventory/host_vars/r3-cccamp19-helene.yml b/inventory/host_vars/r3-cccamp19-helene.yml new file mode 100644 index 00000000..af3895ec --- /dev/null +++ b/inventory/host_vars/r3-cccamp19-helene.yml @@ -0,0 +1,20 @@ +--- +install_interface: eno1 +install_dhcp: true + +install: + efi: true + disks: + primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346 + +network: + domain: camp.realraum.at + + +base_packages_extra_host: +- vlan + +ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" + +dyndns: + server: ch-pan diff --git a/inventory/host_vars/calypso.yml b/inventory/host_vars/s2-calypso.yml index 8105a76b..8105a76b 100644 --- a/inventory/host_vars/calypso.yml +++ b/inventory/host_vars/s2-calypso.yml diff --git a/inventory/host_vars/s2-dione.yml b/inventory/host_vars/s2-dione.yml new file mode 100644 index 00000000..7a2e4a92 --- /dev/null +++ b/inventory/host_vars/s2-dione.yml @@ -0,0 +1,34 @@ +--- +install_interface: eno1 +install_dhcp: true + +install: + efi: true + disks: + primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 + +network: + domain: spreadspace.org + + +base_packages_extra_host: +- exfat-fuse +- exfat-utils +- vlan + +admin_user_host: +- "{{ equinox_user }}" + +ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" + +docker_lvm: + vg: "{{ host_name }}" + lv: docker + size: 15G + fs: ext4 + +kubelet_lvm: + vg: "{{ host_name }}" + lv: kubelet + size: 10G + fs: ext4 diff --git a/inventory/host_vars/s2-helene.yml b/inventory/host_vars/s2-helene.yml new file mode 100644 index 00000000..c5b4fea3 --- /dev/null +++ b/inventory/host_vars/s2-helene.yml @@ -0,0 +1,34 @@ +--- +install_interface: eno1 +install_dhcp: true + +install: + efi: true + disks: + primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346 + +network: + domain: spreadspace.org + + +base_packages_extra_host: +- exfat-fuse +- exfat-utils +- vlan + +admin_user_host: +- "{{ equinox_user }}" + +ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" + +docker_lvm: + vg: "{{ host_name }}" + lv: docker + size: 15G + fs: ext4 + +kubelet_lvm: + vg: "{{ host_name }}" + lv: kubelet + size: 10G + fs: ext4 diff --git a/inventory/host_vars/telesto.yml b/inventory/host_vars/s2-telesto.yml index 8105a76b..8105a76b 100644 --- a/inventory/host_vars/telesto.yml +++ b/inventory/host_vars/s2-telesto.yml diff --git a/inventory/host_vars/thetys.yml b/inventory/host_vars/s2-thetys.yml index 8105a76b..8105a76b 100644 --- a/inventory/host_vars/thetys.yml +++ b/inventory/host_vars/s2-thetys.yml diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 41804d59..c2f24cc6 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -63,6 +63,8 @@ r3-cccamp19 host_domain=camp.realraum.at [r3-cccamp19] +r3-cccamp19-helene host_name=helene +r3-cccamp19-dione host_name=dione r3-cccamp19-gw r3-cccamp19-sw0 ansible_host=192.168.41.200 ansible_port=22 r3-cccamp19-flora host_name=flora @@ -80,17 +82,18 @@ env_group=spreadspace ansible_port=222 [spreadspace] -build -calypso -telesto -thetys -dione -helene +s2-build host_name=build +s2-calypso host_name=calypso +s2-telesto host_name=telesto +s2-thetys host_name=thetys +s2-dione host_name=dione +s2-helene host_name=helene [emc:vars] host_domain=spreadspace.org env_group=spreadspace +ansible_port=222 [emc] emc-stats @@ -151,6 +154,8 @@ ele-media host_name=media ele-router ele-telesto host_name=telesto ele-thetys host_name=thetys +ele-dione host_name=dione +ele-helene host_name=helene ele-uhrturm host_name=uhrturm ele-lt host_name=liquidtruth ansible_port=222 @@ -176,8 +181,8 @@ sk2013 sk2016 ch-atlas ch-gnocchi -dione -helene +r3-cccamp19-dione +r3-cccamp19-helene [kvmguests] emc-stats @@ -236,8 +241,8 @@ ele-dolmetsch-raspi ### kubernetes cluster: emc [k8s-emc-encoder] -#dione -#helene +#s2-dione +#s2-helene [k8s-emc-distribution:children] emc-dist |