diff options
| -rw-r--r-- | dan/host_vars/sk-2019.yml | 10 | ||||
| -rw-r--r-- | dan/sk-2019.yml | 8 | ||||
| -rw-r--r-- | dan/sk-2019vm.yml | 2 | ||||
| -rw-r--r-- | dan/sk-cloudia.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/all/main.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/skillz/main.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/sk-2019.yml | 14 | ||||
| -rw-r--r-- | inventory/hosts.ini | 2 | ||||
| -rw-r--r-- | roles/cloud/install/tasks/hroot.yml | 2 | ||||
| -rw-r--r-- | roles/zfs/base/defaults/main.yml (renamed from roles/zfs/defaults/main.yml) | 0 | ||||
| -rw-r--r-- | roles/zfs/base/meta/main.yml (renamed from roles/zfs/meta/main.yml) | 0 | ||||
| -rw-r--r-- | roles/zfs/base/tasks/main.yml (renamed from roles/zfs/tasks/main.yml) | 0 |
12 files changed, 41 insertions, 3 deletions
diff --git a/dan/host_vars/sk-2019.yml b/dan/host_vars/sk-2019.yml new file mode 100644 index 00000000..10b7238c --- /dev/null +++ b/dan/host_vars/sk-2019.yml @@ -0,0 +1,10 @@ +$ANSIBLE_VAULT;1.2;AES256;dan +32333038313762663966323431303631613865306433343839363366656431653233326466386531 +6266393731356639353832656436346436383334636139300a356133346432386434396465313135 +64306665653431623930306439336535613465343464313163323138326135326234353862386533 +6566643032333631360a313963666234383262333265366631376561393138306461616233336464 +64383563303861643034653732396335643566613734306663323632313531323837343738326236 +35616131356630313161353864366361613736373465353035313431373533306436643166643863 +32396334386338626235366366313733353530333066663161313263363435356565326239653864 +63393464393261306664386631336339343139356533373732363734663539643133343061376361 +64666233656436336437343839306138393263653639376435323461323237373963 diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml new file mode 100644 index 00000000..18afd810 --- /dev/null +++ b/dan/sk-2019.yml @@ -0,0 +1,8 @@ +--- +- name: Basic Setup + hosts: sk-2019 + roles: + - role: base + - role: sshd + - role: zsh + - role: zfs/base diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml index 9824c5d5..befbedf0 100644 --- a/dan/sk-2019vm.yml +++ b/dan/sk-2019vm.yml @@ -5,5 +5,5 @@ - role: base - role: sshd - role: zsh - - role: zfs + - role: zfs/base - role: vm/host diff --git a/dan/sk-cloudia.yml b/dan/sk-cloudia.yml index dca8b9f8..b19c2f77 100644 --- a/dan/sk-cloudia.yml +++ b/dan/sk-cloudia.yml @@ -5,4 +5,4 @@ - role: base - role: sshd - role: zsh - - role: zfs + - role: zfs/base diff --git a/inventory/group_vars/all/main.yml b/inventory/group_vars/all/main.yml index 664298c8..92c20a96 100644 --- a/inventory/group_vars/all/main.yml +++ b/inventory/group_vars/all/main.yml @@ -41,3 +41,5 @@ ssh_keys: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDj7AcnQZCRihToOI7/L5YslP4bkZlZwR2dg6hV8EfQ+37z1p0imhoqc2Oz/zIEgOVARBHkn5XmfR9Bu6e3YfKpXpJXC9O3jpRSw34Xac/8qXzWZsqVAXbtzvBlYA/G4j0NQM9XIVBa1ZzBZu87xeE4KUWzO80fnQ+G3GSBp28BM4TUiSOmX9y58chPZfUp2DE80fInoXv11ikLLCBDXfMkzFCZ4Gcexhr0TYcBUgLV7ufL0xqLg4yE+Z21PLtttvVYgZIers2nWetLPoREi5yDGKeCjJVyT00X2rp6h3eFkc/VaHfb5c2MY9/4BOt+cbFCx73sG0C1SnSzWd624K/8CEoJTsX4MazLLrxwi3hIwiYX1mCCfq4+S4PpSFvMUGdMWB52PkBRXulQislCVBA/lzma93xJr1jWVFSikjkvAUt8Zt33vHMRd7RMYDfsDVIEKpUT49cBj0v7zs6IVE858J33sUZoVXaiA2sjsap8RguNtjJMSYx8+nwkQAjxwlTiV2J6pHGQHJDyeVsqGlnMpEk32ZeSs/BQ7XWPG62FT3SN6E4C/fa8dawvs7RgY0cbZkhucECBu9Zto/KakIhzLtFzgDighPmK5SlAPoNEJLJYPo5ry2SBTysc4uV7xYZSQ6OVofeQeFXKL8oPe/ZAvKafn3Zk0mQcCtH0Z8q8iQ== equinox@realraum.at datacop: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+KjkOctp2vwQxjJxwAjo2X139WrVj9Krx9cqGItj02rvbo5tSGuQ7HTfBOlB0ezZG2kLAS+kK5Gt3d2qyZo63Cn3XnfK8opGWxEbcBDbN/HrjAUjPUZG/Se5nOYBWvTKpLNe9+BG7CXpohh31u+gwZTXu1y0sXaS8Xi7z8J/v/3UtmHdrq+OuO4IakAnxgt2zGV/V7Gwga5Gkym0M3UjEYmz9ATMr49S6EeWG5/7Fpraxo6sWXK/sDCnU6vyHZxTMhQwAKzpG8wBjTj8b+ThIAu2PpliJSdi89HKD0ag0hvgYkJoZ81j6mGnNOROA6yU5r2hJXbp3BvqR5PJbXmBkP37ZHS9nYwPuRrNbB7+RKQ3Wqt1KvLCpRysu8IOyRgADtR8YNYlRhzg/cIYR0WwqGW82bbfX3MQ1EpyogyO30iZmIo7dF4Lnl46zwHQYK3rjizagjOScm3BbzswRPzeqoITJ5CBC0CMEW6/WtIc6M15R/9gkHt7Gfk9UZQBmOW+nqnDlBpaIqEZMKWUDl9jdRNTCEEq3o8wOP6CLdSBRHg7EdbEztjMOl8kEry7xxNu0o5jNpX8q9JgL82j/7pgMP5shqPcjxLFe4PwzgDdtYA83vu4GVYeukOrN/nYeMGBSMpEYzrNIz6MFtO+A2sQPBkGWd6w8REIGRbCJGcoxZw== datacop@wireloss.net + dan: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCqYaVxQQRFs4XFboiZybRRkVXc8ONsH+1Af+05COaJXetGOH/BoZH+6R4tJ5N8hF2K5gkAwk3qI4P/Z7vrgLK0AD9zAClqLqd41/CfKy40kaDc8C2oTg0lQJuaoZcNHmkFTZZOcPsf12XemOCwx016d5F03t6KRQtho3vmZZAaRbGNRESDf99RWhU8yQ9XoV0IDmXF3psooTNwpLthVMQBEjLio7bN3oe656nKmtHWz8v2vVVfD8tI4RRw8bbO1WQ7WjMg0m4Dr7ylmcej3RnplzyJA1s3Ll4F0yvmFPlEB2p4vjLCxm4kClVyBSplskA7uu65pX1zmFs81JjpHokW0X3t2myYW31fa1vLxFFpJWAAMlZnkMUB7+q2HYyJDE9Pz9LcI6tDg7PofzGa62YympJ8AXgQC4ltzKm2Zl9mHNpql8O0GjoX69g/E86sKuaxycZfJFskY4mpuuy0mcginwhotylKv52AjfuvYl0VQjGWmwWiutCjbSVrMCKmTwbwtshQ5Zv6oyv5w4vYnSgfN+SpwtVYpywdksbLYrHNvVjs8iVac/sXXKHxL4NHlPOCmgJMIXu8THRpw8rhWYgK94hmQ6St9J4jv8iZaN+4FR6gwbm65N7vzH6nCy+GH0/HykS4siLr8Hl7w93q9e6A6Of7C2RnI/tDaACh2SZuGQ== dan@dan777 diff --git a/inventory/group_vars/skillz/main.yml b/inventory/group_vars/skillz/main.yml index 05a7db24..44fe5dd3 100644 --- a/inventory/group_vars/skillz/main.yml +++ b/inventory/group_vars/skillz/main.yml @@ -1,2 +1,4 @@ --- zsh_banner: skillz + +ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan }}" diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml new file mode 100644 index 00000000..5f48bd83 --- /dev/null +++ b/inventory/host_vars/sk-2019.yml @@ -0,0 +1,14 @@ +--- +install: + cloud: + credentials: "{{ vault_hroot_robot_account }}" + server_name: 2019skillz + disks: + layout: nvme_raid + root_lvm_size: 20G + +network: {} + +zfs_zpool_name: storage +zfs_zpool_mountpoint: /srv/storage +zfs_zpool_create_vdevs: mirror nvme0n1p3 nvme1n1p3 diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 1ffcae37..e6cde03f 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -123,6 +123,7 @@ ansible_port=222 [skillz] sk2013 host_name=2013 ansible_port=22000 sk2016 host_name=2016 ansible_port=22000 +sk-2019 host_name=2019 sk-cloudia host_name=cloudia sk-2019vm host_name=2019vm sk-testvm host_name=testvm @@ -205,6 +206,7 @@ sk-testvm [hroot] sk2013 sk2016 +sk-2019 sk-cloudia sk-2019vm diff --git a/roles/cloud/install/tasks/hroot.yml b/roles/cloud/install/tasks/hroot.yml index 86f52714..3d7ba36b 100644 --- a/roles/cloud/install/tasks/hroot.yml +++ b/roles/cloud/install/tasks/hroot.yml @@ -82,7 +82,7 @@ user: "{{ install_cooked.cloud.credentials.username }}" password: "{{ install_cooked.cloud.credentials.password }}" force_basic_auth: yes - body: "type=hw" + body: "type=hw" ## type=sw -> CTRL-ALT-DEL, type=hw -> reset button status_code: 200 headers: Content-Type: "application/x-www-form-urlencoded" diff --git a/roles/zfs/defaults/main.yml b/roles/zfs/base/defaults/main.yml index 917f3d84..917f3d84 100644 --- a/roles/zfs/defaults/main.yml +++ b/roles/zfs/base/defaults/main.yml diff --git a/roles/zfs/meta/main.yml b/roles/zfs/base/meta/main.yml index 300d0ccf..300d0ccf 100644 --- a/roles/zfs/meta/main.yml +++ b/roles/zfs/base/meta/main.yml diff --git a/roles/zfs/tasks/main.yml b/roles/zfs/base/tasks/main.yml index cddfbb09..cddfbb09 100644 --- a/roles/zfs/tasks/main.yml +++ b/roles/zfs/base/tasks/main.yml |