From 1aa528004b28bffba0ed9fc546fbdf0a4066ad0f Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Mon, 10 Sep 2018 10:32:22 +0000 Subject: [PATCH] change to kita-pro --- group_vars/all/ips.yml | 16 +------- group_vars/all/networks.yml | 38 +++++++++++++++---- group_vars/all/site.yml | 2 +- group_vars/vdesks/netif.yml | 2 +- host_vars/tg-accounting-vdesk/netif.yml | 23 ----------- .../tg-accounting-vdesk/ssh_host_key.yml | 1 - host_vars/tg-accounting-vdesk/staging.yml | 1 - host_vars/tg-accounting-vdesk/virt.yml | 25 ------------ inventory | 2 +- 9 files changed, 34 insertions(+), 76 deletions(-) delete mode 100644 host_vars/tg-accounting-vdesk/netif.yml delete mode 100644 host_vars/tg-accounting-vdesk/ssh_host_key.yml delete mode 100644 host_vars/tg-accounting-vdesk/staging.yml delete mode 100644 host_vars/tg-accounting-vdesk/virt.yml diff --git a/group_vars/all/ips.yml b/group_vars/all/ips.yml index 4c0002d..cf933ed 100644 --- a/group_vars/all/ips.yml +++ b/group_vars/all/ips.yml @@ -1,15 +1 @@ -ips: -- host: tg-srv-2 - ip: 172.23.144.1 - netif: virt - network: tg-accounting-net - subnet: 172.23.144.0/20 -- host: tg-accounting-feripent - ip: 172.23.144.2 - 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 +ips: [] diff --git a/group_vars/all/networks.yml b/group_vars/all/networks.yml index 1238d1e..feb8543 100644 --- a/group_vars/all/networks.yml +++ b/group_vars/all/networks.yml @@ -1,14 +1,36 @@ networks: - tg-net: + kita-pro-net: + parent: tg-net + site: kita-pro + subnets: + - fd47:17e0:993c:30::/60 + - 172.23.48/20 + + kita-pro-service-net: + parent: tg-net + site: kita-pro + subnets: + - fd47:17e0:993c:30::/64 + - 172.23.48/24 + + kita-stjs-net: + parent: tg-net + site: kita-pro + subnets: + - fd47:17e0:993c:3d::/64 + - 172.23.61/24 + + kita-stma-net: + parent: tg-net + site: kita-pro subnets: - - fd47:17e0:993c::/48 - - 172.23/16 - - 172.24/16 + - fd47:17e0:993c:3e::/64 + - 172.23.62/24 - tg-accounting-net: + kita-stwg-net: parent: tg-net - site: tg-accounting + site: kita-pro subnets: - - fd47:17e0:993c:90::/60 - - 172.23.144/20 + - fd47:17e0:993c:3f::/64 + - 172.23.63/24 diff --git a/group_vars/all/site.yml b/group_vars/all/site.yml index 3bd799e..b790f16 100644 --- a/group_vars/all/site.yml +++ b/group_vars/all/site.yml @@ -1 +1 @@ -site_name: tg-accounting +site_name: kita-pro diff --git a/group_vars/vdesks/netif.yml b/group_vars/vdesks/netif.yml index 5452b12..5bd5ece 100644 --- a/group_vars/vdesks/netif.yml +++ b/group_vars/vdesks/netif.yml @@ -2,7 +2,7 @@ netif_primary: virt netifs_profile: virt: networks: - - tg-accounting-net + - kita-pro-service-net type: virt_ptp virt_host_netif: virt dns_resolvers: diff --git a/host_vars/tg-accounting-vdesk/netif.yml b/host_vars/tg-accounting-vdesk/netif.yml deleted file mode 100644 index 64f84be..0000000 --- a/host_vars/tg-accounting-vdesk/netif.yml +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 710a152..0000000 --- a/host_vars/tg-accounting-vdesk/ssh_host_key.yml +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 89ce00c..0000000 --- a/host_vars/tg-accounting-vdesk/staging.yml +++ /dev/null @@ -1 +0,0 @@ -stage: production diff --git a/host_vars/tg-accounting-vdesk/virt.yml b/host_vars/tg-accounting-vdesk/virt.yml deleted file mode 100644 index 34d585c..0000000 --- a/host_vars/tg-accounting-vdesk/virt.yml +++ /dev/null @@ -1,25 +0,0 @@ -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 f311303..0a00aad 100644 --- a/inventory +++ b/inventory @@ -2,4 +2,4 @@ tg-srv-0 [vdesks] -tg-accounting-vdesk +kita-pro-vdesk