From 17447210485bbe379beb9c7e9a3034e900110ed9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 1 Dec 2018 23:14:05 +0100 Subject: moved to multi environment repo structure --- inventory/group_vars/all/main.yml | 15 ++++ inventory/group_vars/elevate/main.yml | 4 + inventory/group_vars/hetzner/main.yml | 6 ++ inventory/group_vars/k8s-emc/main.yml | 39 +++++++++ inventory/group_vars/skillz/main.yml | 2 + inventory/group_vars/spreadspace/main.yml | 8 ++ inventory/host_vars/calypso.yml | 10 +++ inventory/host_vars/dione.yml | 22 +++++ inventory/host_vars/elesearch.yml | 29 +++++++ inventory/host_vars/emc-master.yml | 41 +++++++++ inventory/host_vars/emc-stats.yml | 52 +++++++++++ inventory/host_vars/helene.yml | 22 +++++ inventory/host_vars/sk2013.yml | 33 +++++++ inventory/host_vars/sk2016.yml | 32 +++++++ inventory/host_vars/telesto.yml | 10 +++ inventory/host_vars/thetys.yml | 10 +++ inventory/hosts.ini | 138 ++++++++++++++++++++++++++++++ 17 files changed, 473 insertions(+) create mode 100644 inventory/group_vars/all/main.yml create mode 100644 inventory/group_vars/elevate/main.yml create mode 100644 inventory/group_vars/hetzner/main.yml create mode 100644 inventory/group_vars/k8s-emc/main.yml create mode 100644 inventory/group_vars/skillz/main.yml create mode 100644 inventory/group_vars/spreadspace/main.yml create mode 100644 inventory/host_vars/calypso.yml create mode 100644 inventory/host_vars/dione.yml create mode 100644 inventory/host_vars/elesearch.yml create mode 100644 inventory/host_vars/emc-master.yml create mode 100644 inventory/host_vars/emc-stats.yml create mode 100644 inventory/host_vars/helene.yml create mode 100644 inventory/host_vars/sk2013.yml create mode 100644 inventory/host_vars/sk2016.yml create mode 100644 inventory/host_vars/telesto.yml create mode 100644 inventory/host_vars/thetys.yml create mode 100644 inventory/hosts.ini (limited to 'inventory') diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml new file mode 100644 index 00000000..65417f03 --- /dev/null +++ b/inventory/group_vars/all/main.yml @@ -0,0 +1,15 @@ +--- +equinox_user: + name: equinox + # password: "{{ vault_equinox_password }}" + shell: /bin/zsh + + +ssh_keys: + equinox: + chaos: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDL8afqxWieebpxezBuLj2CIx/iAuTY9ziJt8JCJE0qYh+B2wXe9e+sPaKwz5yyS0X0MoEPHbYuVytxGQfGhdVR57gWWTYq5MBBFEqmu5MexAFKlNxad4TNQQwhs7rnI+lptKJO+rqeG/vaQBgao+61ZVwRR5Zr1zsXEoo5m4VB8VPo3TW0nSb97LdMyUmb1TaqDKJ5hrtrV6YcokXzE8FwHMK15oJsuJC7YUReijol3hGsRVw1H5S1zu4uDz7G32dPVxoLOPgupnf0SxnXdNVfNU50MHHSK68HzBXz4/rE1YLacRPloOhO7xegkWd5KGa09opEbUGzGu/lSXgHuAJpPgloy14cehDhLJ7F7SbXK4QBBtVgV+1CYXG2eJsRHIdkWiTWLuG+QZ4oEFLjQBjWpUYsEiDt9FEtSVCtKH2vBk26ps5yIoSCtYq6POvg9miGgcpQA6HHwh5ekVUaKRGWuMdAIvjvQSlCsFjYkxD1NpCgU1RhyWWTI3xTSKzTxcXiCWWZoBDJVoW46EpSvySsOpxL/hLxJwMR8ouc6cPRZZl3m51824Rv3LdEXNBmn3vnojzIvrOed3sxpD0+7+tbA4J1uTbAxtkOMhK94WXKiUAOD7e5bJYdzajvDD2T9tkj/Mqdo8z3iR2/yjkGMEAeWWVOQEh7QhQS7OFEAKK4fw== equinox@chaos-at-home.org + ele: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwjCMiwyz7f0b1b6S5RjGbYXjd+hkTVsNzZ9xIkqqvdF8zCU6qZTqkhem13m6E1aPjALl0iyrmpb8N2pmASD7axUaTMTDd2tktkB3LULBbQCCApMnw5viZc9fm9dLBdbdiYyRtNrpk/b39V+9uViAbRtATBrYS5vV/14gT42WxPhpFiCz6A5JsKpmbBafS9vfexnqLTvKBtYLt+zhuS9eFovMHM5k7Qq4mRdKe+wdMBDeRls2z2G/ZjPrfHAkw2WctFUdSY+YAVzLB0SddVWnbOSZ19tsnzskyHpDD49LWb7wYl0OJ9fhxO02lnxW5Vdpwwwx8I7FVH83fDTQpzfSdr8tMY3F9rvCmi4noiTGDE2AAWqh73unKuydvBomNYX8HbuiJO9eTgwUIRAqsl8vHNU5rA10YF5r2SUqofrBNfINUH8x0NhpLGzNPIlazndaPY1no+XeQRQtgSU1bdDQzmySyyn5g9mlMSTU+jHfzyoK7yqlKE0W/R2ZTOEwr6+uRdFqn+mWmB0Mr20YavjVretseVs1AkmqaVClEO1juwb/CWI//Nd4uboD9zdZwkHmCjLlOmC+GkGrnLValaqQDh8iR8aKiVbaQVffl3ph1pD3BCn79KJy56YySLTbaI4lFDUHherkTdvgyMVmZJZMROzwuX7i4bi04TZ/GKTfDrw== equinox@elevate.at + ff: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjqlbFhzWRt2EnUrd7AFgR2iqPbV655OE38184ws+RvO82ImpJsKy80AvLQ3DhplLAN2W9kROBn3bga89pK7Sf78EwYYb5e+McVA0vUH/mnPurJpgPHg6q34yW5G5JVqKTmlqzQMDzmYw0iFNcieGmWXmx2QTtHj8qLuGOuBOE6/mljhgE7Pq4S0oyMjH2tLOhHS1Lykh5DH/OaHpofyUcd2uOCkgOClOUBHZ7Oo82J7yk5SZSVcrjQ4psO9ptqWNmw58ZBX5OPDTV/N7wPjgr2TL3HfCe8gkf2jERsghKufSuFpf2P6bNrK4k+grxB+LXuZihvOxJGRjemqImqvqaADLs23yCUWhgF/9oQ25ACydRGhHc56KIC3lQ3KOGoYT2IGo3Si/bQ7FpQIkODRWPHNKqbpItGm07uSTvkPZ4CadlG0MRhlOEjzRQgP1GYjr8w6917RZxO3DHndC1TfsciYhuwDGLon8WNtw1AjqRXolGnrkB2GsEENGvtJC97dioxPamOBctu06xdmDXwYpynXePoAp4+XxFlj/lUC8draUrKjAh++/LkId2Ldlxm0b1tGyfPl1ox1Gu9lY4QwoeGsTm/RJFnVH8kKns0aLHIlSdYp1+XdlQmBYSIIvVYFynVOQIKBzMBqQG9wcLbnMt7+Kz4coPI0TSvmn2dbDVKw== equinox@ffgraz.net + mur: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUW4fz/Vs4w5JMIFxoftimcbkqksZPDMfbHH/wfPKFAfJdi+fdGfWqqP7hy2/1iREF5W0L5dz9zQus0xS1/kkneUUL3CCKBD3+VzZqIbhy5rMlifd+jacVV+UZGhl/WP/wagu4+Mv0/ksXIlN6/2Pv2+ojjpGeCv4FHG/kR68zKoKNLxjHiTKt3LM9AFtx3Pn3ghIO3egbzaQ8vnTdQjGJHiosfKxiGZfnkAWvrMMq1sCJUJS7A8n2S3QUjoap3OYrVqFcPO4R/VaCaBWVdSKrymnpOGABvP9QuGenZ0CFXgl+p5QwKJz7n3CQHooUai+FPmmrCmtRV1QICyON8vdNI4hU5O1ksZOYxa0vptfqd//FMyauek5JzCDr4ExOWaZvhGsvZdLuWwiN/8KwpsgY+duiqWVC9jCOymFBPQ0Qik1hjCLXUWxDKcJIpF3WfHaHPESAlmNCKPbH5X7oBDOI5k96J34vDl1cBLjcVydtwfwbJmbApOMz3IukoUlYusbvLo2bJicHolkNrlS6qcSbaPpKsrjZ5II0Fks/S39q5rE//nVsY5oE35Gm5Pb7gndSuo/l01WOANYmKuYiwUz/XC62fis7fxiCxmLPMG3PIym7E3pe+lTjSOI3SN24cgwArDEvGZhqeyOHN468Yt8mPersXvY/cUMS1XFvLadtnw== equinox@mur.at + r3: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDj7AcnQZCRihToOI7/L5YslP4bkZlZwR2dg6hV8EfQ+37z1p0imhoqc2Oz/zIEgOVARBHkn5XmfR9Bu6e3YfKpXpJXC9O3jpRSw34Xac/8qXzWZsqVAXbtzvBlYA/G4j0NQM9XIVBa1ZzBZu87xeE4KUWzO80fnQ+G3GSBp28BM4TUiSOmX9y58chPZfUp2DE80fInoXv11ikLLCBDXfMkzFCZ4Gcexhr0TYcBUgLV7ufL0xqLg4yE+Z21PLtttvVYgZIers2nWetLPoREi5yDGKeCjJVyT00X2rp6h3eFkc/VaHfb5c2MY9/4BOt+cbFCx73sG0C1SnSzWd624K/8CEoJTsX4MazLLrxwi3hIwiYX1mCCfq4+S4PpSFvMUGdMWB52PkBRXulQislCVBA/lzma93xJr1jWVFSikjkvAUt8Zt33vHMRd7RMYDfsDVIEKpUT49cBj0v7zs6IVE858J33sUZoVXaiA2sjsap8RguNtjJMSYx8+nwkQAjxwlTiV2J6pHGQHJDyeVsqGlnMpEk32ZeSs/BQ7XWPG62FT3SN6E4C/fa8dawvs7RgY0cbZkhucECBu9Zto/KakIhzLtFzgDighPmK5SlAPoNEJLJYPo5ry2SBTysc4uV7xYZSQ6OVofeQeFXKL8oPe/ZAvKafn3Zk0mQcCtH0Z8q8iQ== equinox@realraum.at + spread: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org diff --git a/inventory/group_vars/elevate/main.yml b/inventory/group_vars/elevate/main.yml new file mode 100644 index 00000000..1808db88 --- /dev/null +++ b/inventory/group_vars/elevate/main.yml @@ -0,0 +1,4 @@ +--- +sshserver_root_keys: "{{ [ ssh_keys.equinox.ele ] | join('\n') }}" + +acmetool_account_email: equinox@elevate.at diff --git a/inventory/group_vars/hetzner/main.yml b/inventory/group_vars/hetzner/main.yml new file mode 100644 index 00000000..2e5c8b4a --- /dev/null +++ b/inventory/group_vars/hetzner/main.yml @@ -0,0 +1,6 @@ +--- +debian_mirror: + packages: http://mirror.hetzner.de/debian/packages + security: http://mirror.hetzner.de/debian/security + +ubuntu_mirror: http://mirror.hetzner.de/ubuntu/packages diff --git a/inventory/group_vars/k8s-emc/main.yml b/inventory/group_vars/k8s-emc/main.yml new file mode 100644 index 00000000..6b1344ae --- /dev/null +++ b/inventory/group_vars/k8s-emc/main.yml @@ -0,0 +1,39 @@ +--- +docker_pkg_version: 17.03.2~ce-0~debian-stretch + +kubernetes: + pkg_version: 1.9.6-00 + + dedicated_master: True + api_advertise_ip: 144.76.160.141 + api_extra_sans: + - emc-master.spreadspace.org + + pod_ip_range: 172.18.0.0/16 + pod_ip_range_size: 24 + service_ip_range: 172.18.192.0/18 + ## net_index must be in the range between 1 and 190 -> 189 hosts possible + ## + ## hardcoded hostnames are not nice but if we do this via host_vars + ## the info is spread over multiple files and this makes it more diffcult + ## to find mistakes, so it is nicer to keep it in one place... + net_index: + emc-01: 1 + emc-02: 2 + emc-03: 3 + emc-04: 4 + emc-05: 5 + emc-06: 6 + emc-test: 99 + emc-00: 100 + dione: 101 + helene: 102 + emc-stats: 120 + emc-master: 127 + + direct_net_zones: + encoder: + transfer_net: 172.18.191.0/24 + node_interface: + dione: eno2 + helene: eno2 diff --git a/inventory/group_vars/skillz/main.yml b/inventory/group_vars/skillz/main.yml new file mode 100644 index 00000000..4d8f679d --- /dev/null +++ b/inventory/group_vars/skillz/main.yml @@ -0,0 +1,2 @@ +--- +sshserver_root_keys: "{{ [ ssh_keys.equinox.ele ] | join('\n') }}" diff --git a/inventory/group_vars/spreadspace/main.yml b/inventory/group_vars/spreadspace/main.yml new file mode 100644 index 00000000..cfe1ec2b --- /dev/null +++ b/inventory/group_vars/spreadspace/main.yml @@ -0,0 +1,8 @@ +--- +sshserver_root_keys: "{{ [ ssh_keys.equinox.spread ] | join('\n') }}" + +acmetool_account_email: equinox@spreadspace.org + +blackmagic_desktopvideo_apt: + username: "streaming" + password: "{{ vault_spreadspace.blackmagic_desktopvideo_apt_password }}" diff --git a/inventory/host_vars/calypso.yml b/inventory/host_vars/calypso.yml new file mode 100644 index 00000000..ff853586 --- /dev/null +++ b/inventory/host_vars/calypso.yml @@ -0,0 +1,10 @@ +--- +base_packages_extra_host: +- exfat-fuse +- exfat-utils +- vlan + +admin_user_host: +- "{{ equinox_user }}" + +sshserver_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" diff --git a/inventory/host_vars/dione.yml b/inventory/host_vars/dione.yml new file mode 100644 index 00000000..75b289c2 --- /dev/null +++ b/inventory/host_vars/dione.yml @@ -0,0 +1,22 @@ +--- +base_packages_extra_host: +- exfat-fuse +- exfat-utils +- vlan + +admin_user_host: +- "{{ equinox_user }}" + +sshserver_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" + +docker_lvm: + vg: dione + lv: docker + size: 15G + fs: ext4 + +kubelet_lvm: + vg: dione + lv: kubelet + size: 10G + fs: ext4 diff --git a/inventory/host_vars/elesearch.yml b/inventory/host_vars/elesearch.yml new file mode 100644 index 00000000..0e235000 --- /dev/null +++ b/inventory/host_vars/elesearch.yml @@ -0,0 +1,29 @@ +--- +vm_install_host: sk2013 + +vm_install: + host: "{{ vm_install_host }}" + mem: 1024 + numcpu: 4 + disks: + primary: vda + virtio: + vda: + vg: storage + lv: "{{ inventory_hostname }}" + size: 50g + interfaces: + - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + name: primary0 + autostart: True + +vm_network: + nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" + domain: elevate.at + systemd_link: + interfaces: "{{ vm_install.interfaces }}" + primary: + interface: primary0 + ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml new file mode 100644 index 00000000..95b3062a --- /dev/null +++ b/inventory/host_vars/emc-master.yml @@ -0,0 +1,41 @@ +--- +vm_install_host: sk2013 + +vm_install: + host: "{{ vm_install_host }}" + mem: 1024 + numcpu: 2 + disks: + primary: vda + virtio: + vda: + vg: storage + lv: "{{ inventory_hostname }}" + size: 42g + interfaces: + - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + name: primary0 + autostart: True + +vm_network: + nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" + domain: spreadspace.org + systemd_link: + interfaces: "{{ vm_install.interfaces }}" + primary: + interface: primary0 + ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" + +docker_lvm: + vg: "{{ inventory_hostname }}" + lv: docker + size: 10G + fs: ext4 + +kubelet_lvm: + vg: "{{ inventory_hostname }}" + lv: kubelet + size: 10G + fs: ext4 diff --git a/inventory/host_vars/emc-stats.yml b/inventory/host_vars/emc-stats.yml new file mode 100644 index 00000000..89352b4f --- /dev/null +++ b/inventory/host_vars/emc-stats.yml @@ -0,0 +1,52 @@ +--- +vm_install_host: sk2016 + +vm_install: + host: "{{ vm_install_host }}" + mem: 8192 + numcpu: 6 + disks: + primary: vda + virtio: + vda: + vg: storage + lv: "{{ inventory_hostname }}" + size: 42g + vdb: + vg: storage + lv: "{{ inventory_hostname }}-data" + size: 100g + interfaces: + - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + name: primary0 + autostart: True + +vm_network: + nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" + domain: spreadspace.org + systemd_link: + interfaces: "{{ vm_install.interfaces }}" + primary: + interface: primary0 + ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" + +docker_lvm: + vg: "{{ inventory_hostname }}" + lv: docker + size: 15G + fs: ext4 + +kubelet_lvm: + vg: "{{ inventory_hostname }}" + lv: kubelet + size: 10G + fs: ext4 + +emc_stats_lvm: + pvs: /dev/vdb + vg: "{{ inventory_hostname }}-data" + lv: stats + size: 50G + fs: ext4 diff --git a/inventory/host_vars/helene.yml b/inventory/host_vars/helene.yml new file mode 100644 index 00000000..b40fb069 --- /dev/null +++ b/inventory/host_vars/helene.yml @@ -0,0 +1,22 @@ +--- +base_packages_extra_host: +- exfat-fuse +- exfat-utils +- vlan + +admin_user_host: +- "{{ equinox_user }}" + +sshserver_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" + +docker_lvm: + vg: helene + lv: docker + size: 15G + fs: ext4 + +kubelet_lvm: + vg: helene + lv: kubelet + size: 10G + fs: ext4 diff --git a/inventory/host_vars/sk2013.yml b/inventory/host_vars/sk2013.yml new file mode 100644 index 00000000..920748c1 --- /dev/null +++ b/inventory/host_vars/sk2013.yml @@ -0,0 +1,33 @@ +--- +sshserver_allowusers_host: +- backuppc +- equinox +- dan + +vm_host: + installer: + net_if: virbr + preseed_path: /srv/preseed + path: /srv/installer + distros: + - distro: debian + codename: stretch + arch: + - amd64 + - i386 + - distro: ubuntu + codename: xenial + arch: + - amd64 + - i386 + network: + interface: virbr + ip: 192.168.160.254 + mask: 255.255.255.0 + nameservers: + - 213.133.100.100 + - 213.133.98.98 + - 213.133.99.99 + indices: + emc-master: 141 + elesearch: 142 diff --git a/inventory/host_vars/sk2016.yml b/inventory/host_vars/sk2016.yml new file mode 100644 index 00000000..872223db --- /dev/null +++ b/inventory/host_vars/sk2016.yml @@ -0,0 +1,32 @@ +--- +sshserver_allowusers_host: +- backuppc +- equinox +- dan + +vm_host: + installer: + net_if: virbr + preseed_path: /srv/preseed + path: /srv/installer + distros: + - distro: debian + codename: stretch + arch: + - amd64 + - i386 + - distro: ubuntu + codename: xenial + arch: + - amd64 + - i386 + network: + interface: virbr + ip: 192.168.216.254 + mask: 255.255.255.0 + nameservers: + - 213.133.100.100 + - 213.133.98.98 + - 213.133.99.99 + indices: + emc-stats: 200 diff --git a/inventory/host_vars/telesto.yml b/inventory/host_vars/telesto.yml new file mode 100644 index 00000000..ff853586 --- /dev/null +++ b/inventory/host_vars/telesto.yml @@ -0,0 +1,10 @@ +--- +base_packages_extra_host: +- exfat-fuse +- exfat-utils +- vlan + +admin_user_host: +- "{{ equinox_user }}" + +sshserver_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" diff --git a/inventory/host_vars/thetys.yml b/inventory/host_vars/thetys.yml new file mode 100644 index 00000000..ff853586 --- /dev/null +++ b/inventory/host_vars/thetys.yml @@ -0,0 +1,10 @@ +--- +base_packages_extra_host: +- exfat-fuse +- exfat-utils +- vlan + +admin_user_host: +- "{{ equinox_user }}" + +sshserver_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}" diff --git a/inventory/hosts.ini b/inventory/hosts.ini new file mode 100644 index 00000000..771b1b2c --- /dev/null +++ b/inventory/hosts.ini @@ -0,0 +1,138 @@ +[all:vars] +ansible_host={{ inventory_hostname }}.{{ host_domain }} +ansible_user=root +ansible_port=22000 + + +############################### +# environment: chaos-at-home + +[chaos-at-home:vars] +host_domain=chaos-at-home.org +environment_group=chaos-at-home + +[chaos-at-home] +prometheus +web +mail +stats +auth +atlas +pan +keyserver +mimas + + +############################### +# environment: spreadspace + +[spreadspace:vars] +host_domain=spreadspace.org +environment_group=spreadspace + +[spreadspace] +build ansible_port=222 +calypso +telesto +thetys +dione +helene +emc-test + + +############################### +# environment: elevate + +[skillz:vars] +host_domain=skillz.biz +environment_group=elevate + +[skillz] +sk2013 +sk2016 +sktorrent + + +[elevate:vars] +host_domain=elevate.at +environment_group=elevate + +[elevate] +elewolke +elestream +elemedia +elesearch + +[elevate:children] +emc + + +[emc:vars] +host_domain=spreadspace.org + +[emc] +emc-stats +emc-master + +[emc:children] +emc-xx + +[emc-xx] +#emc-0[0:6] +emc-00 + + +############################### +# host categories + +[kvmhosts] +prometheus +atlas +sk2013 +sk2016 + +[hetzner] +sk2013 +sk2016 +emc-stats +emc-master +mimas +sktorrent +elewolke +elestream +elesearch + +[hetzner:children] +emc-xx + + +[scaleway-kernel] +# emc-test + +[scaleway] +emc-test + +[scaleway:children] +scaleway-kernel + + +### kubernetes cluster: emc + +[k8s-emc-encoder] +#dione +#helene + +[k8s-emc-streamer:children] +emc-xx + +[k8s-emc-master] +emc-master + +[k8s-emc-stats] +emc-stats + +[k8s-emc:children] +k8s-emc-master +k8s-emc-encoder +k8s-emc-streamer +k8s-emc-stats -- cgit v1.2.3 From 270ff999c4ce9176414888b90db7f6b21ff0504e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 2 Dec 2018 02:01:43 +0100 Subject: some variable cleanup --- inventory/group_vars/all/main.yml | 18 +++++++++++------ inventory/group_vars/elevate/main.yml | 2 -- inventory/group_vars/skillz/main.yml | 2 -- inventory/group_vars/spreadspace/main.yml | 2 -- inventory/hosts.ini | 33 ++++++++++++++----------------- upgrade.sh | 13 ++++++------ 6 files changed, 34 insertions(+), 36 deletions(-) delete mode 100644 inventory/group_vars/skillz/main.yml (limited to 'inventory') diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml index 65417f03..e30c383a 100644 --- a/inventory/group_vars/all/main.yml +++ b/inventory/group_vars/all/main.yml @@ -1,4 +1,6 @@ --- +sshserver_root_keys: "{{ ssh_keys.equinox[environment_group] | join('\n') }}" + equinox_user: name: equinox # password: "{{ vault_equinox_password }}" @@ -7,9 +9,13 @@ equinox_user: ssh_keys: equinox: - chaos: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDL8afqxWieebpxezBuLj2CIx/iAuTY9ziJt8JCJE0qYh+B2wXe9e+sPaKwz5yyS0X0MoEPHbYuVytxGQfGhdVR57gWWTYq5MBBFEqmu5MexAFKlNxad4TNQQwhs7rnI+lptKJO+rqeG/vaQBgao+61ZVwRR5Zr1zsXEoo5m4VB8VPo3TW0nSb97LdMyUmb1TaqDKJ5hrtrV6YcokXzE8FwHMK15oJsuJC7YUReijol3hGsRVw1H5S1zu4uDz7G32dPVxoLOPgupnf0SxnXdNVfNU50MHHSK68HzBXz4/rE1YLacRPloOhO7xegkWd5KGa09opEbUGzGu/lSXgHuAJpPgloy14cehDhLJ7F7SbXK4QBBtVgV+1CYXG2eJsRHIdkWiTWLuG+QZ4oEFLjQBjWpUYsEiDt9FEtSVCtKH2vBk26ps5yIoSCtYq6POvg9miGgcpQA6HHwh5ekVUaKRGWuMdAIvjvQSlCsFjYkxD1NpCgU1RhyWWTI3xTSKzTxcXiCWWZoBDJVoW46EpSvySsOpxL/hLxJwMR8ouc6cPRZZl3m51824Rv3LdEXNBmn3vnojzIvrOed3sxpD0+7+tbA4J1uTbAxtkOMhK94WXKiUAOD7e5bJYdzajvDD2T9tkj/Mqdo8z3iR2/yjkGMEAeWWVOQEh7QhQS7OFEAKK4fw== equinox@chaos-at-home.org - ele: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwjCMiwyz7f0b1b6S5RjGbYXjd+hkTVsNzZ9xIkqqvdF8zCU6qZTqkhem13m6E1aPjALl0iyrmpb8N2pmASD7axUaTMTDd2tktkB3LULBbQCCApMnw5viZc9fm9dLBdbdiYyRtNrpk/b39V+9uViAbRtATBrYS5vV/14gT42WxPhpFiCz6A5JsKpmbBafS9vfexnqLTvKBtYLt+zhuS9eFovMHM5k7Qq4mRdKe+wdMBDeRls2z2G/ZjPrfHAkw2WctFUdSY+YAVzLB0SddVWnbOSZ19tsnzskyHpDD49LWb7wYl0OJ9fhxO02lnxW5Vdpwwwx8I7FVH83fDTQpzfSdr8tMY3F9rvCmi4noiTGDE2AAWqh73unKuydvBomNYX8HbuiJO9eTgwUIRAqsl8vHNU5rA10YF5r2SUqofrBNfINUH8x0NhpLGzNPIlazndaPY1no+XeQRQtgSU1bdDQzmySyyn5g9mlMSTU+jHfzyoK7yqlKE0W/R2ZTOEwr6+uRdFqn+mWmB0Mr20YavjVretseVs1AkmqaVClEO1juwb/CWI//Nd4uboD9zdZwkHmCjLlOmC+GkGrnLValaqQDh8iR8aKiVbaQVffl3ph1pD3BCn79KJy56YySLTbaI4lFDUHherkTdvgyMVmZJZMROzwuX7i4bi04TZ/GKTfDrw== equinox@elevate.at - ff: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjqlbFhzWRt2EnUrd7AFgR2iqPbV655OE38184ws+RvO82ImpJsKy80AvLQ3DhplLAN2W9kROBn3bga89pK7Sf78EwYYb5e+McVA0vUH/mnPurJpgPHg6q34yW5G5JVqKTmlqzQMDzmYw0iFNcieGmWXmx2QTtHj8qLuGOuBOE6/mljhgE7Pq4S0oyMjH2tLOhHS1Lykh5DH/OaHpofyUcd2uOCkgOClOUBHZ7Oo82J7yk5SZSVcrjQ4psO9ptqWNmw58ZBX5OPDTV/N7wPjgr2TL3HfCe8gkf2jERsghKufSuFpf2P6bNrK4k+grxB+LXuZihvOxJGRjemqImqvqaADLs23yCUWhgF/9oQ25ACydRGhHc56KIC3lQ3KOGoYT2IGo3Si/bQ7FpQIkODRWPHNKqbpItGm07uSTvkPZ4CadlG0MRhlOEjzRQgP1GYjr8w6917RZxO3DHndC1TfsciYhuwDGLon8WNtw1AjqRXolGnrkB2GsEENGvtJC97dioxPamOBctu06xdmDXwYpynXePoAp4+XxFlj/lUC8draUrKjAh++/LkId2Ldlxm0b1tGyfPl1ox1Gu9lY4QwoeGsTm/RJFnVH8kKns0aLHIlSdYp1+XdlQmBYSIIvVYFynVOQIKBzMBqQG9wcLbnMt7+Kz4coPI0TSvmn2dbDVKw== equinox@ffgraz.net - mur: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUW4fz/Vs4w5JMIFxoftimcbkqksZPDMfbHH/wfPKFAfJdi+fdGfWqqP7hy2/1iREF5W0L5dz9zQus0xS1/kkneUUL3CCKBD3+VzZqIbhy5rMlifd+jacVV+UZGhl/WP/wagu4+Mv0/ksXIlN6/2Pv2+ojjpGeCv4FHG/kR68zKoKNLxjHiTKt3LM9AFtx3Pn3ghIO3egbzaQ8vnTdQjGJHiosfKxiGZfnkAWvrMMq1sCJUJS7A8n2S3QUjoap3OYrVqFcPO4R/VaCaBWVdSKrymnpOGABvP9QuGenZ0CFXgl+p5QwKJz7n3CQHooUai+FPmmrCmtRV1QICyON8vdNI4hU5O1ksZOYxa0vptfqd//FMyauek5JzCDr4ExOWaZvhGsvZdLuWwiN/8KwpsgY+duiqWVC9jCOymFBPQ0Qik1hjCLXUWxDKcJIpF3WfHaHPESAlmNCKPbH5X7oBDOI5k96J34vDl1cBLjcVydtwfwbJmbApOMz3IukoUlYusbvLo2bJicHolkNrlS6qcSbaPpKsrjZ5II0Fks/S39q5rE//nVsY5oE35Gm5Pb7gndSuo/l01WOANYmKuYiwUz/XC62fis7fxiCxmLPMG3PIym7E3pe+lTjSOI3SN24cgwArDEvGZhqeyOHN468Yt8mPersXvY/cUMS1XFvLadtnw== equinox@mur.at - r3: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDj7AcnQZCRihToOI7/L5YslP4bkZlZwR2dg6hV8EfQ+37z1p0imhoqc2Oz/zIEgOVARBHkn5XmfR9Bu6e3YfKpXpJXC9O3jpRSw34Xac/8qXzWZsqVAXbtzvBlYA/G4j0NQM9XIVBa1ZzBZu87xeE4KUWzO80fnQ+G3GSBp28BM4TUiSOmX9y58chPZfUp2DE80fInoXv11ikLLCBDXfMkzFCZ4Gcexhr0TYcBUgLV7ufL0xqLg4yE+Z21PLtttvVYgZIers2nWetLPoREi5yDGKeCjJVyT00X2rp6h3eFkc/VaHfb5c2MY9/4BOt+cbFCx73sG0C1SnSzWd624K/8CEoJTsX4MazLLrxwi3hIwiYX1mCCfq4+S4PpSFvMUGdMWB52PkBRXulQislCVBA/lzma93xJr1jWVFSikjkvAUt8Zt33vHMRd7RMYDfsDVIEKpUT49cBj0v7zs6IVE858J33sUZoVXaiA2sjsap8RguNtjJMSYx8+nwkQAjxwlTiV2J6pHGQHJDyeVsqGlnMpEk32ZeSs/BQ7XWPG62FT3SN6E4C/fa8dawvs7RgY0cbZkhucECBu9Zto/KakIhzLtFzgDighPmK5SlAPoNEJLJYPo5ry2SBTysc4uV7xYZSQ6OVofeQeFXKL8oPe/ZAvKafn3Zk0mQcCtH0Z8q8iQ== equinox@realraum.at - spread: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org + chaos-at-home: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDL8afqxWieebpxezBuLj2CIx/iAuTY9ziJt8JCJE0qYh+B2wXe9e+sPaKwz5yyS0X0MoEPHbYuVytxGQfGhdVR57gWWTYq5MBBFEqmu5MexAFKlNxad4TNQQwhs7rnI+lptKJO+rqeG/vaQBgao+61ZVwRR5Zr1zsXEoo5m4VB8VPo3TW0nSb97LdMyUmb1TaqDKJ5hrtrV6YcokXzE8FwHMK15oJsuJC7YUReijol3hGsRVw1H5S1zu4uDz7G32dPVxoLOPgupnf0SxnXdNVfNU50MHHSK68HzBXz4/rE1YLacRPloOhO7xegkWd5KGa09opEbUGzGu/lSXgHuAJpPgloy14cehDhLJ7F7SbXK4QBBtVgV+1CYXG2eJsRHIdkWiTWLuG+QZ4oEFLjQBjWpUYsEiDt9FEtSVCtKH2vBk26ps5yIoSCtYq6POvg9miGgcpQA6HHwh5ekVUaKRGWuMdAIvjvQSlCsFjYkxD1NpCgU1RhyWWTI3xTSKzTxcXiCWWZoBDJVoW46EpSvySsOpxL/hLxJwMR8ouc6cPRZZl3m51824Rv3LdEXNBmn3vnojzIvrOed3sxpD0+7+tbA4J1uTbAxtkOMhK94WXKiUAOD7e5bJYdzajvDD2T9tkj/Mqdo8z3iR2/yjkGMEAeWWVOQEh7QhQS7OFEAKK4fw== equinox@chaos-at-home.org + elevate: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwjCMiwyz7f0b1b6S5RjGbYXjd+hkTVsNzZ9xIkqqvdF8zCU6qZTqkhem13m6E1aPjALl0iyrmpb8N2pmASD7axUaTMTDd2tktkB3LULBbQCCApMnw5viZc9fm9dLBdbdiYyRtNrpk/b39V+9uViAbRtATBrYS5vV/14gT42WxPhpFiCz6A5JsKpmbBafS9vfexnqLTvKBtYLt+zhuS9eFovMHM5k7Qq4mRdKe+wdMBDeRls2z2G/ZjPrfHAkw2WctFUdSY+YAVzLB0SddVWnbOSZ19tsnzskyHpDD49LWb7wYl0OJ9fhxO02lnxW5Vdpwwwx8I7FVH83fDTQpzfSdr8tMY3F9rvCmi4noiTGDE2AAWqh73unKuydvBomNYX8HbuiJO9eTgwUIRAqsl8vHNU5rA10YF5r2SUqofrBNfINUH8x0NhpLGzNPIlazndaPY1no+XeQRQtgSU1bdDQzmySyyn5g9mlMSTU+jHfzyoK7yqlKE0W/R2ZTOEwr6+uRdFqn+mWmB0Mr20YavjVretseVs1AkmqaVClEO1juwb/CWI//Nd4uboD9zdZwkHmCjLlOmC+GkGrnLValaqQDh8iR8aKiVbaQVffl3ph1pD3BCn79KJy56YySLTbaI4lFDUHherkTdvgyMVmZJZMROzwuX7i4bi04TZ/GKTfDrw== equinox@elevate.at + spreadspace: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org + funkfeuer: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjqlbFhzWRt2EnUrd7AFgR2iqPbV655OE38184ws+RvO82ImpJsKy80AvLQ3DhplLAN2W9kROBn3bga89pK7Sf78EwYYb5e+McVA0vUH/mnPurJpgPHg6q34yW5G5JVqKTmlqzQMDzmYw0iFNcieGmWXmx2QTtHj8qLuGOuBOE6/mljhgE7Pq4S0oyMjH2tLOhHS1Lykh5DH/OaHpofyUcd2uOCkgOClOUBHZ7Oo82J7yk5SZSVcrjQ4psO9ptqWNmw58ZBX5OPDTV/N7wPjgr2TL3HfCe8gkf2jERsghKufSuFpf2P6bNrK4k+grxB+LXuZihvOxJGRjemqImqvqaADLs23yCUWhgF/9oQ25ACydRGhHc56KIC3lQ3KOGoYT2IGo3Si/bQ7FpQIkODRWPHNKqbpItGm07uSTvkPZ4CadlG0MRhlOEjzRQgP1GYjr8w6917RZxO3DHndC1TfsciYhuwDGLon8WNtw1AjqRXolGnrkB2GsEENGvtJC97dioxPamOBctu06xdmDXwYpynXePoAp4+XxFlj/lUC8draUrKjAh++/LkId2Ldlxm0b1tGyfPl1ox1Gu9lY4QwoeGsTm/RJFnVH8kKns0aLHIlSdYp1+XdlQmBYSIIvVYFynVOQIKBzMBqQG9wcLbnMt7+Kz4coPI0TSvmn2dbDVKw== equinox@ffgraz.net + mur.at: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUW4fz/Vs4w5JMIFxoftimcbkqksZPDMfbHH/wfPKFAfJdi+fdGfWqqP7hy2/1iREF5W0L5dz9zQus0xS1/kkneUUL3CCKBD3+VzZqIbhy5rMlifd+jacVV+UZGhl/WP/wagu4+Mv0/ksXIlN6/2Pv2+ojjpGeCv4FHG/kR68zKoKNLxjHiTKt3LM9AFtx3Pn3ghIO3egbzaQ8vnTdQjGJHiosfKxiGZfnkAWvrMMq1sCJUJS7A8n2S3QUjoap3OYrVqFcPO4R/VaCaBWVdSKrymnpOGABvP9QuGenZ0CFXgl+p5QwKJz7n3CQHooUai+FPmmrCmtRV1QICyON8vdNI4hU5O1ksZOYxa0vptfqd//FMyauek5JzCDr4ExOWaZvhGsvZdLuWwiN/8KwpsgY+duiqWVC9jCOymFBPQ0Qik1hjCLXUWxDKcJIpF3WfHaHPESAlmNCKPbH5X7oBDOI5k96J34vDl1cBLjcVydtwfwbJmbApOMz3IukoUlYusbvLo2bJicHolkNrlS6qcSbaPpKsrjZ5II0Fks/S39q5rE//nVsY5oE35Gm5Pb7gndSuo/l01WOANYmKuYiwUz/XC62fis7fxiCxmLPMG3PIym7E3pe+lTjSOI3SN24cgwArDEvGZhqeyOHN468Yt8mPersXvY/cUMS1XFvLadtnw== equinox@mur.at diff --git a/inventory/group_vars/elevate/main.yml b/inventory/group_vars/elevate/main.yml index 1808db88..58103d1a 100644 --- a/inventory/group_vars/elevate/main.yml +++ b/inventory/group_vars/elevate/main.yml @@ -1,4 +1,2 @@ --- -sshserver_root_keys: "{{ [ ssh_keys.equinox.ele ] | join('\n') }}" - acmetool_account_email: equinox@elevate.at diff --git a/inventory/group_vars/skillz/main.yml b/inventory/group_vars/skillz/main.yml deleted file mode 100644 index 4d8f679d..00000000 --- a/inventory/group_vars/skillz/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -sshserver_root_keys: "{{ [ ssh_keys.equinox.ele ] | join('\n') }}" diff --git a/inventory/group_vars/spreadspace/main.yml b/inventory/group_vars/spreadspace/main.yml index cfe1ec2b..4da60636 100644 --- a/inventory/group_vars/spreadspace/main.yml +++ b/inventory/group_vars/spreadspace/main.yml @@ -1,6 +1,4 @@ --- -sshserver_root_keys: "{{ [ ssh_keys.equinox.spread ] | join('\n') }}" - acmetool_account_email: equinox@spreadspace.org blackmagic_desktopvideo_apt: diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 771b1b2c..aba33ddd 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -40,6 +40,21 @@ helene emc-test +[spreadspace:children] +emc + +[emc] +emc-stats +emc-master + +[emc:children] +emc-xx + +[emc-xx] +#emc-0[0:6] +emc-00 + + ############################### # environment: elevate @@ -63,24 +78,6 @@ elestream elemedia elesearch -[elevate:children] -emc - - -[emc:vars] -host_domain=spreadspace.org - -[emc] -emc-stats -emc-master - -[emc:children] -emc-xx - -[emc-xx] -#emc-0[0:6] -emc-00 - ############################### # host categories diff --git a/upgrade.sh b/upgrade.sh index aa5e693c..48849b82 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -1,12 +1,13 @@ #!/bin/bash -if [ -z "$1" ]; then - echo "$0 " +if [ -z "$1" ] || [ -z "$2" ]; then + echo "$0 " exit 1 fi - -host="$1" +env="$1" +shift +hosts="$1" shift -echo "######## upgrading host(s) '$host' ########" -exec ansible-playbook -e "myname=$host" -e "myrole=upgrade" $@ generic.yaml +echo "######## upgrading host(s) '$hosts' in environment '$env' ########" +exec ansible-playbook -e "myhosts=$hosts" -e "myrole=upgrade" $@ "$env/generic.yaml" -- cgit v1.2.3 From b9b2f51bc8547f0cb4f9c354956650841941f119 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 2 Dec 2018 03:12:32 +0100 Subject: merge over installer roles from realraum repo --- elevate/sk2013.yml | 6 + elevate/sk2016.yml | 6 + host_playbooks/sk2013.yml | 6 - host_playbooks/sk2016.yml | 6 - inventory/host_vars/sk2013.yml | 13 -- inventory/host_vars/sk2016.yml | 13 -- inventory/hosts.ini | 2 +- roles/debian-installer/defaults/main.yml | 18 +++ roles/debian-installer/tasks/main.yml | 27 ++++ roles/preseed/defaults/main.yml | 0 roles/preseed/tasks/main.yml | 25 ++++ .../templates/preseed_debian-stretch.cfg.j2 | 115 +++++++++++++++ .../preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 122 ++++++++++++++++ .../preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 121 ++++++++++++++++ roles/usb-install/meta/main.yml | 6 + roles/usb-install/tasks/main.yml | 22 +++ roles/vm/grub/tasks/main.yml | 21 ++- roles/vm/guest/defaults/main.yml | 3 + roles/vm/guest/handlers/main.yml | 4 + roles/vm/guest/tasks/main.yml | 37 +++++ roles/vm/host/defaults/main.yml | 7 - roles/vm/host/handlers/main.yml | 4 +- roles/vm/host/meta/main.yml | 3 + roles/vm/host/tasks/main.yml | 50 ++----- roles/vm/install/meta/main.yml | 7 + roles/vm/install/tasks/main.yml | 160 ++++++++++++--------- roles/vm/install/templates/libvirt-domain.xml.j2 | 32 +++-- .../templates/preseed_debian-stretch.cfg.j2 | 105 -------------- .../install/templates/preseed_ubuntu-bionic.cfg.j2 | 122 ++++++++++++++++ .../install/templates/preseed_ubuntu-xenial.cfg.j2 | 113 --------------- roles/vm/network/tasks/main.yml | 19 ++- roles/vm/network/templates/interfaces.j2 | 10 +- roles/vm/network/templates/netplan.yaml.j2 | 10 ++ roles/vm/network/templates/resolv.conf.j2 | 4 +- 34 files changed, 810 insertions(+), 409 deletions(-) create mode 100644 elevate/sk2013.yml create mode 100644 elevate/sk2016.yml delete mode 100644 host_playbooks/sk2013.yml delete mode 100644 host_playbooks/sk2016.yml create mode 100644 roles/debian-installer/defaults/main.yml create mode 100644 roles/debian-installer/tasks/main.yml create mode 100644 roles/preseed/defaults/main.yml create mode 100644 roles/preseed/tasks/main.yml create mode 100644 roles/preseed/templates/preseed_debian-stretch.cfg.j2 create mode 100644 roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 create mode 100644 roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 create mode 100644 roles/usb-install/meta/main.yml create mode 100644 roles/usb-install/tasks/main.yml create mode 100644 roles/vm/guest/defaults/main.yml create mode 100644 roles/vm/guest/handlers/main.yml create mode 100644 roles/vm/guest/tasks/main.yml delete mode 100644 roles/vm/host/defaults/main.yml create mode 100644 roles/vm/host/meta/main.yml create mode 100644 roles/vm/install/meta/main.yml delete mode 100644 roles/vm/install/templates/preseed_debian-stretch.cfg.j2 create mode 100644 roles/vm/install/templates/preseed_ubuntu-bionic.cfg.j2 delete mode 100644 roles/vm/install/templates/preseed_ubuntu-xenial.cfg.j2 create mode 100644 roles/vm/network/templates/netplan.yaml.j2 (limited to 'inventory') diff --git a/elevate/sk2013.yml b/elevate/sk2013.yml new file mode 100644 index 00000000..5caa6603 --- /dev/null +++ b/elevate/sk2013.yml @@ -0,0 +1,6 @@ +--- +- name: Basic Setup + hosts: sk2013 + roles: + - role: sshserver + - role: vm/host diff --git a/elevate/sk2016.yml b/elevate/sk2016.yml new file mode 100644 index 00000000..ef3d7c43 --- /dev/null +++ b/elevate/sk2016.yml @@ -0,0 +1,6 @@ +--- +- name: Basic Setup + hosts: sk2016 + roles: + - role: sshserver + - role: vm/host diff --git a/host_playbooks/sk2013.yml b/host_playbooks/sk2013.yml deleted file mode 100644 index 5caa6603..00000000 --- a/host_playbooks/sk2013.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Basic Setup - hosts: sk2013 - roles: - - role: sshserver - - role: vm/host diff --git a/host_playbooks/sk2016.yml b/host_playbooks/sk2016.yml deleted file mode 100644 index ef3d7c43..00000000 --- a/host_playbooks/sk2016.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Basic Setup - hosts: sk2016 - roles: - - role: sshserver - - role: vm/host diff --git a/inventory/host_vars/sk2013.yml b/inventory/host_vars/sk2013.yml index 920748c1..a8bb3ebd 100644 --- a/inventory/host_vars/sk2013.yml +++ b/inventory/host_vars/sk2013.yml @@ -7,19 +7,6 @@ sshserver_allowusers_host: vm_host: installer: net_if: virbr - preseed_path: /srv/preseed - path: /srv/installer - distros: - - distro: debian - codename: stretch - arch: - - amd64 - - i386 - - distro: ubuntu - codename: xenial - arch: - - amd64 - - i386 network: interface: virbr ip: 192.168.160.254 diff --git a/inventory/host_vars/sk2016.yml b/inventory/host_vars/sk2016.yml index 872223db..f8371cea 100644 --- a/inventory/host_vars/sk2016.yml +++ b/inventory/host_vars/sk2016.yml @@ -7,19 +7,6 @@ sshserver_allowusers_host: vm_host: installer: net_if: virbr - preseed_path: /srv/preseed - path: /srv/installer - distros: - - distro: debian - codename: stretch - arch: - - amd64 - - i386 - - distro: ubuntu - codename: xenial - arch: - - amd64 - - i386 network: interface: virbr ip: 192.168.216.254 diff --git a/inventory/hosts.ini b/inventory/hosts.ini index aba33ddd..34e12592 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -1,5 +1,5 @@ [all:vars] -ansible_host={{ inventory_hostname }}.{{ host_domain }} +#ansible_host={{ inventory_hostname }}.{{ host_domain }} ansible_user=root ansible_port=22000 diff --git a/roles/debian-installer/defaults/main.yml b/roles/debian-installer/defaults/main.yml new file mode 100644 index 00000000..94e8d6c2 --- /dev/null +++ b/roles/debian-installer/defaults/main.yml @@ -0,0 +1,18 @@ +distros: + - distro: debian + codename: stretch + arch: + - amd64 + - i386 + + - distro: ubuntu + codename: bionic + arch: + - amd64 + - i386 + +debian_installer_force_download: no + +debian_installer_url: + debian: "https://debian.ffgraz.net/debian" + ubuntu: "https://debian.ffgraz.net/ubuntu" diff --git a/roles/debian-installer/tasks/main.yml b/roles/debian-installer/tasks/main.yml new file mode 100644 index 00000000..eb32f6aa --- /dev/null +++ b/roles/debian-installer/tasks/main.yml @@ -0,0 +1,27 @@ +- name: prepare directories for installer images + with_subelements: + - "{{ distros }}" + - arch + file: + name: "{{ debian_installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}" + state: directory + +- name: download installer kernel images + with_subelements: + - "{{ distros }}" + - arch + get_url: + url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/images/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/linux" + dest: "{{ debian_installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/linux" + mode: 0644 + force: "{{ debian_installer_force_download }}" + +- name: download installer initrd.gz + with_subelements: + - "{{ distros }}" + - arch + get_url: + url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/images/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/initrd.gz" + dest: "{{ debian_installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/initrd.gz" + mode: 0644 + force: "{{ debian_installer_force_download }}" diff --git a/roles/preseed/defaults/main.yml b/roles/preseed/defaults/main.yml new file mode 100644 index 00000000..e69de29b diff --git a/roles/preseed/tasks/main.yml b/roles/preseed/tasks/main.yml new file mode 100644 index 00000000..51471c56 --- /dev/null +++ b/roles/preseed/tasks/main.yml @@ -0,0 +1,25 @@ +- name: Copy initramfs into position + copy: + remote_src: yes + src: "{{ debian_installer_path | mandatory }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/initrd.gz" + dest: "{{ preseed_tmpdir }}/initrd.preseed.gz" + +- name: Generate preseed file + template: + src: "preseed_{{ install_distro }}-{{ install_codename }}.cfg.j2" + dest: "{{ preseed_tmpdir }}/preseed.cfg" + +- name: Generate authorized_keys file + authorized_key: + user: root + manage_dir: no + path: "{{ preseed_tmpdir }}/authorized_keys" + key: "{{ ssh_users_root | user_ssh_keys(users) | join('\n') }}" + +- name: Inject files into initramfs + shell: cpio -H newc -o | gzip -9 >> 'initrd.preseed.gz' + args: + chdir: "{{ preseed_tmpdir }}" + stdin: | + preseed.cfg + authorized_keys diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 new file mode 100644 index 00000000..7a3511a5 --- /dev/null +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -0,0 +1,115 @@ +######################################################################### +# spreadspace preseed file for Debian stretch based VMs +######################################################################### + +d-i debian-installer/language string en +d-i debian-installer/country string AT +d-i debian-installer/locale string de_AT.UTF-8 +d-i keyboard-configuration/xkb-keymap select de + +d-i netcfg/disable_dhcp boolean true +d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} +d-i netcfg/disable_autoconfig boolean false +d-i netcfg/get_ipaddress string {{ hostvars[hostname].network_cooked.primary.ip }} +d-i netcfg/get_netmask string {{ hostvars[hostname].network_cooked.primary.mask }} +d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gateway }} +d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }} +d-i netcfg/confirm_static boolean true + +d-i netcfg/get_hostname string {{ hostname }} +d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }} +d-i netcfg/wireless_wep string + + +d-i mirror/country string manual +d-i mirror/http/hostname string deb.debian.org +d-i mirror/http/directory string /debian +d-i mirror/http/proxy string + + +d-i passwd/make-user boolean false +d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand +d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand + + +d-i clock-setup/utc boolean true +d-i time/zone string Europe/Vienna +d-i clock-setup/ntp boolean false + + +d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i partman-auto/method string lvm +d-i partman-auto/purge_lvm_from_device boolean true +d-i partman-auto-lvm/new_vg_name string {{ hostname }} +d-i partman-auto-lvm/guided_size string max + +d-i partman-lvm/device_remove_lvm boolean true +d-i partman-md/device_remove_md boolean true + +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true + +d-i partman-auto/expert_recipe string \ + boot-root :: \ + 1000 10000 -1 ext4 \ + $defaultignore{ } $primary{ } $bootable{ } \ + method{ lvm } vg_name{ {{ hostname }} } \ + . \ + 2048 10000 2560 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ / } \ + . \ + 1024 11000 1280 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ /var } \ + . \ + 768 10000 768 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ /var/log } \ + options/nodev{ nodev } options/noatime{ noatime } \ + options/noexec{ noexec } \ + . \ + 16 20000 -1 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method( keep } lv_name{ dummy } \ + . + +d-i partman-auto-lvm/no_boot boolean true +d-i partman-basicfilesystems/no_swap true +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + + +d-i base-installer/install-recommends boolean false +d-i apt-setup/security_host string deb.debian.org + +tasksel tasksel/first multiselect +d-i pkgsel/include string openssh-server python +d-i pkgsel/upgrade select safe-upgrade +popularity-contest popularity-contest/participate boolean false + +d-i grub-installer/choose_bootdev string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean false + +d-i finish-install/reboot_in_progress note + + +d-i preseed/late_command string \ + lvremove -f {{ hostname }}/dummy; \ + in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ + in-target bash -c "passwd -d root && passwd -l root"; \ + in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ + mkdir -p -m 0700 /target/root/.ssh; \ + cp /authorized_keys /target/root/.ssh/; \ +{% if hostvars[hostname].ansible_port is defined %} + in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config" +{% endif %} diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 new file mode 100644 index 00000000..d6fbc5d7 --- /dev/null +++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -0,0 +1,122 @@ +######################################################################### +# spreadspace preseed file for Ubuntu bionic based VMs +######################################################################### + +d-i debian-installer/language string en +d-i debian-installer/country string AT +d-i debian-installer/locale string en_US.UTF-8 +d-i localechooser/preferred-locale string en_US.UTF-8 +d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i console-setup/ask_detect boolean false +d-i keyboard-configuration/xkb-keymap select us +d-i keyboard-configuration/layoutcode string us + +d-i netcfg/disable_dhcp boolean true +d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} +d-i netcfg/disable_autoconfig boolean false +d-i netcfg/get_ipaddress string {{ hostvars[hostname].network_cooked.primary.ip }} +d-i netcfg/get_netmask string {{ hostvars[hostname].network_cooked.primary.mask }} +d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gateway }} +d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }} +d-i netcfg/confirm_static boolean true + +d-i netcfg/get_hostname string {{ hostname }} +d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }} +d-i netcfg/wireless_wep string + + +d-i mirror/country string manual +d-i mirror/http/hostname string archive.ubuntu.com +d-i mirror/http/directory string /ubuntu +d-i mirror/http/proxy string + + +d-i passwd/make-user boolean false +d-i passwd/root-login boolean true +d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand +d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand + + +d-i clock-setup/utc boolean true +d-i time/zone string Europe/Vienna +d-i clock-setup/ntp boolean false + + +d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i partman-auto/method string lvm +d-i partman-auto/purge_lvm_from_device boolean true +d-i partman-auto-lvm/new_vg_name string {{ hostname }} +d-i partman-auto-lvm/guided_size string max + +d-i partman-lvm/device_remove_lvm boolean true +d-i partman-md/device_remove_md boolean true + +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true + +d-i partman-auto/expert_recipe string \ + boot-root :: \ + 1000 10000 -1 ext4 \ + $defaultignore{ } $primary{ } $bootable{ } \ + method{ lvm } vg_name{ {{ hostname }} } \ + . \ + 2048 10000 2560 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ / } \ + . \ + 1024 11000 1280 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ /var } \ + . \ + 768 10000 768 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ /var/log } \ + options/nodev{ nodev } options/noatime{ noatime } \ + options/noexec{ noexec } \ + . \ + 16 20000 -1 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method( keep } lv_name{ dummy } \ + . + +d-i partman-auto-lvm/no_boot boolean true +d-i partman-basicfilesystems/no_swap true +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + + +d-i base-installer/install-recommends boolean false +d-i apt-setup/security_host string archive.ubuntu.com + +tasksel tasksel/first multiselect +d-i pkgsel/include string openssh-server python +d-i pkgsel/upgrade select safe-upgrade +popularity-contest popularity-contest/participate boolean false +d-i pkgsel/update-policy select none + +d-i grub-installer/choose_bootdev string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean false + +d-i finish-install/reboot_in_progress note + + +d-i preseed/late_command string \ + lvremove -f {{ hostname }}/dummy; \ + in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \ + in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ + in-target bash -c "passwd -d root && passwd -l root"; \ + in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ + mkdir -p -m 0700 /target/root/.ssh; \ + cp /authorized_keys /target/root/.ssh/; \ +{% if hostvars[hostname].ansible_port is defined %} + in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config" +{% endif %} diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 new file mode 100644 index 00000000..6f357133 --- /dev/null +++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -0,0 +1,121 @@ +######################################################################### +# spreadspace preseed file for Ubuntu xenial based VMs +######################################################################### + +d-i debian-installer/language string en +d-i debian-installer/country string AT +d-i debian-installer/locale string en_US.UTF-8 +d-i localechooser/preferred-locale string en_US.UTF-8 +d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i console-setup/ask_detect boolean false +d-i keyboard-configuration/xkb-keymap select us +d-i keyboard-configuration/layoutcode string us + +d-i netcfg/disable_dhcp boolean true +d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} +d-i netcfg/disable_autoconfig boolean false +d-i netcfg/get_ipaddress string {{ hostvars[hostname].network_cooked.primary.ip }} +d-i netcfg/get_netmask string {{ hostvars[hostname].network_cooked.primary.mask }} +d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gateway }} +d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }} +d-i netcfg/confirm_static boolean true + +d-i netcfg/get_hostname string {{ hostname }} +d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }} +d-i netcfg/wireless_wep string + + +d-i mirror/country string manual +d-i mirror/http/hostname string archive.ubuntu.com +d-i mirror/http/directory string /ubuntu +d-i mirror/http/proxy string + + +d-i passwd/make-user boolean false +d-i passwd/root-login boolean true +d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand +d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand + + +d-i clock-setup/utc boolean true +d-i time/zone string Europe/Vienna +d-i clock-setup/ntp boolean false + + +d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i partman-auto/method string lvm +d-i partman-auto/purge_lvm_from_device boolean true +d-i partman-auto-lvm/new_vg_name string {{ hostname }} +d-i partman-auto-lvm/guided_size string max + +d-i partman-lvm/device_remove_lvm boolean true +d-i partman-md/device_remove_md boolean true + +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true + +d-i partman-auto/expert_recipe string \ + boot-root :: \ + 1000 10000 -1 ext4 \ + $defaultignore{ } $primary{ } $bootable{ } \ + method{ lvm } vg_name{ {{ hostname }} } \ + . \ + 2048 10000 2560 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ / } \ + . \ + 1024 11000 1280 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ /var } \ + . \ + 768 10000 768 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ /var/log } \ + options/nodev{ nodev } options/noatime{ noatime } \ + options/noexec{ noexec } \ + . \ + 16 20000 -1 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method( keep } lv_name{ dummy } \ + . + +d-i partman-auto-lvm/no_boot boolean true +d-i partman-basicfilesystems/no_swap true +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + + +d-i base-installer/install-recommends boolean false +d-i apt-setup/security_host string archive.ubuntu.com + +tasksel tasksel/first multiselect +d-i pkgsel/include string openssh-server python +d-i pkgsel/upgrade select safe-upgrade +popularity-contest popularity-contest/participate boolean false +d-i pkgsel/update-policy select none + +d-i grub-installer/choose_bootdev string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean false + +d-i finish-install/reboot_in_progress note + + +d-i preseed/late_command string \ + lvremove -f {{ hostname }}/dummy; \ + in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ + in-target bash -c "passwd -d root && passwd -l root"; \ + in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ + mkdir -p -m 0700 /target/root/.ssh; \ + cp /authorized_keys /target/root/.ssh/; \ +{% if hostvars[hostname].ansible_port is defined %} + in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config" +{% endif %} diff --git a/roles/usb-install/meta/main.yml b/roles/usb-install/meta/main.yml new file mode 100644 index 00000000..bca7f83d --- /dev/null +++ b/roles/usb-install/meta/main.yml @@ -0,0 +1,6 @@ +dependencies: + - role: debian-installer + distros: + - distro: "{{ install_distro }}" + codename: "{{ install_codename }}" + arch: [ "{{ install.arch | default('amd64') }}" ] diff --git a/roles/usb-install/tasks/main.yml b/roles/usb-install/tasks/main.yml new file mode 100644 index 00000000..1523aedc --- /dev/null +++ b/roles/usb-install/tasks/main.yml @@ -0,0 +1,22 @@ +--- +- block: + - name: Create temporary workdir + command: mktemp -d + register: tmpdir + + - import_role: + name: preseed + vars: + preseed_tmpdir: "{{ tmpdir.stdout }}" + + - name: Copy the preseed initramfs to the artifacts directory + copy: + src: "{{ tmpdir.stdout }}/initrd.preseed.gz" + dest: "{{ artifacts_dir }}/" + + + always: + - name: Cleanup temporary workdir + file: + path: "{{ tmpdir.stdout }}" + state: absent diff --git a/roles/vm/grub/tasks/main.yml b/roles/vm/grub/tasks/main.yml index f751243a..eb868d38 100644 --- a/roles/vm/grub/tasks/main.yml +++ b/roles/vm/grub/tasks/main.yml @@ -1,16 +1,15 @@ --- - name: enable serial console in grub and for kernel - with_items: - - regexp: '^GRUB_TIMEOUT=' - line: 'GRUB_TIMEOUT=2' - - regexp: '^GRUB_CMDLINE_LINUX=' - line: 'GRUB_CMDLINE_LINUX="console=ttyS0,115200n8"' - - regexp: '^GRUB_TERMINAL=' - line: 'GRUB_TERMINAL=serial' - - regexp: '^GRUB_SERIAL_COMMAND=' - line: 'GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"' + with_dict: + GRUB_TIMEOUT: 2 + GRUB_CMDLINE_LINUX: '"console=ttyS0,115200n8"' + GRUB_TERMINAL: serial + GRUB_SERIAL_COMMAND: >- + "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" lineinfile: dest: /etc/default/grub - regexp: "{{ item.regexp }}" - line: "{{ item.line }}" + regexp: "^{{ item.key }}=" + line: "{{ item.key }}={{ item.value }}" notify: update grub + loop_control: + label: "{{ item.key }}" diff --git a/roles/vm/guest/defaults/main.yml b/roles/vm/guest/defaults/main.yml new file mode 100644 index 00000000..b4deefa0 --- /dev/null +++ b/roles/vm/guest/defaults/main.yml @@ -0,0 +1,3 @@ +rngd_config: + HRNGDEVICE: /dev/hwrng + RNGDOPTIONS: '"-s 256 -W 80%"' diff --git a/roles/vm/guest/handlers/main.yml b/roles/vm/guest/handlers/main.yml new file mode 100644 index 00000000..5b57f3bc --- /dev/null +++ b/roles/vm/guest/handlers/main.yml @@ -0,0 +1,4 @@ +- name: restart rngd + service: + name: rng-tools + state: restarted diff --git a/roles/vm/guest/tasks/main.yml b/roles/vm/guest/tasks/main.yml new file mode 100644 index 00000000..4830d051 --- /dev/null +++ b/roles/vm/guest/tasks/main.yml @@ -0,0 +1,37 @@ +- name: Install rngd + apt: + name: rng-tools + state: present + +- name: Configure rngd [1/2] + lineinfile: + path: /etc/default/rng-tools + line: '{{ item.key }}={{ item.value }}' + regexp: '^#?{{ item.key }}=' + with_dict: '{{ rngd_config }}' + loop_control: + label: "{{ item.key }}" + notify: restart rngd + +- name: Configure rngd [2/2] + lineinfile: + path: /etc/default/rng-tools + regexp: '^{{ item.key }}=(?!{{ item.value }})' + state: absent + with_dict: '{{ rngd_config }}' + loop_control: + label: "{{ item.key }}" + notify: restart rngd + +- name: Provide a root shell on the VM console [1/2] + file: + path: /etc/systemd/system/serial-getty@ttyS0.service.d/ + state: directory + +- name: Provide a root shell on the VM console [2/2] + copy: + dest: /etc/systemd/system/serial-getty@ttyS0.service.d/autologon.conf + content: | + [Service] + ExecStart= + ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 --noclear --autologin root --login-pause --host {{ vm_host }} %I $TERM diff --git a/roles/vm/host/defaults/main.yml b/roles/vm/host/defaults/main.yml deleted file mode 100644 index 0e3cddf1..00000000 --- a/roles/vm/host/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -vm_host_force_download_installer: False -vm_host_installer_url: - # debian: "{{ debian_mirror.packages | default('http://deb.debian.org/debian') }}" - # ubuntu: "{{ ubuntu_mirror | default('http://archive.ubuntu.com/ubuntu') }}" - debian: "http://deb.debian.org/debian" - ubuntu: "http://archive.ubuntu.com/ubuntu" diff --git a/roles/vm/host/handlers/main.yml b/roles/vm/host/handlers/main.yml index 158f4dcd..6541dd80 100644 --- a/roles/vm/host/handlers/main.yml +++ b/roles/vm/host/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: restart inetd +- name: restart haveged service: - name: openbsd-inetd + name: haveged state: restarted diff --git a/roles/vm/host/meta/main.yml b/roles/vm/host/meta/main.yml new file mode 100644 index 00000000..40f6fcb3 --- /dev/null +++ b/roles/vm/host/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: debian-installer diff --git a/roles/vm/host/tasks/main.yml b/roles/vm/host/tasks/main.yml index 248f855c..010fdce4 100644 --- a/roles/vm/host/tasks/main.yml +++ b/roles/vm/host/tasks/main.yml @@ -1,53 +1,25 @@ --- -- name: install tftpd and python-libvirt +- name: install dependencies apt: name: - - atftpd - - openbsd-inetd - qemu-kvm - - libvirt-bin + - # configuration package, pulls in libvirt-clients and libvirt-daemon + libvirt-daemon-system - python-libvirt + - haveged state: present -- name: configure tftpd via inetd +- name: configure haveged lineinfile: - regexp: "^#?({{ vm_host.network.ip }}:)?tftp" - line: "{{ vm_host.network.ip }}:tftp dgram udp4 wait nobody /usr/sbin/tcpd /usr/sbin/in.tftpd --tftpd-timeout 300 --retry-timeout 5 --maxthread 10 --verbose=5 {{ vm_host.installer.preseed_path }}" - path: /etc/inetd.conf - notify: restart inetd + regexp: "^#?DAEMON_ARGS" + line: 'DAEMON_ARGS="-w 3072"' + path: /etc/default/haveged + notify: restart haveged - name: make sure installer directories exists with_items: - - "{{ vm_host.installer.path }}" - - "{{ vm_host.installer.preseed_path }}" + - "{{ debian_installer_path }}" + - "{{ preseed_path }}" file: name: "{{ item }}" state: directory - -- name: prepare directories for installer images - with_subelements: - - "{{ vm_host.installer.distros }}" - - arch - file: - name: "{{ vm_host.installer.path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}" - state: directory - -- name: download installer kernel images - with_subelements: - - "{{ vm_host.installer.distros }}" - - arch - get_url: - url: "{{ vm_host_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/images/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/linux" - dest: "{{ vm_host.installer.path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/linux" - mode: 0644 - force: "{{ vm_host_force_download_installer }}" - -- name: download installer initrd.gz - with_subelements: - - "{{ vm_host.installer.distros }}" - - arch - get_url: - url: "{{ vm_host_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/images/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/initrd.gz" - dest: "{{ vm_host.installer.path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/initrd.gz" - mode: 0644 - force: "{{ vm_host_force_download_installer }}" diff --git a/roles/vm/install/meta/main.yml b/roles/vm/install/meta/main.yml new file mode 100644 index 00000000..d5f95204 --- /dev/null +++ b/roles/vm/install/meta/main.yml @@ -0,0 +1,7 @@ +--- +dependencies: + - role: debian-installer + distros: + - distro: "{{ install_distro }}" + codename: "{{ install_codename }}" + arch: [ "{{ hostvars[hostname].install_cooked.arch | default('amd64') }}" ] diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml index c4220434..b9201c01 100644 --- a/roles/vm/install/tasks/main.yml +++ b/roles/vm/install/tasks/main.yml @@ -1,11 +1,6 @@ --- -- name: generate preseed file - template: - src: "preseed_{{ vmdistro }}-{{ vmdistcodename }}.cfg.j2" - dest: "{{ vm_host.installer.preseed_path }}/vm-{{ vmname }}-{{ vmdistro }}-{{ vmdistcodename }}.cfg" - - name: create disks for vm - with_dict: "{{ hostvars[vmname].vm_install_cooked.disks.virtio | default({}) | combine(hostvars[vmname].vm_install_cooked.disks.scsi | default({})) }}" + with_dict: "{{ hostvars[hostname].install_cooked.disks.virtio | default({}) | combine(hostvars[hostname].install_cooked.disks.scsi | default({})) }}" lvol: vg: "{{ item.value.vg }}" lv: "{{ item.value.lv }}" @@ -13,84 +8,107 @@ - name: check if vm already exists virt: - name: "{{ vmname }}" + name: "{{ hostname }}" command: info register: vmhost_info -- name: destroy exisiting vm - virt: - name: "{{ vmname }}" - state: destroyed - when: vmname in vmhost_info - -- name: wait for vm to be destroyed - wait_for_virt: - name: "{{ vmname }}" - states: shutdown,crashed - timeout: 5 - when: vmname in vmhost_info - -- name: undefining exisiting vm - virt: - name: "{{ vmname }}" - command: undefine - when: vmname in vmhost_info - -- name: enable installer in VM config - set_fact: - run_installer: True - -- name: define new installer vm - virt: - name: "{{ vmname }}" - command: define - xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}" - -- name: start vm - virt: - name: "{{ vmname }}" - state: running - -- name: wait for installer to start - wait_for_virt: - name: "{{ vmname }}" - states: running - timeout: 10 - -- debug: - msg: "you can check on the status of the installer running this command 'virsh console {{ vmname }}' on host {{ inventory_hostname }}." - -- name: wait for installer to finish or crash - wait_for_virt: - name: "{{ vmname }}" - states: shutdown,crashed - timeout: 1200 - register: installer_result - failed_when: installer_result.failed or installer_result.state == "crashed" - -- name: undefining installer vm - virt: - name: "{{ vmname }}" - command: undefine - -- name: disable installer in VM config - set_fact: - run_installer: False +- block: + - name: destroy exisiting vm + virt: + name: "{{ hostname }}" + state: destroyed + + - name: wait for vm to be destroyed + wait_for_virt: + name: "{{ hostname }}" + states: shutdown,crashed + timeout: 5 + + - name: undefining exisiting vm + virt: + name: "{{ hostname }}" + command: undefine + + when: hostname in vmhost_info + +- block: + - name: create a temporary workdir + command: mktemp -d + register: tmpdir + + - import_role: + name: preseed + vars: + ssh_users_root: "{{ hostvars[hostname].ssh_users_root }}" + install_interface: enp1s1 + preseed_tmpdir: "{{ tmpdir.stdout }}" + + - name: Make preseed workdir readable by qemu + acl: + path: "{{ tmpdir.stdout }}" + state: present + entity: libvirt-qemu + etype: user + permissions: rx + + - name: define new installer vm + virt: + name: "{{ hostname }}" + command: define + xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}" + vars: + run_installer: yes + preseed_tmpdir: "{{ tmpdir.stdout }}" + + - name: start vm + virt: + name: "{{ hostname }}" + state: running + + - name: wait for installer to start + wait_for_virt: + name: "{{ hostname }}" + states: running + timeout: 10 + + - debug: + msg: "you can check on the status of the installer running this command 'virsh console {{ hostname }}' on host {{ inventory_hostname }}." + + - name: wait for installer to finish or crash + wait_for_virt: + name: "{{ hostname }}" + states: shutdown,crashed + timeout: 900 + register: installer_result + failed_when: installer_result.failed or installer_result.state == "crashed" + + - name: undefining installer vm + virt: + name: "{{ hostname }}" + command: undefine + + always: + - name: cleanup temporary workdir + file: + path: "{{ tmpdir.stdout }}" + state: absent - name: define new production vm virt: - name: "{{ vmname }}" + name: "{{ hostname }}" command: define xml: "{{ lookup('template', 'libvirt-domain.xml.j2') }}" + vars: + run_installer: no - name: start vm virt: - name: "{{ vmname }}" + name: "{{ hostname }}" state: running - name: mark vm as autostarted virt: - name: "{{ vmname }}" - autostart: "{{ hostvars[vmname].vm_install_cooked.autostart }}" + name: "{{ hostname }}" + autostart: "{{ hostvars[hostname].install_cooked.autostart }}" command: info ## virt module needs either command or state - when: hostvars[vmname].vm_install_cooked.autostart is defined + when: hostvars[hostname].install_cooked.autostart is defined diff --git a/roles/vm/install/templates/libvirt-domain.xml.j2 b/roles/vm/install/templates/libvirt-domain.xml.j2 index 2bf4b57b..9119f64f 100644 --- a/roles/vm/install/templates/libvirt-domain.xml.j2 +++ b/roles/vm/install/templates/libvirt-domain.xml.j2 @@ -1,14 +1,14 @@ - {{ vmname }} - {{ hostvars[vmname].vm_install_cooked.mem * 1024 }} - {{ hostvars[vmname].vm_install_cooked.mem * 1024 }} - {{ hostvars[vmname].vm_install_cooked.numcpu }} + {{ hostname }} + {{ hostvars[hostname].install_cooked.mem * 1024 }} + {{ hostvars[hostname].install_cooked.mem * 1024 }} + {{ hostvars[hostname].install_cooked.numcpu }} hvm {% if run_installer %} - {{ vm_host.installer.path }}/{{ vmdistro }}-{{ vmdistcodename }}/{{ hostvars[vmname].vm_install_cooked.arch | default('amd64') }}/linux - {{ vm_host.installer.path }}/{{ vmdistro }}-{{ vmdistcodename }}/{{ hostvars[vmname].vm_install_cooked.arch | default('amd64') }}/initrd.gz - console=ttyS0,115200n8 auto=true interface=auto url=tftp://{{ hostvars[inventory_hostname]['ansible_' + (vm_host.installer.net_if | replace('-', '_'))].ipv4.address }}/vm-{{ vmname }}-{{ vmdistro }}-{{ vmdistcodename }}.cfg netcfg/choose_interface=enp1s1 netcfg/disable_autoconfig=true netcfg/get_ipaddress={{ hostvars[vmname].vm_network_cooked.primary.ip }} netcfg/get_netmask={{ hostvars[vmname].vm_network_cooked.primary.mask }} netcfg/get_gateway={{ hostvars[vmname].vm_network_cooked.primary.gateway }} netcfg/get_nameservers="{{ hostvars[vmname].vm_network_cooked.nameservers | join(' ') }}" netcfg/confirm_static=true netcfg/get_hostname={{ vmname }} netcfg/get_domain={{ hostvars[vmname].vm_network_cooked.domain }} + {{ debian_installer_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/linux + {{ preseed_tmpdir }}/initrd.preseed.gz + console=ttyS0,115200n8 {% endif %} @@ -28,9 +28,15 @@ {% endif %} /usr/bin/kvm + + + + + /dev/urandom + -{% if 'virtio' in hostvars[vmname].vm_install_cooked.disks %} -{% for device, lv in hostvars[vmname].vm_install_cooked.disks.virtio.items() %} +{% if 'virtio' in hostvars[hostname].install_cooked.disks %} +{% for device, lv in hostvars[hostname].install_cooked.disks.virtio.items() %} @@ -39,9 +45,9 @@ {% endfor %} {% endif %} -{% if 'scsi' in hostvars[vmname].vm_install_cooked.disks %} +{% if 'scsi' in hostvars[hostname].install_cooked.disks %} -{% for device, lv in hostvars[vmname].vm_install_cooked.disks.scsi.items() %} +{% for device, lv in hostvars[hostname].install_cooked.disks.scsi.items() %} @@ -50,8 +56,8 @@ {% endfor %} {% endif %} -{% if hostvars[vmname].vm_install_cooked.interfaces %} -{% for if in hostvars[vmname].vm_install_cooked.interfaces %} +{% if hostvars[hostname].install_cooked.interfaces %} +{% for if in hostvars[hostname].install_cooked.interfaces %} diff --git a/roles/vm/install/templates/preseed_debian-stretch.cfg.j2 b/roles/vm/install/templates/preseed_debian-stretch.cfg.j2 deleted file mode 100644 index 8e221671..00000000 --- a/roles/vm/install/templates/preseed_debian-stretch.cfg.j2 +++ /dev/null @@ -1,105 +0,0 @@ -######################################################################### -# spreadspace preseed file for Debian stretch based VMs -######################################################################### - -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string de_AT.UTF-8 -d-i keyboard-configuration/xkb-keymap select de - - -#d-i netcfg/choose_interface select enp1s1 -#d-i netcfg/disable_autoconfig boolean false -#d-i netcfg/get_ipaddress string {{ hostvars[vmname].vm_network_cooked.primary.ip }} -#d-i netcfg/get_netmask string {{ hostvars[vmname].vm_network_cooked.primary.mask }} -#d-i netcfg/get_gateway string {{ hostvars[vmname].vm_network_cooked.primary.gateway }} -#d-i netcfg/get_nameservers string {{ hostvars[vmname].vm_network_cooked.nameservers | join(' ') }} -#d-i netcfg/confirm_static boolean true - -d-i netcfg/get_hostname string {{ vmname }} -d-i netcfg/get_domain string {{ hostvars[vmname].vm_network_cooked.domain }} -d-i netcfg/wireless_wep string - - -d-i mirror/country string manual -d-i mirror/http/hostname string deb.debian.org -d-i mirror/http/directory string /debian -d-i mirror/http/proxy string - - -d-i passwd/make-user boolean false -d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand -d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand - - -d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna -d-i clock-setup/ntp boolean false - - -d-i partman-auto/disk string /dev/{{ hostvars[vmname].vm_install_cooked.disks.primary }} -d-i partman-auto/method string lvm -d-i partman-lvm/device_remove_lvm boolean true -d-i partman-md/device_remove_md boolean true - -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true - -d-i partman-auto/expert_recipe string \ - boot-root :: \ - 1000 10000 -1 ext4 \ - $defaultignore{ } $primary{ } $bootable{ } \ - method{ lvm } vg_name{ {{ vmname }} } \ - . \ - 2048 10000 2560 ext4 \ - $lvmok{ } in_vg{ {{ vmname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ / } \ - . \ - 1024 11000 1280 ext4 \ - $lvmok{ } in_vg{ {{ vmname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /var } \ - . \ - 768 10000 768 ext4 \ - $lvmok{ } in_vg{ {{ vmname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /var/log } \ - options/nodev{ nodev } options/noatime{ noatime } \ - options/noexec{ noexec } \ - . \ - 16 20000 -1 ext4 \ - $lvmok{ } in_vg{ {{ vmname }} } \ - method( keep } lv_name{ dummy } \ - . - -d-i partman-auto-lvm/no_boot boolean true -d-i partman-basicfilesystems/no_swap true -d-i partman-partitioning/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - - -d-i base-installer/install-recommends boolean false -d-i apt-setup/security_host string deb.debian.org - -tasksel tasksel/first multiselect -d-i pkgsel/include string openssh-server python -d-i pkgsel/upgrade select safe-upgrade -popularity-contest popularity-contest/participate boolean false - -d-i grub-installer/choose_bootdev string /dev/{{ hostvars[vmname].vm_install_cooked.disks.primary }} -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean false - -d-i finish-install/reboot_in_progress note - - -d-i preseed/late_command string \ - lvremove -f {{ vmname }}/dummy; \ - in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo -e '{{ sshserver_root_keys }}' > /root/.ssh/authorized_keys" diff --git a/roles/vm/install/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/vm/install/templates/preseed_ubuntu-bionic.cfg.j2 new file mode 100644 index 00000000..d6fbc5d7 --- /dev/null +++ b/roles/vm/install/templates/preseed_ubuntu-bionic.cfg.j2 @@ -0,0 +1,122 @@ +######################################################################### +# spreadspace preseed file for Ubuntu bionic based VMs +######################################################################### + +d-i debian-installer/language string en +d-i debian-installer/country string AT +d-i debian-installer/locale string en_US.UTF-8 +d-i localechooser/preferred-locale string en_US.UTF-8 +d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i console-setup/ask_detect boolean false +d-i keyboard-configuration/xkb-keymap select us +d-i keyboard-configuration/layoutcode string us + +d-i netcfg/disable_dhcp boolean true +d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} +d-i netcfg/disable_autoconfig boolean false +d-i netcfg/get_ipaddress string {{ hostvars[hostname].network_cooked.primary.ip }} +d-i netcfg/get_netmask string {{ hostvars[hostname].network_cooked.primary.mask }} +d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gateway }} +d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }} +d-i netcfg/confirm_static boolean true + +d-i netcfg/get_hostname string {{ hostname }} +d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }} +d-i netcfg/wireless_wep string + + +d-i mirror/country string manual +d-i mirror/http/hostname string archive.ubuntu.com +d-i mirror/http/directory string /ubuntu +d-i mirror/http/proxy string + + +d-i passwd/make-user boolean false +d-i passwd/root-login boolean true +d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand +d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand + + +d-i clock-setup/utc boolean true +d-i time/zone string Europe/Vienna +d-i clock-setup/ntp boolean false + + +d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i partman-auto/method string lvm +d-i partman-auto/purge_lvm_from_device boolean true +d-i partman-auto-lvm/new_vg_name string {{ hostname }} +d-i partman-auto-lvm/guided_size string max + +d-i partman-lvm/device_remove_lvm boolean true +d-i partman-md/device_remove_md boolean true + +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true + +d-i partman-auto/expert_recipe string \ + boot-root :: \ + 1000 10000 -1 ext4 \ + $defaultignore{ } $primary{ } $bootable{ } \ + method{ lvm } vg_name{ {{ hostname }} } \ + . \ + 2048 10000 2560 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ / } \ + . \ + 1024 11000 1280 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ /var } \ + . \ + 768 10000 768 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method{ format } format{ } \ + use_filesystem{ } filesystem{ ext4 } \ + mountpoint{ /var/log } \ + options/nodev{ nodev } options/noatime{ noatime } \ + options/noexec{ noexec } \ + . \ + 16 20000 -1 ext4 \ + $lvmok{ } in_vg{ {{ hostname }} } \ + method( keep } lv_name{ dummy } \ + . + +d-i partman-auto-lvm/no_boot boolean true +d-i partman-basicfilesystems/no_swap true +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + + +d-i base-installer/install-recommends boolean false +d-i apt-setup/security_host string archive.ubuntu.com + +tasksel tasksel/first multiselect +d-i pkgsel/include string openssh-server python +d-i pkgsel/upgrade select safe-upgrade +popularity-contest popularity-contest/participate boolean false +d-i pkgsel/update-policy select none + +d-i grub-installer/choose_bootdev string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean false + +d-i finish-install/reboot_in_progress note + + +d-i preseed/late_command string \ + lvremove -f {{ hostname }}/dummy; \ + in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \ + in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ + in-target bash -c "passwd -d root && passwd -l root"; \ + in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ + mkdir -p -m 0700 /target/root/.ssh; \ + cp /authorized_keys /target/root/.ssh/; \ +{% if hostvars[hostname].ansible_port is defined %} + in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config" +{% endif %} diff --git a/roles/vm/install/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/vm/install/templates/preseed_ubuntu-xenial.cfg.j2 deleted file mode 100644 index dc53fd36..00000000 --- a/roles/vm/install/templates/preseed_ubuntu-xenial.cfg.j2 +++ /dev/null @@ -1,113 +0,0 @@ -######################################################################### -# spreadspace preseed file for Ubuntu xenial based VMs -######################################################################### - -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 -d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us - - -#d-i netcfg/choose_interface select enp1s1 -#d-i netcfg/disable_autoconfig boolean false -#d-i netcfg/get_ipaddress string {{ hostvars[vmname].vm_network_cooked.primary.ip }} -#d-i netcfg/get_netmask string {{ hostvars[vmname].vm_network_cooked.primary.mask }} -#d-i netcfg/get_gateway string {{ hostvars[vmname].vm_network_cooked.primary.gateway }} -#d-i netcfg/get_nameservers string {{ hostvars[vmname].vm_network_cooked.nameservers | join(' ') }} -#d-i netcfg/confirm_static boolean true - -d-i netcfg/get_hostname string {{ vmname }} -d-i netcfg/get_domain string {{ hostvars[vmname].vm_network_cooked.domain }} -d-i netcfg/wireless_wep string - - -d-i mirror/country string manual -d-i mirror/http/hostname string archive.ubuntu.com -d-i mirror/http/directory string /ubuntu -d-i mirror/http/proxy string - - -d-i passwd/make-user boolean false -d-i passwd/root-login boolean true -d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand -d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand - - -d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna -d-i clock-setup/ntp boolean false - - -d-i partman-auto/disk string /dev/{{ hostvars[vmname].vm_install_cooked.disks.primary }} -d-i partman-auto/method string lvm -d-i partman-auto/purge_lvm_from_device boolean true -d-i partman-auto-lvm/new_vg_name string {{ vmname }} -d-i partman-auto-lvm/guided_size string max - -d-i partman-lvm/device_remove_lvm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true - -d-i partman-auto/expert_recipe string \ - boot-root :: \ - 1000 10000 -1 ext4 \ - $defaultignore{ } $primary{ } $bootable{ } \ - method{ lvm } vg_name{ {{ vmname }} } \ - . \ - 2048 10000 2560 ext4 \ - $lvmok{ } in_vg{ {{ vmname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ / } \ - . \ - 1024 11000 1280 ext4 \ - $lvmok{ } in_vg{ {{ vmname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /var } \ - . \ - 768 10000 768 ext4 \ - $lvmok{ } in_vg{ {{ vmname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /var/log } \ - options/nodev{ nodev } options/noatime{ noatime } \ - options/noexec{ noexec } \ - . \ - 16 20000 -1 ext4 \ - $lvmok{ } in_vg{ {{ vmname }} } \ - method( keep } lv_name{ dummy } \ - . - -d-i partman-auto-lvm/no_boot boolean true -d-i partman-basicfilesystems/no_swap true -d-i partman-partitioning/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - - -d-i base-installer/install-recommends boolean false -d-i apt-setup/security_host string archive.ubuntu.com - -tasksel tasksel/first multiselect -d-i pkgsel/include string openssh-server python -d-i pkgsel/upgrade select safe-upgrade -popularity-contest popularity-contest/participate boolean false -d-i pkgsel/update-policy select none - -d-i grub-installer/choose_bootdev string /dev/{{ hostvars[vmname].vm_install_cooked.disks.primary }} -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean false - -d-i finish-install/reboot_in_progress note - - -d-i preseed/late_command string \ - lvremove -f {{ vmname }}/dummy; \ - in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo -e '{{ sshserver_root_keys }}' > /root/.ssh/authorized_keys" diff --git a/roles/vm/network/tasks/main.yml b/roles/vm/network/tasks/main.yml index 3d51fff2..9bef36ed 100644 --- a/roles/vm/network/tasks/main.yml +++ b/roles/vm/network/tasks/main.yml @@ -9,7 +9,7 @@ state: absent - name: install systemd network link units - with_items: "{{ vm_network.systemd_link.interfaces }}" + with_items: "{{ network.systemd_link.interfaces }}" loop_control: index_var: interface_index template: @@ -17,13 +17,28 @@ dest: "/etc/systemd/network/{{ '%02d' | format(interface_index + 11) }}-{{ item.name }}.link" notify: rebuild initramfs - when: vm_network.systemd_link is defined + when: network.systemd_link is defined - name: install basic interface config template: src: interfaces.j2 dest: /etc/network/interfaces mode: 0644 + when: ansible_distribution == "Debian" or (ansible_distribution == "Ubuntu" and (ansible_distribution_major_version | int) < 18) + +- block: + - name: remove default netplan config + file: + path: /etc/netplan/01-netcfg.yaml + state: absent + + - name: install basic netplan config + template: + src: netplan.yaml.j2 + dest: "/etc/netplan/01-{{ network.primary.interface }}.yaml" + mode: 0644 + + when: ansible_distribution == "Ubuntu" and (ansible_distribution_major_version | int) >= 18 - name: remove resolvconf package apt: diff --git a/roles/vm/network/templates/interfaces.j2 b/roles/vm/network/templates/interfaces.j2 index 542e18d6..829a3e7d 100644 --- a/roles/vm/network/templates/interfaces.j2 +++ b/roles/vm/network/templates/interfaces.j2 @@ -8,10 +8,10 @@ auto lo iface lo inet loopback # The primary network interface -auto {{ vm_network.primary.interface }} -iface {{ vm_network.primary.interface }} inet static - address {{ vm_network.primary.ip }} - netmask {{ vm_network.primary.mask }} - gateway {{ vm_network.primary.gateway }} +auto {{ network.primary.interface }} +iface {{ network.primary.interface }} inet static + address {{ network.primary.ip }} + netmask {{ network.primary.mask }} + gateway {{ network.primary.gateway }} pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf diff --git a/roles/vm/network/templates/netplan.yaml.j2 b/roles/vm/network/templates/netplan.yaml.j2 new file mode 100644 index 00000000..0d78ab46 --- /dev/null +++ b/roles/vm/network/templates/netplan.yaml.j2 @@ -0,0 +1,10 @@ +# This file describes the network interfaces available on your system +# For more information, see netplan(5). +network: + version: 2 + renderer: networkd + ethernets: + {{ network.primary.interface }}: + addresses: [ {{ (network.primary.ip + '/' + network.primary.mask) | ipaddr('address/prefix') }} ] + gateway4: {{ network.primary.gateway }} + accept-ra: false diff --git a/roles/vm/network/templates/resolv.conf.j2 b/roles/vm/network/templates/resolv.conf.j2 index 86d4201e..a32ec181 100644 --- a/roles/vm/network/templates/resolv.conf.j2 +++ b/roles/vm/network/templates/resolv.conf.j2 @@ -1,4 +1,4 @@ -{% for nsrv in vm_network.nameservers %} +{% for nsrv in network.nameservers %} nameserver {{ nsrv }} {% endfor %} -search {{ vm_network.domain }} +search {{ network.domain }} -- cgit v1.2.3 From 1e1f41eff500a80980c1af560306590b4efbe131 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 2 Dec 2018 17:56:09 +0100 Subject: some cleanups --- inventory/hosts.ini | 21 +++++++++------------ .../preseed/templates/preseed_debian-stretch.cfg.j2 | 4 ++-- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'inventory') diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 34e12592..9544202a 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -1,5 +1,6 @@ [all:vars] -#ansible_host={{ inventory_hostname }}.{{ host_domain }} +host_name={{ inventory_hostname }} +ansible_host={{ host_name }}.{{ host_domain }} ansible_user=root ansible_port=22000 @@ -18,7 +19,7 @@ mail stats auth atlas -pan +pan ansible_port=222 keyserver mimas @@ -31,7 +32,7 @@ host_domain=spreadspace.org environment_group=spreadspace [spreadspace] -build ansible_port=222 +build calypso telesto thetys @@ -63,9 +64,8 @@ host_domain=skillz.biz environment_group=elevate [skillz] -sk2013 -sk2016 -sktorrent +sk2013 host_name=2013 +sk2016 host_name=2016 [elevate:vars] @@ -73,10 +73,9 @@ host_domain=elevate.at environment_group=elevate [elevate] -elewolke -elestream -elemedia -elesearch +elewolke host_name=wolke +elemedia host_name=media +elesearch host_name=search ############################### @@ -94,9 +93,7 @@ sk2016 emc-stats emc-master mimas -sktorrent elewolke -elestream elesearch [hetzner:children] diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 index 7a3511a5..74ab18e8 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -4,8 +4,8 @@ d-i debian-installer/language string en d-i debian-installer/country string AT -d-i debian-installer/locale string de_AT.UTF-8 -d-i keyboard-configuration/xkb-keymap select de +d-i debian-installer/locale string en_US.UTF-8 +d-i keyboard-configuration/xkb-keymap select us d-i netcfg/disable_dhcp boolean true d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} -- cgit v1.2.3 From bb422a066f898aab79eeec8ebf882ba2977ff598 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 8 Dec 2018 13:39:41 +0100 Subject: rename environment elevate to dan --- dan/generic.yaml | 5 +++++ dan/sk2013.yml | 6 ++++++ dan/sk2016.yml | 6 ++++++ elevate/generic.yaml | 5 ----- elevate/sk2013.yml | 6 ------ elevate/sk2016.yml | 6 ------ gpg/get-vault-pass-dan | 2 ++ gpg/get-vault-pass-elevate | 2 -- gpg/vault-keyring-dan.gpg | Bin 0 -> 37630 bytes gpg/vault-keyring-elevate.gpg | Bin 37630 -> 0 bytes gpg/vault-pass-dan.gpg | 19 +++++++++++++++++++ gpg/vault-pass-elevate.gpg | 19 ------------------- inventory/hosts.ini | 12 ++++++------ 13 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 dan/generic.yaml create mode 100644 dan/sk2013.yml create mode 100644 dan/sk2016.yml delete mode 100644 elevate/generic.yaml delete mode 100644 elevate/sk2013.yml delete mode 100644 elevate/sk2016.yml create mode 100755 gpg/get-vault-pass-dan delete mode 100755 gpg/get-vault-pass-elevate create mode 100644 gpg/vault-keyring-dan.gpg delete mode 100644 gpg/vault-keyring-elevate.gpg create mode 100644 gpg/vault-pass-dan.gpg delete mode 100644 gpg/vault-pass-elevate.gpg (limited to 'inventory') diff --git a/dan/generic.yaml b/dan/generic.yaml new file mode 100644 index 00000000..d3b8de82 --- /dev/null +++ b/dan/generic.yaml @@ -0,0 +1,5 @@ +--- +- name: "Apply role {{ myrole }} to hosts: {{ myhosts }}" + hosts: "{{ myhosts }}" + roles: + - role: "{{ myrole }}" diff --git a/dan/sk2013.yml b/dan/sk2013.yml new file mode 100644 index 00000000..5caa6603 --- /dev/null +++ b/dan/sk2013.yml @@ -0,0 +1,6 @@ +--- +- name: Basic Setup + hosts: sk2013 + roles: + - role: sshserver + - role: vm/host diff --git a/dan/sk2016.yml b/dan/sk2016.yml new file mode 100644 index 00000000..ef3d7c43 --- /dev/null +++ b/dan/sk2016.yml @@ -0,0 +1,6 @@ +--- +- name: Basic Setup + hosts: sk2016 + roles: + - role: sshserver + - role: vm/host diff --git a/elevate/generic.yaml b/elevate/generic.yaml deleted file mode 100644 index d3b8de82..00000000 --- a/elevate/generic.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: "Apply role {{ myrole }} to hosts: {{ myhosts }}" - hosts: "{{ myhosts }}" - roles: - - role: "{{ myrole }}" diff --git a/elevate/sk2013.yml b/elevate/sk2013.yml deleted file mode 100644 index 5caa6603..00000000 --- a/elevate/sk2013.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Basic Setup - hosts: sk2013 - roles: - - role: sshserver - - role: vm/host diff --git a/elevate/sk2016.yml b/elevate/sk2016.yml deleted file mode 100644 index ef3d7c43..00000000 --- a/elevate/sk2016.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Basic Setup - hosts: sk2016 - roles: - - role: sshserver - - role: vm/host diff --git a/gpg/get-vault-pass-dan b/gpg/get-vault-pass-dan new file mode 100755 index 00000000..37f60413 --- /dev/null +++ b/gpg/get-vault-pass-dan @@ -0,0 +1,2 @@ +#!/bin/bash +exec "${BASH_SOURCE%/*}/get-vault-pass.sh" "${BASH_SOURCE##*/get-vault-pass-}" diff --git a/gpg/get-vault-pass-elevate b/gpg/get-vault-pass-elevate deleted file mode 100755 index 37f60413..00000000 --- a/gpg/get-vault-pass-elevate +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exec "${BASH_SOURCE%/*}/get-vault-pass.sh" "${BASH_SOURCE##*/get-vault-pass-}" diff --git a/gpg/vault-keyring-dan.gpg b/gpg/vault-keyring-dan.gpg new file mode 100644 index 00000000..161d61bc Binary files /dev/null and b/gpg/vault-keyring-dan.gpg differ diff --git a/gpg/vault-keyring-elevate.gpg b/gpg/vault-keyring-elevate.gpg deleted file mode 100644 index 161d61bc..00000000 Binary files a/gpg/vault-keyring-elevate.gpg and /dev/null differ diff --git a/gpg/vault-pass-dan.gpg b/gpg/vault-pass-dan.gpg new file mode 100644 index 00000000..382a0e3a --- /dev/null +++ b/gpg/vault-pass-dan.gpg @@ -0,0 +1,19 @@ +-----BEGIN PGP MESSAGE----- + +hQIMA+Qd5U24qffPARAAh/hpOPDkQFckrlbmwFYiKtMyzJcHVOeSckFAsGYh0BFa +MzcbLqdRPGDwZL9yIruc/6ubQv1zqq8MZcvRW7BZkkCzBk5h2BcJ76iMgWfcwte6 +Jc2pmog36GihU9t41BJFtxm6mazEN4JTW3SC6i1boMPEJBOEcSIu8SBAFNGm0nCq +GL0j9Rw/T/EiMtmjY6c9nMTSnhOtcedpWeBsMPtYoWAo8/ea1kaGHCON+UGs6/4D +QUhI/ate8RA0vAD6NFkZE9C+uwU22/cyT7pZZTA11ohF32aF4vyVgMf9UY0+MYy0 ++msJZps2KRmECcVZiFGQZ2/OwU4tnYq53jUwL1erzADeFAco4vKtc7yVffN/pIn8 +aQ48kaKe9WT064fe92zWJfWF285fyEB8we72j6AmwA5RxIViVvl/2xdCdYNN6yv+ +kqYmdCEBdMHhcDz73K2mCGeqlkB8+DVpeHwtn+TT5J1IeFkCiK2LD2PtpyqV7BTn +dExQaKtUCbF3+jiPTv6N5ChMbY5ql2roN2zzHgoGVNREGaTxJXnkroJpxaelf4Q3 +ahnNE+/3G16TNCpzYXBNWh9wIHh+6mFhwqKxPy40goW4TMXqSs9+n1MCQhu8GCTH +8CsW6tK98vBgzbhoWLyyNVa40hdltw4+D0YdRle+YFqHaiXJcf2/FjaLoz+jSXvS +uwHQGVypRlmepR7lAKTTVCEjBrJ3lnW7LcBsHEKTr1gX+UleiPri5e029BRLcJDR +PJE4PBi7fp4tAUgSiN6D+mVF0+eXz2px+NVPAeavveMY/oTl8GsPQc/hYtjW9CnM +nhadEDPSmkaLMkCjR6XApprZtuoPyHPSTFIKGTe4bSU1Ezbpd9XNfXcU2Gz55JEk +rAvuyAfHqyXB1zzyA3UTPvRDAw0TN72wbMPEg2v5TE8TFB2Q3XoDuZYsN/A= +=fg/w +-----END PGP MESSAGE----- diff --git a/gpg/vault-pass-elevate.gpg b/gpg/vault-pass-elevate.gpg deleted file mode 100644 index 382a0e3a..00000000 --- a/gpg/vault-pass-elevate.gpg +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP MESSAGE----- - -hQIMA+Qd5U24qffPARAAh/hpOPDkQFckrlbmwFYiKtMyzJcHVOeSckFAsGYh0BFa -MzcbLqdRPGDwZL9yIruc/6ubQv1zqq8MZcvRW7BZkkCzBk5h2BcJ76iMgWfcwte6 -Jc2pmog36GihU9t41BJFtxm6mazEN4JTW3SC6i1boMPEJBOEcSIu8SBAFNGm0nCq -GL0j9Rw/T/EiMtmjY6c9nMTSnhOtcedpWeBsMPtYoWAo8/ea1kaGHCON+UGs6/4D -QUhI/ate8RA0vAD6NFkZE9C+uwU22/cyT7pZZTA11ohF32aF4vyVgMf9UY0+MYy0 -+msJZps2KRmECcVZiFGQZ2/OwU4tnYq53jUwL1erzADeFAco4vKtc7yVffN/pIn8 -aQ48kaKe9WT064fe92zWJfWF285fyEB8we72j6AmwA5RxIViVvl/2xdCdYNN6yv+ -kqYmdCEBdMHhcDz73K2mCGeqlkB8+DVpeHwtn+TT5J1IeFkCiK2LD2PtpyqV7BTn -dExQaKtUCbF3+jiPTv6N5ChMbY5ql2roN2zzHgoGVNREGaTxJXnkroJpxaelf4Q3 -ahnNE+/3G16TNCpzYXBNWh9wIHh+6mFhwqKxPy40goW4TMXqSs9+n1MCQhu8GCTH -8CsW6tK98vBgzbhoWLyyNVa40hdltw4+D0YdRle+YFqHaiXJcf2/FjaLoz+jSXvS -uwHQGVypRlmepR7lAKTTVCEjBrJ3lnW7LcBsHEKTr1gX+UleiPri5e029BRLcJDR -PJE4PBi7fp4tAUgSiN6D+mVF0+eXz2px+NVPAeavveMY/oTl8GsPQc/hYtjW9CnM -nhadEDPSmkaLMkCjR6XApprZtuoPyHPSTFIKGTe4bSU1Ezbpd9XNfXcU2Gz55JEk -rAvuyAfHqyXB1zzyA3UTPvRDAw0TN72wbMPEg2v5TE8TFB2Q3XoDuZYsN/A= -=fg/w ------END PGP MESSAGE----- diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 9544202a..bbb04855 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -1,8 +1,8 @@ [all:vars] host_name={{ inventory_hostname }} -ansible_host={{ host_name }}.{{ host_domain }} -ansible_user=root -ansible_port=22000 +#ansible_host={{ host_name }}.{{ host_domain }} +#ansible_user=root +#ansible_port=22000 ############################### @@ -57,11 +57,11 @@ emc-00 ############################### -# environment: elevate +# environment: dan [skillz:vars] host_domain=skillz.biz -environment_group=elevate +environment_group=dan [skillz] sk2013 host_name=2013 @@ -70,7 +70,7 @@ sk2016 host_name=2016 [elevate:vars] host_domain=elevate.at -environment_group=elevate +environment_group=dan [elevate] elewolke host_name=wolke -- cgit v1.2.3 From b01e63ba531b0bd7853469a33a85f06457c84410 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 8 Dec 2018 15:08:12 +0100 Subject: strip old and not yet used hosts --- host_playbooks/elesearch.yml | 9 --------- inventory/host_vars/elesearch.yml | 29 ----------------------------- inventory/host_vars/sk2013.yml | 1 - inventory/hosts.ini | 26 +++++++++++--------------- 4 files changed, 11 insertions(+), 54 deletions(-) delete mode 100644 host_playbooks/elesearch.yml delete mode 100644 inventory/host_vars/elesearch.yml (limited to 'inventory') diff --git a/host_playbooks/elesearch.yml b/host_playbooks/elesearch.yml deleted file mode 100644 index 15fca1a7..00000000 --- a/host_playbooks/elesearch.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: elesearch - roles: - - role: sshserver - - role: vm/grub - - role: vm/network - - role: base - - role: zsh diff --git a/inventory/host_vars/elesearch.yml b/inventory/host_vars/elesearch.yml deleted file mode 100644 index 0e235000..00000000 --- a/inventory/host_vars/elesearch.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -vm_install_host: sk2013 - -vm_install: - host: "{{ vm_install_host }}" - mem: 1024 - numcpu: 4 - disks: - primary: vda - virtio: - vda: - vg: storage - lv: "{{ inventory_hostname }}" - size: 50g - interfaces: - - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" - name: primary0 - autostart: True - -vm_network: - nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" - domain: elevate.at - systemd_link: - interfaces: "{{ vm_install.interfaces }}" - primary: - interface: primary0 - ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" - mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" - gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" diff --git a/inventory/host_vars/sk2013.yml b/inventory/host_vars/sk2013.yml index a8bb3ebd..c1bf2728 100644 --- a/inventory/host_vars/sk2013.yml +++ b/inventory/host_vars/sk2013.yml @@ -17,4 +17,3 @@ vm_host: - 213.133.99.99 indices: emc-master: 141 - elesearch: 142 diff --git a/inventory/hosts.ini b/inventory/hosts.ini index bbb04855..37f8fc9b 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -11,17 +11,14 @@ host_name={{ inventory_hostname }} [chaos-at-home:vars] host_domain=chaos-at-home.org environment_group=chaos-at-home +ansible_host={{ host_name }}.{{ host_domain }} +ansible_user=root +ansible_port=22000 [chaos-at-home] -prometheus -web -mail -stats -auth +#prometheus atlas -pan ansible_port=222 keyserver -mimas ############################### @@ -30,6 +27,9 @@ mimas [spreadspace:vars] host_domain=spreadspace.org environment_group=spreadspace +ansible_host={{ host_name }}.{{ host_domain }} +ansible_user=root +ansible_port=22000 [spreadspace] build @@ -41,8 +41,9 @@ helene emc-test -[spreadspace:children] -emc +[emc:vars] +host_domain=spreadspace.org +environment_group=spreadspace [emc] emc-stats @@ -73,16 +74,14 @@ host_domain=elevate.at environment_group=dan [elevate] -elewolke host_name=wolke elemedia host_name=media -elesearch host_name=search ############################### # host categories [kvmhosts] -prometheus +#prometheus atlas sk2013 sk2016 @@ -92,9 +91,6 @@ sk2013 sk2016 emc-stats emc-master -mimas -elewolke -elesearch [hetzner:children] emc-xx -- cgit v1.2.3 From ee42cc8340f26be2316120a1434c5289d5927da2 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 8 Dec 2018 16:53:43 +0100 Subject: improve handling of environment groups --- ansible.cfg | 1 + apply-role.sh | 16 ++++++++----- chaos-at-home/vm-install.yml | 2 ++ common/utils.sh | 21 +++++++++++++++++ common/vm-install.yml | 47 +++++++++++++++++++++++++++++++++++++++ dan/vm-install.yml | 2 ++ inventory/group_vars/all/main.yml | 2 +- inventory/hosts.ini | 10 ++++----- spreadspace/vm-install.yml | 2 ++ upgrade.sh | 16 ++++++++----- vm-install.sh | 11 ++++++--- vm-install.yml | 46 -------------------------------------- 12 files changed, 109 insertions(+), 67 deletions(-) create mode 100644 chaos-at-home/vm-install.yml create mode 100644 common/utils.sh create mode 100644 common/vm-install.yml create mode 100644 dan/vm-install.yml create mode 100644 spreadspace/vm-install.yml delete mode 100644 vm-install.yml (limited to 'inventory') diff --git a/ansible.cfg b/ansible.cfg index 8d436f20..4248b8ba 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -20,6 +20,7 @@ vault_id_match = True var_compression_level = 9 +bin_ansible_callbacks = True [ssh_connection] pipelining = True diff --git a/apply-role.sh b/apply-role.sh index a2b0ac4f..5af348d4 100755 --- a/apply-role.sh +++ b/apply-role.sh @@ -1,15 +1,19 @@ #!/bin/bash -if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] ; then - echo "$0 " +if [ -z "$1" ] || [ -z "$2" ]; then + echo "$0 " exit 1 fi -env="$1" -shift hosts="$1" shift role="$1" shift -echo "######## applying the role '$role' to host(s) '$hosts' in environment '$env' ########" -exec ansible-playbook -e "myhosts=$hosts" -e "myrole=$role" $@ "$env/generic.yaml" +source "${BASH_SOURCE%/*}/common/utils.sh" +get_ansible_variable env_group "$hosts" +if [ $? -ne 0 ]; then + exit 1 +fi + +echo "######## applying the role '$role' to host(s) '$hosts' in environment '$env_group' ########" +exec ansible-playbook -e "myhosts=$hosts" -e "myrole=$role" $@ "$env_group/generic.yaml" diff --git a/chaos-at-home/vm-install.yml b/chaos-at-home/vm-install.yml new file mode 100644 index 00000000..b5d8bf2e --- /dev/null +++ b/chaos-at-home/vm-install.yml @@ -0,0 +1,2 @@ +--- +- import_playbook: ../common/vm-install.yml diff --git a/common/utils.sh b/common/utils.sh new file mode 100644 index 00000000..2749eda6 --- /dev/null +++ b/common/utils.sh @@ -0,0 +1,21 @@ +## this contains several helper functions + +get_ansible_variable() { + local _var_name="$1" + local _hosts="$2" + + local _result=$(env ANSIBLE_STDOUT_CALLBACK="json" ansible "$_hosts" -m debug -a "var=$_var_name" | \ + jq -r ".plays[].tasks[].hosts[].$_var_name" | sort | uniq) + if [ $? -ne 0 ] || [ -z "$_result" ]; then + return 1 + fi + + local _num_results=$(echo "$_result" | wc -l) + if [ $_num_results -ne 1 ]; then + echo "ERROR: hosts may only belong to one environment group but got: $(echo $_result | xargs | sed 's/ /, /g')" + return 1 + fi + + eval "$_var_name"='$(echo "$_result")' + return 0 +} diff --git a/common/vm-install.yml b/common/vm-install.yml new file mode 100644 index 00000000..a6faf827 --- /dev/null +++ b/common/vm-install.yml @@ -0,0 +1,47 @@ +--- +- name: preperations and sanity checks + hosts: "{{ vmname }}" + gather_facts: no + tasks: + - name: setup variables + set_fact: + vm_network_cooked: "{{ vm_network }}" + vm_install_cooked: "{{ vm_install }}" + - name: create temporary host group for vm host + add_host: + name: "{{ vm_install.host }}" + inventory_dir: "{{inventory_dir}}" + group: _vmhost_ + # TODO: add some sanity checks + +- name: basic installation + hosts: _vmhost_ + roles: + - role: vm/install + +- name: wait for new vm to start up + hosts: "{{ vmname }}" + gather_facts: no + tasks: + ## TODO: find a better way to fetch host key of new VMs + - name: disable ssh StrictHostKeyChecking for the next step + set_fact: + ansible_ssh_extra_args: -o StrictHostKeyChecking=no + - name: wait for vm to start up + wait_for_connection: + delay: 5 + timeout: 120 + - name: reenable StrictHostKeyChecking + set_fact: + ansible_ssh_extra_args: "" + +### TODO: fix path to host_playbook +##- import_playbook: "host_playbooks/{{ vmname }}.yml" + +- name: reboot and wait for VM come back + hosts: "{{ vmname }}" + gather_facts: no + roles: + - role: reboot-and-wait + reboot_delay: 10 + reboot_timeout: 120 diff --git a/dan/vm-install.yml b/dan/vm-install.yml new file mode 100644 index 00000000..b5d8bf2e --- /dev/null +++ b/dan/vm-install.yml @@ -0,0 +1,2 @@ +--- +- import_playbook: ../common/vm-install.yml diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml index e30c383a..d23e3952 100644 --- a/inventory/group_vars/all/main.yml +++ b/inventory/group_vars/all/main.yml @@ -1,5 +1,5 @@ --- -sshserver_root_keys: "{{ ssh_keys.equinox[environment_group] | join('\n') }}" +sshserver_root_keys: "{{ ssh_keys.equinox[env_group] | join('\n') }}" equinox_user: name: equinox diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 37f8fc9b..5586ab3d 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -10,7 +10,7 @@ host_name={{ inventory_hostname }} [chaos-at-home:vars] host_domain=chaos-at-home.org -environment_group=chaos-at-home +env_group=chaos-at-home ansible_host={{ host_name }}.{{ host_domain }} ansible_user=root ansible_port=22000 @@ -26,7 +26,7 @@ keyserver [spreadspace:vars] host_domain=spreadspace.org -environment_group=spreadspace +env_group=spreadspace ansible_host={{ host_name }}.{{ host_domain }} ansible_user=root ansible_port=22000 @@ -43,7 +43,7 @@ emc-test [emc:vars] host_domain=spreadspace.org -environment_group=spreadspace +env_group=spreadspace [emc] emc-stats @@ -62,7 +62,7 @@ emc-00 [skillz:vars] host_domain=skillz.biz -environment_group=dan +env_group=dan [skillz] sk2013 host_name=2013 @@ -71,7 +71,7 @@ sk2016 host_name=2016 [elevate:vars] host_domain=elevate.at -environment_group=dan +env_group=dan [elevate] elemedia host_name=media diff --git a/spreadspace/vm-install.yml b/spreadspace/vm-install.yml new file mode 100644 index 00000000..b5d8bf2e --- /dev/null +++ b/spreadspace/vm-install.yml @@ -0,0 +1,2 @@ +--- +- import_playbook: ../common/vm-install.yml diff --git a/upgrade.sh b/upgrade.sh index 48849b82..e44379c5 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -1,13 +1,17 @@ #!/bin/bash -if [ -z "$1" ] || [ -z "$2" ]; then - echo "$0 " +if [ -z "$1" ]; then + echo "$0 " exit 1 fi -env="$1" -shift hosts="$1" shift -echo "######## upgrading host(s) '$hosts' in environment '$env' ########" -exec ansible-playbook -e "myhosts=$hosts" -e "myrole=upgrade" $@ "$env/generic.yaml" +source "${BASH_SOURCE%/*}/common/utils.sh" +get_ansible_variable env_group "$hosts" +if [ $? -ne 0 ]; then + exit 1 +fi + +echo "######## upgrading host(s) '$hosts' in environment '$env_group' ########" +exec ansible-playbook -e "myhosts=$hosts" -e "myrole=upgrade" $@ "$env_group/generic.yaml" diff --git a/vm-install.sh b/vm-install.sh index 0cc0be48..8d2bc665 100755 --- a/vm-install.sh +++ b/vm-install.sh @@ -4,7 +4,6 @@ if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then echo "$0 " exit 1 fi - name=$1 shift distro=$1 @@ -12,7 +11,13 @@ shift codename=$1 shift -echo "installing vm: $name with $distro/$codename" +source "${BASH_SOURCE%/*}/common/utils.sh" +get_ansible_variable env_group "$name" +if [ $? -ne 0 ]; then + exit 1 +fi + +echo "installing vm: $name with $distro/$codename in environment '$env_group'" echo "" echo "########## clearing old ssh host keys #########" @@ -20,4 +25,4 @@ echo "########## clearing old ssh host keys #########" echo "" echo "######## running the install playbook ########" -exec ansible-playbook -e "vmname=$name" -e "vmdistro=$distro" -e "vmdistcodename=$codename" $@ vm-install.yml +exec ansible-playbook -e "vmname=$name" -e "vmdistro=$distro" -e "vmdistcodename=$codename" $@ "$env_group/vm-install.yml" diff --git a/vm-install.yml b/vm-install.yml deleted file mode 100644 index e0685f9d..00000000 --- a/vm-install.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- name: preperations and sanity checks - hosts: "{{ vmname }}" - gather_facts: no - tasks: - - name: setup variables - set_fact: - vm_network_cooked: "{{ vm_network }}" - vm_install_cooked: "{{ vm_install }}" - - name: create temporary host group for vm host - add_host: - name: "{{ vm_install.host }}" - inventory_dir: "{{inventory_dir}}" - group: _vmhost_ - # TODO: add some sanity checks - -- name: basic installation - hosts: _vmhost_ - roles: - - role: vm/install - -- name: wait for new vm to start up - hosts: "{{ vmname }}" - gather_facts: no - tasks: - ## TODO: find a better way to fetch host key of new VMs - - name: disable ssh StrictHostKeyChecking for the next step - set_fact: - ansible_ssh_extra_args: -o StrictHostKeyChecking=no - - name: wait for vm to start up - wait_for_connection: - delay: 5 - timeout: 120 - - name: reenable StrictHostKeyChecking - set_fact: - ansible_ssh_extra_args: "" - -- import_playbook: "host_playbooks/{{ vmname }}.yml" - -- name: reboot and wait for VM come back - hosts: "{{ vmname }}" - gather_facts: no - roles: - - role: reboot-and-wait - reboot_delay: 10 - reboot_timeout: 120 -- cgit v1.2.3 From 14c69ac3f074d7cea31687ecc105c015b8a55ec7 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 9 Dec 2018 00:56:13 +0100 Subject: cleanup and imrpovement of vm roles (still not working) --- common/vm-install.yml | 27 ++++++++++++++++++--------- host_playbooks/calypso.yml | 10 ---------- host_playbooks/dione.yml | 9 --------- host_playbooks/emc-master.yml | 9 --------- host_playbooks/emc-stats.yml | 10 ---------- host_playbooks/emc-test.yml | 10 ---------- host_playbooks/emc-xx.yml | 9 --------- host_playbooks/helene.yml | 10 ---------- host_playbooks/telesto.yml | 9 --------- host_playbooks/thetys.yml | 10 ---------- inventory/host_vars/emc-master.yml | 20 ++++++++++---------- inventory/host_vars/emc-stats.yml | 20 ++++++++++---------- inventory/host_vars/emc-test.yml | 29 +++++++++++++++++++++++++++++ inventory/host_vars/sk2016.yml | 1 + inventory/hosts.ini | 2 +- spreadspace/calypso.yml | 10 ++++++++++ spreadspace/dione.yml | 9 +++++++++ spreadspace/emc-master.yml | 7 +++++++ spreadspace/emc-stats.yml | 8 ++++++++ spreadspace/emc-test.yml | 7 +++++++ spreadspace/emc-xx.yml | 9 +++++++++ spreadspace/helene.yml | 10 ++++++++++ spreadspace/telesto.yml | 9 +++++++++ spreadspace/thetys.yml | 10 ++++++++++ vm-install.sh | 4 ++-- 25 files changed, 150 insertions(+), 118 deletions(-) delete mode 100644 host_playbooks/calypso.yml delete mode 100644 host_playbooks/dione.yml delete mode 100644 host_playbooks/emc-master.yml delete mode 100644 host_playbooks/emc-stats.yml delete mode 100644 host_playbooks/emc-test.yml delete mode 100644 host_playbooks/emc-xx.yml delete mode 100644 host_playbooks/helene.yml delete mode 100644 host_playbooks/telesto.yml delete mode 100644 host_playbooks/thetys.yml create mode 100644 inventory/host_vars/emc-test.yml create mode 100644 spreadspace/calypso.yml create mode 100644 spreadspace/dione.yml create mode 100644 spreadspace/emc-master.yml create mode 100644 spreadspace/emc-stats.yml create mode 100644 spreadspace/emc-test.yml create mode 100644 spreadspace/emc-xx.yml create mode 100644 spreadspace/helene.yml create mode 100644 spreadspace/telesto.yml create mode 100644 spreadspace/thetys.yml (limited to 'inventory') diff --git a/common/vm-install.yml b/common/vm-install.yml index a6faf827..5cc2a1c3 100644 --- a/common/vm-install.yml +++ b/common/vm-install.yml @@ -1,16 +1,16 @@ --- - name: preperations and sanity checks - hosts: "{{ vmname }}" + hosts: "{{ hostname }}" gather_facts: no tasks: - name: setup variables set_fact: - vm_network_cooked: "{{ vm_network }}" - vm_install_cooked: "{{ vm_install }}" + network_cooked: "{{ network }}" + install_cooked: "{{ install }}" - name: create temporary host group for vm host add_host: - name: "{{ vm_install.host }}" - inventory_dir: "{{inventory_dir}}" + name: "{{ vm_host }}" + inventory_dir: "{{ inventory_dir }}" group: _vmhost_ # TODO: add some sanity checks @@ -20,7 +20,7 @@ - role: vm/install - name: wait for new vm to start up - hosts: "{{ vmname }}" + hosts: "{{ hostname }}" gather_facts: no tasks: ## TODO: find a better way to fetch host key of new VMs @@ -35,11 +35,20 @@ set_fact: ansible_ssh_extra_args: "" -### TODO: fix path to host_playbook -##- import_playbook: "host_playbooks/{{ vmname }}.yml" +- name: Apply VM configuration roles + hosts: "{{ hostname }}" + pre_tasks: + - name: make sure to update cached facts + setup: + roles: + - role: vm/grub + - role: vm/network + - role: vm/guest + +- import_playbook: "../{{ hostenv }}/{{ hostname }}.yml" - name: reboot and wait for VM come back - hosts: "{{ vmname }}" + hosts: "{{ hostname }}" gather_facts: no roles: - role: reboot-and-wait diff --git a/host_playbooks/calypso.yml b/host_playbooks/calypso.yml deleted file mode 100644 index cd6a9ac0..00000000 --- a/host_playbooks/calypso.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Basic Setup - hosts: calypso - roles: - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: blackmagic-desktopvideo - - role: spreadspace-apt-repo diff --git a/host_playbooks/dione.yml b/host_playbooks/dione.yml deleted file mode 100644 index 70b6a077..00000000 --- a/host_playbooks/dione.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: dione - roles: - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: blackmagic-desktopvideo diff --git a/host_playbooks/emc-master.yml b/host_playbooks/emc-master.yml deleted file mode 100644 index 9709409e..00000000 --- a/host_playbooks/emc-master.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: emc-master - roles: - - role: base - - role: sshserver - - role: vm/grub -# - role: vm/network - - role: zsh diff --git a/host_playbooks/emc-stats.yml b/host_playbooks/emc-stats.yml deleted file mode 100644 index d11b5b15..00000000 --- a/host_playbooks/emc-stats.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Basic Setup - hosts: emc-stats - roles: - - role: base - - role: sshserver - - role: vm/grub -# - role: vm/network - - role: zsh - - role: emc-stats diff --git a/host_playbooks/emc-test.yml b/host_playbooks/emc-test.yml deleted file mode 100644 index e3c6c997..00000000 --- a/host_playbooks/emc-test.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Basic Setup - hosts: emc-test - roles: - - role: scaleway-slim - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: wireguard diff --git a/host_playbooks/emc-xx.yml b/host_playbooks/emc-xx.yml deleted file mode 100644 index e2005178..00000000 --- a/host_playbooks/emc-xx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: emc-xx - roles: - - role: hetzner-slim - - role: base - - role: sshserver - - role: zsh - - role: admin-user diff --git a/host_playbooks/helene.yml b/host_playbooks/helene.yml deleted file mode 100644 index d3619d9d..00000000 --- a/host_playbooks/helene.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Basic Setup - hosts: helene - roles: - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: blackmagic-desktopvideo - - role: acmetool/base diff --git a/host_playbooks/telesto.yml b/host_playbooks/telesto.yml deleted file mode 100644 index 11b45596..00000000 --- a/host_playbooks/telesto.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Basic Setup - hosts: telesto - roles: - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: blackmagic-desktopvideo diff --git a/host_playbooks/thetys.yml b/host_playbooks/thetys.yml deleted file mode 100644 index fffeb769..00000000 --- a/host_playbooks/thetys.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Basic Setup - hosts: thetys - roles: - - role: base - - role: sshserver - - role: zsh - - role: admin-user - - role: blackmagic-desktopvideo - - role: spreadspace-apt-repo diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml index 95b3062a..2a2de27f 100644 --- a/inventory/host_vars/emc-master.yml +++ b/inventory/host_vars/emc-master.yml @@ -1,8 +1,8 @@ --- -vm_install_host: sk2013 +vm_host: sk2013 -vm_install: - host: "{{ vm_install_host }}" +install: + host: "{{ vm_host }}" mem: 1024 numcpu: 2 disks: @@ -13,20 +13,20 @@ vm_install: lv: "{{ inventory_hostname }}" size: 42g interfaces: - - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}" name: primary0 autostart: True -vm_network: - nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" +network: + nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}" domain: spreadspace.org systemd_link: - interfaces: "{{ vm_install.interfaces }}" + interfaces: "{{ install.interfaces }}" primary: interface: primary0 - ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" - mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" - gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" + ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}" docker_lvm: vg: "{{ inventory_hostname }}" diff --git a/inventory/host_vars/emc-stats.yml b/inventory/host_vars/emc-stats.yml index 89352b4f..0bd53559 100644 --- a/inventory/host_vars/emc-stats.yml +++ b/inventory/host_vars/emc-stats.yml @@ -1,8 +1,8 @@ --- -vm_install_host: sk2016 +vm_host: sk2016 -vm_install: - host: "{{ vm_install_host }}" +install: + host: "{{ vm_host }}" mem: 8192 numcpu: 6 disks: @@ -17,20 +17,20 @@ vm_install: lv: "{{ inventory_hostname }}-data" size: 100g interfaces: - - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}" + - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}" name: primary0 autostart: True -vm_network: - nameservers: "{{ hostvars[vm_install_host].vm_host.network.nameservers }}" +network: + nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}" domain: spreadspace.org systemd_link: - interfaces: "{{ vm_install.interfaces }}" + interfaces: "{{ install.interfaces }}" primary: interface: primary0 - ip: "{{ (hostvars[vm_install_host].vm_host.network.ip+'/'+hostvars[vm_install_host].vm_host.network.mask) | ipaddr(hostvars[vm_install_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" - mask: "{{ hostvars[vm_install_host].vm_host.network.mask }}" - gateway: "{{ hostvars[vm_install_host].vm_host.network.gateway | default(hostvars[vm_install_host].vm_host.network.ip) }}" + ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}" docker_lvm: vg: "{{ inventory_hostname }}" diff --git a/inventory/host_vars/emc-test.yml b/inventory/host_vars/emc-test.yml new file mode 100644 index 00000000..9b556df0 --- /dev/null +++ b/inventory/host_vars/emc-test.yml @@ -0,0 +1,29 @@ +--- +vm_host: sk2016 + +install: + host: "{{ vm_host }}" + mem: 1024 + numcpu: 2 + disks: + primary: vda + virtio: + vda: + vg: storage + lv: "{{ inventory_hostname }}" + size: 10g + interfaces: + - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}" + name: primary0 + autostart: True + +network: + nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}" + domain: spreadspace.org + systemd_link: + interfaces: "{{ install.interfaces }}" + primary: + interface: primary0 + ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}" + mask: "{{ hostvars[vm_host].vm_host.network.mask }}" + gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}" diff --git a/inventory/host_vars/sk2016.yml b/inventory/host_vars/sk2016.yml index f8371cea..73e59d75 100644 --- a/inventory/host_vars/sk2016.yml +++ b/inventory/host_vars/sk2016.yml @@ -17,3 +17,4 @@ vm_host: - 213.133.99.99 indices: emc-stats: 200 + emc-test: 201 diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 5586ab3d..6b1461de 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -38,7 +38,6 @@ telesto thetys dione helene -emc-test [emc:vars] @@ -48,6 +47,7 @@ env_group=spreadspace [emc] emc-stats emc-master +emc-test [emc:children] emc-xx diff --git a/spreadspace/calypso.yml b/spreadspace/calypso.yml new file mode 100644 index 00000000..cd6a9ac0 --- /dev/null +++ b/spreadspace/calypso.yml @@ -0,0 +1,10 @@ +--- +- name: Basic Setup + hosts: calypso + roles: + - role: base + - role: sshserver + - role: zsh + - role: admin-user + - role: blackmagic-desktopvideo + - role: spreadspace-apt-repo diff --git a/spreadspace/dione.yml b/spreadspace/dione.yml new file mode 100644 index 00000000..70b6a077 --- /dev/null +++ b/spreadspace/dione.yml @@ -0,0 +1,9 @@ +--- +- name: Basic Setup + hosts: dione + roles: + - role: base + - role: sshserver + - role: zsh + - role: admin-user + - role: blackmagic-desktopvideo diff --git a/spreadspace/emc-master.yml b/spreadspace/emc-master.yml new file mode 100644 index 00000000..b12e8004 --- /dev/null +++ b/spreadspace/emc-master.yml @@ -0,0 +1,7 @@ +--- +- name: Basic Setup + hosts: emc-master + roles: + - role: base + - role: sshserver + - role: zsh diff --git a/spreadspace/emc-stats.yml b/spreadspace/emc-stats.yml new file mode 100644 index 00000000..767b58aa --- /dev/null +++ b/spreadspace/emc-stats.yml @@ -0,0 +1,8 @@ +--- +- name: Basic Setup + hosts: emc-stats + roles: + - role: base + - role: sshserver + - role: zsh + - role: emc-stats diff --git a/spreadspace/emc-test.yml b/spreadspace/emc-test.yml new file mode 100644 index 00000000..a8805fc7 --- /dev/null +++ b/spreadspace/emc-test.yml @@ -0,0 +1,7 @@ +--- +- name: Basic Setup + hosts: emc-test + roles: + - role: base + - role: sshserver + - role: zsh diff --git a/spreadspace/emc-xx.yml b/spreadspace/emc-xx.yml new file mode 100644 index 00000000..e2005178 --- /dev/null +++ b/spreadspace/emc-xx.yml @@ -0,0 +1,9 @@ +--- +- name: Basic Setup + hosts: emc-xx + roles: + - role: hetzner-slim + - role: base + - role: sshserver + - role: zsh + - role: admin-user diff --git a/spreadspace/helene.yml b/spreadspace/helene.yml new file mode 100644 index 00000000..d3619d9d --- /dev/null +++ b/spreadspace/helene.yml @@ -0,0 +1,10 @@ +--- +- name: Basic Setup + hosts: helene + roles: + - role: base + - role: sshserver + - role: zsh + - role: admin-user + - role: blackmagic-desktopvideo + - role: acmetool/base diff --git a/spreadspace/telesto.yml b/spreadspace/telesto.yml new file mode 100644 index 00000000..11b45596 --- /dev/null +++ b/spreadspace/telesto.yml @@ -0,0 +1,9 @@ +--- +- name: Basic Setup + hosts: telesto + roles: + - role: base + - role: sshserver + - role: zsh + - role: admin-user + - role: blackmagic-desktopvideo diff --git a/spreadspace/thetys.yml b/spreadspace/thetys.yml new file mode 100644 index 00000000..fffeb769 --- /dev/null +++ b/spreadspace/thetys.yml @@ -0,0 +1,10 @@ +--- +- name: Basic Setup + hosts: thetys + roles: + - role: base + - role: sshserver + - role: zsh + - role: admin-user + - role: blackmagic-desktopvideo + - role: spreadspace-apt-repo diff --git a/vm-install.sh b/vm-install.sh index 933992cb..e8893efa 100755 --- a/vm-install.sh +++ b/vm-install.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then - echo "$0 " + echo "$0 " exit 1 fi name=$1 @@ -24,4 +24,4 @@ echo "########## clearing old ssh host keys #########" echo "" echo "######## running the install playbook ########" -exec ansible-playbook -e "vmname=$name" -e "vmdistro=$distro" -e "vmdistcodename=$codename" $@ "$env_group/vm-install.yml" +exec ansible-playbook -e "hostname=$name" -e "install_distro=$distro" -e "install_codename=$codename" -e "hostenv=$env_group" $@ "$env_group/vm-install.yml" -- cgit v1.2.3 From d131f5240dd124c2ea747ec7665e28e2daafb012 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 9 Dec 2018 01:50:05 +0100 Subject: vm installation works now again --- inventory/group_vars/all/main.yml | 4 +- inventory/group_vars/kvmhosts/main.yml | 3 + inventory/hosts.ini | 8 +- roles/preseed/tasks/main.yml | 2 +- roles/sshserver/tasks/main.yml | 2 +- roles/vm/install/tasks/main.yml | 2 +- roles/vm/install/templates/libvirt-domain.xml.j2 | 2 +- .../install/templates/preseed_ubuntu-bionic.cfg.j2 | 122 --------------------- run-host-playbook.sh | 16 +++ 9 files changed, 27 insertions(+), 134 deletions(-) create mode 100644 inventory/group_vars/kvmhosts/main.yml delete mode 100644 roles/vm/install/templates/preseed_ubuntu-bionic.cfg.j2 create mode 100755 run-host-playbook.sh (limited to 'inventory') diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml index d23e3952..4bb6c76c 100644 --- a/inventory/group_vars/all/main.yml +++ b/inventory/group_vars/all/main.yml @@ -1,5 +1,5 @@ --- -sshserver_root_keys: "{{ ssh_keys.equinox[env_group] | join('\n') }}" +ssh_keys_root: "{{ ssh_keys.equinox[env_group] }}" equinox_user: name: equinox @@ -11,7 +11,7 @@ ssh_keys: equinox: chaos-at-home: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDL8afqxWieebpxezBuLj2CIx/iAuTY9ziJt8JCJE0qYh+B2wXe9e+sPaKwz5yyS0X0MoEPHbYuVytxGQfGhdVR57gWWTYq5MBBFEqmu5MexAFKlNxad4TNQQwhs7rnI+lptKJO+rqeG/vaQBgao+61ZVwRR5Zr1zsXEoo5m4VB8VPo3TW0nSb97LdMyUmb1TaqDKJ5hrtrV6YcokXzE8FwHMK15oJsuJC7YUReijol3hGsRVw1H5S1zu4uDz7G32dPVxoLOPgupnf0SxnXdNVfNU50MHHSK68HzBXz4/rE1YLacRPloOhO7xegkWd5KGa09opEbUGzGu/lSXgHuAJpPgloy14cehDhLJ7F7SbXK4QBBtVgV+1CYXG2eJsRHIdkWiTWLuG+QZ4oEFLjQBjWpUYsEiDt9FEtSVCtKH2vBk26ps5yIoSCtYq6POvg9miGgcpQA6HHwh5ekVUaKRGWuMdAIvjvQSlCsFjYkxD1NpCgU1RhyWWTI3xTSKzTxcXiCWWZoBDJVoW46EpSvySsOpxL/hLxJwMR8ouc6cPRZZl3m51824Rv3LdEXNBmn3vnojzIvrOed3sxpD0+7+tbA4J1uTbAxtkOMhK94WXKiUAOD7e5bJYdzajvDD2T9tkj/Mqdo8z3iR2/yjkGMEAeWWVOQEh7QhQS7OFEAKK4fw== equinox@chaos-at-home.org - elevate: + dan: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwjCMiwyz7f0b1b6S5RjGbYXjd+hkTVsNzZ9xIkqqvdF8zCU6qZTqkhem13m6E1aPjALl0iyrmpb8N2pmASD7axUaTMTDd2tktkB3LULBbQCCApMnw5viZc9fm9dLBdbdiYyRtNrpk/b39V+9uViAbRtATBrYS5vV/14gT42WxPhpFiCz6A5JsKpmbBafS9vfexnqLTvKBtYLt+zhuS9eFovMHM5k7Qq4mRdKe+wdMBDeRls2z2G/ZjPrfHAkw2WctFUdSY+YAVzLB0SddVWnbOSZ19tsnzskyHpDD49LWb7wYl0OJ9fhxO02lnxW5Vdpwwwx8I7FVH83fDTQpzfSdr8tMY3F9rvCmi4noiTGDE2AAWqh73unKuydvBomNYX8HbuiJO9eTgwUIRAqsl8vHNU5rA10YF5r2SUqofrBNfINUH8x0NhpLGzNPIlazndaPY1no+XeQRQtgSU1bdDQzmySyyn5g9mlMSTU+jHfzyoK7yqlKE0W/R2ZTOEwr6+uRdFqn+mWmB0Mr20YavjVretseVs1AkmqaVClEO1juwb/CWI//Nd4uboD9zdZwkHmCjLlOmC+GkGrnLValaqQDh8iR8aKiVbaQVffl3ph1pD3BCn79KJy56YySLTbaI4lFDUHherkTdvgyMVmZJZMROzwuX7i4bi04TZ/GKTfDrw== equinox@elevate.at spreadspace: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org diff --git a/inventory/group_vars/kvmhosts/main.yml b/inventory/group_vars/kvmhosts/main.yml new file mode 100644 index 00000000..7ae104b1 --- /dev/null +++ b/inventory/group_vars/kvmhosts/main.yml @@ -0,0 +1,3 @@ +--- +preseed_path: /srv/preseed +debian_installer_path: /srv/installer diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 6b1461de..0e83ecda 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -1,8 +1,8 @@ [all:vars] host_name={{ inventory_hostname }} #ansible_host={{ host_name }}.{{ host_domain }} -#ansible_user=root -#ansible_port=22000 +ansible_user=root +ansible_port=22000 ############################### @@ -12,8 +12,6 @@ host_name={{ inventory_hostname }} host_domain=chaos-at-home.org env_group=chaos-at-home ansible_host={{ host_name }}.{{ host_domain }} -ansible_user=root -ansible_port=22000 [chaos-at-home] #prometheus @@ -28,8 +26,6 @@ keyserver host_domain=spreadspace.org env_group=spreadspace ansible_host={{ host_name }}.{{ host_domain }} -ansible_user=root -ansible_port=22000 [spreadspace] build diff --git a/roles/preseed/tasks/main.yml b/roles/preseed/tasks/main.yml index 51471c56..7406154c 100644 --- a/roles/preseed/tasks/main.yml +++ b/roles/preseed/tasks/main.yml @@ -14,7 +14,7 @@ user: root manage_dir: no path: "{{ preseed_tmpdir }}/authorized_keys" - key: "{{ ssh_users_root | user_ssh_keys(users) | join('\n') }}" + key: "{{ ssh_keys_root | join('\n') }}" - name: Inject files into initramfs shell: cpio -H newc -o | gzip -9 >> 'initrd.preseed.gz' diff --git a/roles/sshserver/tasks/main.yml b/roles/sshserver/tasks/main.yml index 6d6cc59c..cd4c5043 100644 --- a/roles/sshserver/tasks/main.yml +++ b/roles/sshserver/tasks/main.yml @@ -29,7 +29,7 @@ - name: install ssh keys for root authorized_key: user: root - key: "{{ sshserver_root_keys }}" + key: "{{ ssh_keys_root | join('\n') }}" exclusive: yes - name: delete root password diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml index b9201c01..973f44d1 100644 --- a/roles/vm/install/tasks/main.yml +++ b/roles/vm/install/tasks/main.yml @@ -39,7 +39,7 @@ - import_role: name: preseed vars: - ssh_users_root: "{{ hostvars[hostname].ssh_users_root }}" + ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}" install_interface: enp1s1 preseed_tmpdir: "{{ tmpdir.stdout }}" diff --git a/roles/vm/install/templates/libvirt-domain.xml.j2 b/roles/vm/install/templates/libvirt-domain.xml.j2 index 9119f64f..f3bdeae1 100644 --- a/roles/vm/install/templates/libvirt-domain.xml.j2 +++ b/roles/vm/install/templates/libvirt-domain.xml.j2 @@ -32,7 +32,7 @@ - /dev/urandom + /dev/random {% if 'virtio' in hostvars[hostname].install_cooked.disks %} diff --git a/roles/vm/install/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/vm/install/templates/preseed_ubuntu-bionic.cfg.j2 deleted file mode 100644 index d6fbc5d7..00000000 --- a/roles/vm/install/templates/preseed_ubuntu-bionic.cfg.j2 +++ /dev/null @@ -1,122 +0,0 @@ -######################################################################### -# spreadspace preseed file for Ubuntu bionic based VMs -######################################################################### - -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 -d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us - -d-i netcfg/disable_dhcp boolean true -d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} -d-i netcfg/disable_autoconfig boolean false -d-i netcfg/get_ipaddress string {{ hostvars[hostname].network_cooked.primary.ip }} -d-i netcfg/get_netmask string {{ hostvars[hostname].network_cooked.primary.mask }} -d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }} -d-i netcfg/confirm_static boolean true - -d-i netcfg/get_hostname string {{ hostname }} -d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }} -d-i netcfg/wireless_wep string - - -d-i mirror/country string manual -d-i mirror/http/hostname string archive.ubuntu.com -d-i mirror/http/directory string /ubuntu -d-i mirror/http/proxy string - - -d-i passwd/make-user boolean false -d-i passwd/root-login boolean true -d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand -d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand - - -d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna -d-i clock-setup/ntp boolean false - - -d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} -d-i partman-auto/method string lvm -d-i partman-auto/purge_lvm_from_device boolean true -d-i partman-auto-lvm/new_vg_name string {{ hostname }} -d-i partman-auto-lvm/guided_size string max - -d-i partman-lvm/device_remove_lvm boolean true -d-i partman-md/device_remove_md boolean true - -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true - -d-i partman-auto/expert_recipe string \ - boot-root :: \ - 1000 10000 -1 ext4 \ - $defaultignore{ } $primary{ } $bootable{ } \ - method{ lvm } vg_name{ {{ hostname }} } \ - . \ - 2048 10000 2560 ext4 \ - $lvmok{ } in_vg{ {{ hostname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ / } \ - . \ - 1024 11000 1280 ext4 \ - $lvmok{ } in_vg{ {{ hostname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /var } \ - . \ - 768 10000 768 ext4 \ - $lvmok{ } in_vg{ {{ hostname }} } \ - method{ format } format{ } \ - use_filesystem{ } filesystem{ ext4 } \ - mountpoint{ /var/log } \ - options/nodev{ nodev } options/noatime{ noatime } \ - options/noexec{ noexec } \ - . \ - 16 20000 -1 ext4 \ - $lvmok{ } in_vg{ {{ hostname }} } \ - method( keep } lv_name{ dummy } \ - . - -d-i partman-auto-lvm/no_boot boolean true -d-i partman-basicfilesystems/no_swap true -d-i partman-partitioning/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - - -d-i base-installer/install-recommends boolean false -d-i apt-setup/security_host string archive.ubuntu.com - -tasksel tasksel/first multiselect -d-i pkgsel/include string openssh-server python -d-i pkgsel/upgrade select safe-upgrade -popularity-contest popularity-contest/participate boolean false -d-i pkgsel/update-policy select none - -d-i grub-installer/choose_bootdev string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean false - -d-i finish-install/reboot_in_progress note - - -d-i preseed/late_command string \ - lvremove -f {{ hostname }}/dummy; \ - in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \ - in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "passwd -d root && passwd -l root"; \ - in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ - mkdir -p -m 0700 /target/root/.ssh; \ - cp /authorized_keys /target/root/.ssh/; \ -{% if hostvars[hostname].ansible_port is defined %} - in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[hostname].ansible_port }}/' -i /etc/ssh/sshd_config" -{% endif %} diff --git a/run-host-playbook.sh b/run-host-playbook.sh new file mode 100755 index 00000000..e3b54f22 --- /dev/null +++ b/run-host-playbook.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +if [ -z "$1" ]; then + echo "$0 " + exit 1 +fi +host="$1" +shift + +cd "${BASH_SOURCE%/*}" +source common/utils.sh +ansible_variable__get env_group "$host" || exit 1 +vault_environment__set "$env_group" || exit 1 + +echo "######## running host playbook for host '$host' in environment '$env_group' ########" +exec ansible-playbook $@ "$env_group/$host.yml" -- cgit v1.2.3