diff --git a/group_vars/all/ips.yml b/group_vars/all/ips.yml index a46dc52..4c0002d 100644 --- a/group_vars/all/ips.yml +++ b/group_vars/all/ips.yml @@ -9,3 +9,7 @@ ips: netif: virt network: tg-accounting-net subnet: 172.23.144.0/20 +- host: tg-accounting-vdesk + ip: 172.23.144.3 + network: tg-accounting-net + subnet: 172.23.144.0/20 diff --git a/group_vars/accounting_vdesks/netif.yml b/group_vars/vdesks/netif.yml similarity index 100% rename from group_vars/accounting_vdesks/netif.yml rename to group_vars/vdesks/netif.yml diff --git a/group_vars/accounting_vdesks/users.yml b/group_vars/vdesks/users.yml similarity index 100% rename from group_vars/accounting_vdesks/users.yml rename to group_vars/vdesks/users.yml diff --git a/group_vars/accounting_vdesks/virt.yml b/group_vars/vdesks/virt.yml similarity index 60% rename from group_vars/accounting_vdesks/virt.yml rename to group_vars/vdesks/virt.yml index ffefcdf..64c1ef9 100644 --- a/group_vars/accounting_vdesks/virt.yml +++ b/group_vars/vdesks/virt.yml @@ -1,3 +1,3 @@ -virt_host: tg-srv-2 +virt_host: tg-srv-0 virt_memory: 4096 virt_vcpu: 4 diff --git a/host_vars/tg-accounting-vdesk/netif.yml b/host_vars/tg-accounting-vdesk/netif.yml new file mode 100644 index 0000000..64f84be --- /dev/null +++ b/host_vars/tg-accounting-vdesk/netif.yml @@ -0,0 +1,23 @@ +ansible_host: fd47:17e0:993c:90:47:ebff:fe06:7a7 +netifs: + virt: + device: enp1s3 + dns_resolvers: + - fd47:17e0:993c:c2::c:1 + - fd47:17e0:993c:c2::c:2 + - fd47:17e0:993c:c2::c:3 + eui64: 47:ebff:fe06:7a7 + id: 308885718951 + ips: + - ip: fd47:17e0:993c:90:47:ebff:fe06:7a7/60 + type: eui64 + - ip: 172.23.144.3/20 + type: host + ll6: fe80::47:ebff:fe06:7a7 + mac: 02:47:eb:06:07:a7 + networks: + - tg-accounting-net + type: virt_ptp + virt_host_netif: virt + virt_pci_id: 0 +ssh_ip: fd47:17e0:993c:90:47:ebff:fe06:7a7 diff --git a/host_vars/tg-accounting-vdesk/ssh_host_key.yml b/host_vars/tg-accounting-vdesk/ssh_host_key.yml new file mode 100644 index 0000000..710a152 --- /dev/null +++ b/host_vars/tg-accounting-vdesk/ssh_host_key.yml @@ -0,0 +1 @@ +ssh_host_key_ed25519_public: AAAAC3NzaC1lZDI1NTE5AAAAIOywzlZ2CiYoel+MW0qF8XQhZWScNMsTWyqBjZ9UCYb6 diff --git a/host_vars/tg-accounting-vdesk/staging.yml b/host_vars/tg-accounting-vdesk/staging.yml new file mode 100644 index 0000000..89ce00c --- /dev/null +++ b/host_vars/tg-accounting-vdesk/staging.yml @@ -0,0 +1 @@ +stage: production diff --git a/host_vars/tg-accounting-vdesk/virt.yml b/host_vars/tg-accounting-vdesk/virt.yml new file mode 100644 index 0000000..34d585c --- /dev/null +++ b/host_vars/tg-accounting-vdesk/virt.yml @@ -0,0 +1,25 @@ +boot_devices: +- /dev/vda +filesystems: +- device: /dev/vda + fstype: ext4 + keep: true + mount_point: / +grub_cmdline_linux_default: quiet console=ttyS0 +grub_terminal: serial +swap_devices: +- device: /dev/vdb + uuid: c68b1a91-d322-50a3-9093-cd9b0e7b09fe +virt_console: serial +virt_disks: +- boot: true + name: root + size: 32G + type: qcow2 +- name: swap + size: 2G + type: raw +virt_host: tg-srv-0 +virt_memory: 1024 +virt_uuid: da8b2453-e5c6-4c3f-b0ac-3b127826c385 +virt_vcpu: 1 diff --git a/inventory b/inventory index b3146f4..f311303 100644 --- a/inventory +++ b/inventory @@ -2,4 +2,4 @@ tg-srv-0 [vdesks] -tg-accounting-feripent +tg-accounting-vdesk diff --git a/vdesks.yml b/vdesks.yml index d7cf85a..4d9d594 100644 --- a/vdesks.yml +++ b/vdesks.yml @@ -11,7 +11,6 @@ gather_facts: false roles: - role: netif - - role: virt_default_profile - role: virt_provision - role: common - name: staging