From a94f0dce62417b30217b09d834ab5b9b09b4952f Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sun, 9 Sep 2018 22:46:57 +0000 Subject: [PATCH] recent changes --- group_vars/accounting_vdesks/netif.yml | 6 ++++-- group_vars/accounting_vdesks/users.yml | 8 +------ group_vars/accounting_vdesks/virt.yml | 2 ++ group_vars/all/users.yml | 7 +------ group_vars/virt_hosts/netif.yml | 5 ----- .../root/.local/share/fish/fish_history | 8 ------- host_vars/tg-accounting-feripent/netif.yml | 21 ------------------- .../tg-accounting-feripent/ssh_host_key.yml | 1 - host_vars/tg-accounting-feripent/staging.yml | 1 - host_vars/tg-accounting-feripent/virt.yml | 21 ------------------- host_vars/tg-srv-0/netif.yml | 16 ++++++++++++++ host_vars/tg-srv-2/host.yml | 1 - host_vars/tg-srv-2/netif.yml | 14 ------------- host_vars/tg-srv-2/staging.yml | 1 - inventory | 4 ++-- roles | 1 - accounting_vdesks.yml => vdesks.yml | 17 ++++++++++----- virt_hosts.yml | 15 ------------- 18 files changed, 38 insertions(+), 111 deletions(-) delete mode 100644 group_vars/virt_hosts/netif.yml delete mode 100644 host_files/tg-accounting-feripent/root/.local/share/fish/fish_history delete mode 100644 host_vars/tg-accounting-feripent/netif.yml delete mode 100644 host_vars/tg-accounting-feripent/ssh_host_key.yml delete mode 100644 host_vars/tg-accounting-feripent/staging.yml delete mode 100644 host_vars/tg-accounting-feripent/virt.yml create mode 100644 host_vars/tg-srv-0/netif.yml delete mode 100644 host_vars/tg-srv-2/host.yml delete mode 100644 host_vars/tg-srv-2/netif.yml delete mode 100644 host_vars/tg-srv-2/staging.yml delete mode 120000 roles rename accounting_vdesks.yml => vdesks.yml (70%) delete mode 100644 virt_hosts.yml diff --git a/group_vars/accounting_vdesks/netif.yml b/group_vars/accounting_vdesks/netif.yml index d80fb72..5452b12 100644 --- a/group_vars/accounting_vdesks/netif.yml +++ b/group_vars/accounting_vdesks/netif.yml @@ -3,7 +3,9 @@ netifs_profile: virt: networks: - tg-accounting-net - type: virt + type: virt_ptp virt_host_netif: virt dns_resolvers: - - 213.186.33.99 + - fd47:17e0:993c:c2::c:1 + - fd47:17e0:993c:c2::c:2 + - fd47:17e0:993c:c2::c:3 diff --git a/group_vars/accounting_vdesks/users.yml b/group_vars/accounting_vdesks/users.yml index 09d7cb2..c8b4496 100644 --- a/group_vars/accounting_vdesks/users.yml +++ b/group_vars/accounting_vdesks/users.yml @@ -3,11 +3,5 @@ users: uid: 4716 gid: 4716 ssh_authorized_keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILLQiFZ/RhEm09JDFD9waZiIIeuTlf1AHYonqCC3WYLQ chaotika@togusa - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFwvPnaIhyfDr1WsczFgT3SSKa7DbVMCy5uM3zGUvAk chaotika@ffmine-server - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDn/llKlfBl+G38g+09LHBheQjZr3iJAjDqiC7koD9yu chaotika@aramaki - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtwfozbvy7kBLJwsqleNxPH4wG2hMRCYdWpyLuNrKwO chaotika@astanial - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDw6aNSXoTiSZhuSAT4MH//NRQrfvdVMdk42d5Y+mhKR chaotika@hal - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo5TqkwTwAEeXlMpHu0v5eybQUpWabeCkq4rIAHOBhnFaq0KiY6BMfX66ltpWa+f2ukySAmU5TNpXRwavVzEhGPF5kSYPfUGpZE8ZzpLr4di20aKzoENmVQ8zA6FqTmnfRCoZ2xA7xOBGC+pcergsIbl/oVpjaE4MLqp6jGp2s4z9uNkZq0IOYdIk0w5PddT$ - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOC5/P9eYaHzOZGB/HE7zpjbCiYkfPFBzMvqIglFOWLe ansible-generated on tg-devops-emardely + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwdEkFBdQfY5YB6LR1l+copG7rZXlGLQyWWwhZdNkpW chaotika linger: true diff --git a/group_vars/accounting_vdesks/virt.yml b/group_vars/accounting_vdesks/virt.yml index c4e0709..ffefcdf 100644 --- a/group_vars/accounting_vdesks/virt.yml +++ b/group_vars/accounting_vdesks/virt.yml @@ -1 +1,3 @@ virt_host: tg-srv-2 +virt_memory: 4096 +virt_vcpu: 4 diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml index 7cbf1cf..adac7ab 100644 --- a/group_vars/all/users.yml +++ b/group_vars/all/users.yml @@ -1,8 +1,3 @@ root_ssh_authorized_keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILLQiFZ/RhEm09JDFD9waZiIIeuTlf1AHYonqCC3WYLQ chaotika@togusa - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFwvPnaIhyfDr1WsczFgT3SSKa7DbVMCy5uM3zGUvAk chaotika@ffmine-server - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDn/llKlfBl+G38g+09LHBheQjZr3iJAjDqiC7koD9yu chaotika@aramaki - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtwfozbvy7kBLJwsqleNxPH4wG2hMRCYdWpyLuNrKwO chaotika@astanial - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDw6aNSXoTiSZhuSAT4MH//NRQrfvdVMdk42d5Y+mhKR chaotika@hal - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo5TqkwTwAEeXlMpHu0v5eybQUpWabeCkq4rIAHOBhnFaq0KiY6BMfX66ltpWa+f2ukySAmU5TNpXRwavVzEhGPF5kSYPfUGpZE8ZzpLr4di20aKzoENmVQ8zA6FqTmnfRCoZ2xA7xOBGC+pcergsIbl/oVpjaE4MLqp6jGp2s4z9uNkZq0IOYdIk0w5PddT$ + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwdEkFBdQfY5YB6LR1l+copG7rZXlGLQyWWwhZdNkpW chaotika - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOC5/P9eYaHzOZGB/HE7zpjbCiYkfPFBzMvqIglFOWLe ansible-generated on tg-devops-emardely diff --git a/group_vars/virt_hosts/netif.yml b/group_vars/virt_hosts/netif.yml deleted file mode 100644 index a555d9c..0000000 --- a/group_vars/virt_hosts/netif.yml +++ /dev/null @@ -1,5 +0,0 @@ -netifs_profile: - virt: - networks: - - tg-accounting-net - type: virt_pointopoint diff --git a/host_files/tg-accounting-feripent/root/.local/share/fish/fish_history b/host_files/tg-accounting-feripent/root/.local/share/fish/fish_history deleted file mode 100644 index c1e528a..0000000 --- a/host_files/tg-accounting-feripent/root/.local/share/fish/fish_history +++ /dev/null @@ -1,8 +0,0 @@ -- cmd: uptime - when: 1509999241 -- cmd: ip a - when: 1509999672 -- cmd: tail -f /var/log/apt/term.log - when: 1509999678 - paths: - - /var/log/apt/term.log diff --git a/host_vars/tg-accounting-feripent/netif.yml b/host_vars/tg-accounting-feripent/netif.yml deleted file mode 100644 index c5fd3d9..0000000 --- a/host_vars/tg-accounting-feripent/netif.yml +++ /dev/null @@ -1,21 +0,0 @@ -ansible_host: fd47:17e0:993c:90:47:e1ff:feab:2463 -netifs: - virt: - device: enp1s3 - dns_resolvers: - - 213.186.33.99 - eui64: 47:e1ff:feab:2463 - id: 308728767587 - ips: - - ip: fd47:17e0:993c:90:47:e1ff:feab:2463/60 - type: eui64 - - ip: 172.23.144.2/20 - type: host - ll6: fe80::47:e1ff:feab:2463 - mac: 02:47:e1:ab:24:63 - networks: - - tg-accounting-net - type: virt - virt_host_netif: virt - virt_pci_id: 0 -ssh_ip: fd47:17e0:993c:90:47:e1ff:feab:2463 diff --git a/host_vars/tg-accounting-feripent/ssh_host_key.yml b/host_vars/tg-accounting-feripent/ssh_host_key.yml deleted file mode 100644 index 6bc0141..0000000 --- a/host_vars/tg-accounting-feripent/ssh_host_key.yml +++ /dev/null @@ -1 +0,0 @@ -ssh_host_key_ed25519_public: AAAAC3NzaC1lZDI1NTE5AAAAIIg7ic7EXHDN+S6Jj3o50zmRCwBgsHJyI5ctfmU8P+hc diff --git a/host_vars/tg-accounting-feripent/staging.yml b/host_vars/tg-accounting-feripent/staging.yml deleted file mode 100644 index 89ce00c..0000000 --- a/host_vars/tg-accounting-feripent/staging.yml +++ /dev/null @@ -1 +0,0 @@ -stage: production diff --git a/host_vars/tg-accounting-feripent/virt.yml b/host_vars/tg-accounting-feripent/virt.yml deleted file mode 100644 index 00b2039..0000000 --- a/host_vars/tg-accounting-feripent/virt.yml +++ /dev/null @@ -1,21 +0,0 @@ -boot_devices: -- /dev/vda -filesystems: -- device: /dev/vda - fstype: btrfs - mount_point: / - uuid: 4d184c9f-b62d-5dbd-a5dc-2de5394cbc13 -grub_cmdline_linux_default: quiet console=ttyS0 -grub_terminal: serial -swap_devices: -- device: /dev/vdb - uuid: 87c9b987-b235-5b55-a43c-9cb3d0b60827 -virt_disks: -- boot: true - name: root - size: 32G -- name: swap - size: 2G -virt_memory: 1024 -virt_uuid: 57752cef-5f7d-4a99-90c1-3692d3e8f272 -virt_vcpu: 1 diff --git a/host_vars/tg-srv-0/netif.yml b/host_vars/tg-srv-0/netif.yml new file mode 100644 index 0000000..52ca959 --- /dev/null +++ b/host_vars/tg-srv-0/netif.yml @@ -0,0 +1,16 @@ +ansible_host: tg-srv-0.thengo.net +netifs: + virt: + device: virt + eui64: 47:9ff:fee0:9d4 + id: 305108355540 + ips: + - ip: fd47:17e0:993c:0:47:9ff:fee0:9d4/64 + type: eui64 + - ip: 172.23.0.1/24 + type: host + ll6: fe80::47:9ff:fee0:9d4 + mac: 02:47:09:e0:09:d4 + networks: + - tg-srv-0 + type: bridge diff --git a/host_vars/tg-srv-2/host.yml b/host_vars/tg-srv-2/host.yml deleted file mode 100644 index 0a83d7a..0000000 --- a/host_vars/tg-srv-2/host.yml +++ /dev/null @@ -1 +0,0 @@ -ansible_host: tg-srv-2.thengo.net diff --git a/host_vars/tg-srv-2/netif.yml b/host_vars/tg-srv-2/netif.yml deleted file mode 100644 index 8b1c9fb..0000000 --- a/host_vars/tg-srv-2/netif.yml +++ /dev/null @@ -1,14 +0,0 @@ -netifs: - virt: - eui64: 47:7dff:fe34:cd4 - id: 307043241172 - ips: - - ip: fd47:17e0:993c:90:47:7dff:fe34:cd4/60 - type: eui64 - - ip: 172.23.144.1/20 - type: host - ll6: fe80::47:7dff:fe34:cd4 - mac: 02:47:7d:34:0c:d4 - networks: - - tg-accounting-net - type: virt_pointopoint diff --git a/host_vars/tg-srv-2/staging.yml b/host_vars/tg-srv-2/staging.yml deleted file mode 100644 index 89ce00c..0000000 --- a/host_vars/tg-srv-2/staging.yml +++ /dev/null @@ -1 +0,0 @@ -stage: production diff --git a/inventory b/inventory index bd5580b..b3146f4 100644 --- a/inventory +++ b/inventory @@ -1,5 +1,5 @@ [virt_hosts] -tg-srv-2 +tg-srv-0 -[accounting_vdesks] +[vdesks] tg-accounting-feripent diff --git a/roles b/roles deleted file mode 120000 index 8099852..0000000 --- a/roles +++ /dev/null @@ -1 +0,0 @@ -/home/chaotika/ansible-roles/ \ No newline at end of file diff --git a/accounting_vdesks.yml b/vdesks.yml similarity index 70% rename from accounting_vdesks.yml rename to vdesks.yml index 7da30ca..d7cf85a 100644 --- a/accounting_vdesks.yml +++ b/vdesks.yml @@ -1,12 +1,12 @@ --- -- hosts: accounting_vdesks +- hosts: vdesks gather_facts: false roles: - name: staging default_stage: provisioning -- hosts: accounting_vdesks:&provisioning +- hosts: vdesks:&provisioning remote_user: root gather_facts: false roles: @@ -17,22 +17,29 @@ - name: staging next_stage: staging -- hosts: accounting_vdesks +- hosts: vdesks remote_user: root roles: - role: common - role: eralitex_desktop - role: desktop_apps + - role: libreoffice - role: atom_editor - role: accounting + tasks: + - name: install packages + apt: + pkg: "{{item}}" + with_items: + - thunderbird -- hosts: accounting_vdesks:&staging +- hosts: vdesks:&staging remote_user: root roles: - name: staging next_stage: production -- hosts: accounting_vdesks:&recycling +- hosts: vdesks:&recycling remote_user: root gather_facts: false roles: diff --git a/virt_hosts.yml b/virt_hosts.yml deleted file mode 100644 index ee62702..0000000 --- a/virt_hosts.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -- hosts: virt_hosts - gather_facts: false - roles: - - name: staging - default_stage: staging - -- hosts: virt_hosts:&staging - remote_user: root - gather_facts: false - roles: - - role: netif - - name: staging - next_stage: production