浏览代码

change to kita-pro

master
父节点
当前提交
1aa528004b
共有 9 个文件被更改,包括 34 次插入76 次删除
  1. +1
    -15
      group_vars/all/ips.yml
  2. +30
    -8
      group_vars/all/networks.yml
  3. +1
    -1
      group_vars/all/site.yml
  4. +1
    -1
      group_vars/vdesks/netif.yml
  5. +0
    -23
      host_vars/tg-accounting-vdesk/netif.yml
  6. +0
    -1
      host_vars/tg-accounting-vdesk/ssh_host_key.yml
  7. +0
    -1
      host_vars/tg-accounting-vdesk/staging.yml
  8. +0
    -25
      host_vars/tg-accounting-vdesk/virt.yml
  9. +1
    -1
      inventory

+ 1
- 15
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: []

+ 30
- 8
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

+ 1
- 1
group_vars/all/site.yml 查看文件

@@ -1 +1 @@
site_name: tg-accounting
site_name: kita-pro

+ 1
- 1
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:


+ 0
- 23
host_vars/tg-accounting-vdesk/netif.yml 查看文件

@@ -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

+ 0
- 1
host_vars/tg-accounting-vdesk/ssh_host_key.yml 查看文件

@@ -1 +0,0 @@
ssh_host_key_ed25519_public: AAAAC3NzaC1lZDI1NTE5AAAAIOywzlZ2CiYoel+MW0qF8XQhZWScNMsTWyqBjZ9UCYb6

+ 0
- 1
host_vars/tg-accounting-vdesk/staging.yml 查看文件

@@ -1 +0,0 @@
stage: production

+ 0
- 25
host_vars/tg-accounting-vdesk/virt.yml 查看文件

@@ -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

+ 1
- 1
inventory 查看文件

@@ -2,4 +2,4 @@
tg-srv-0

[vdesks]
tg-accounting-vdesk
kita-pro-vdesk