ibiblio: move all hosts over to linux system roles and new ipv6 addresses

ibiblio is moving it's ipv6 network and wants us to move our machines.
The last commit did this, but these machines aren't using linux sytem
roles, so it wouldn't change anything unless we reinstalled them.
So, lets move them over and then run playbooks to reconfigure.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

inventory/host_vars/download-ib01.fedoraproject.org

@@ -1,16 +1,13 @@
 ---
-nm: 255.255.255.128
-gw: 152.19.134.129
-dns: 8.8.8.8
-
 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
 ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
 
 vmhost: ibiblio01.fedoraproject.org
 volgroup: /dev/vg_guests
 
-eth0_ip: 152.19.134.145
+eth0_ipv4: 152.19.134.145
-eth0_nm: 255.255.255.128
+eth0_ipv4_nm: 255.255.255.128
+eth0_ipv4_gw: 152.19.134.129
 has_ipv6: yes
 eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed6"
 eth0_ipv6_nm: 104
@@ -32,3 +29,30 @@ lvm_size: 20000
 num_cpus: 8
 
 public_hostname: download-ib01.fedoraproject.org
+
+dns1: 152.2.21.1
+dns2: 152.2.253.100
+
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
+
+network_connections:
+  - name: eth0
+    mac: "{{ ansible_default_ipv4.macaddress }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address:
+      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+      - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
+      dns:
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      - 2001:4860:4860::8888
+      dns_search:
+      - "{{ dns_search1 }}"
+      - "{{ dns_search2 }}"
+      dhcp4: no
+      auto6: no

inventory/host_vars/ibiblio01.fedoraproject.org

@@ -8,8 +8,9 @@ dns: 8.8.8.8
 br0_ip: 152.19.134.138
 br0_nm: 255.255.255.128
 has_ipv6: yes
-br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe01"
+br0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fe01"
-br0_ipv6_gw: "2610:28:3090:3001::1"
+br0_ipv6_nm: 104
+br0_ipv6_gw: "2600:2701:4000:5211::1"
 
 postfix_group: vpn
 vpn: true

inventory/host_vars/ibiblio05.fedoraproject.org

@@ -8,8 +8,9 @@ dns: 152.2.21.1
 br0_ip: 152.19.134.137
 br0_nm: 255.255.255.128
 has_ipv6: yes
-br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe05"
+br0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fe05/104"
-br0_ipv6_gw: "2610:28:3090:3001::1"
+br0_ipv6_nm: 104
+br0_ipv6_gw: "2600:2701:4000:5211::1"
 
 postfix_group: vpn
 vpn: true

inventory/host_vars/noc02.fedoraproject.org

@@ -1,12 +1,10 @@
 ---
-nm: 255.255.255.128
+eth0_ipv4_nm: 255.255.255.128
-gw: 152.19.134.129
+eth0_ipv4_gw: 152.19.134.129
-dns: 152.2.21.1
 ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext
 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/
 volgroup: /dev/vg_guests
-eth0_ip: 152.19.134.192
+eth0_ipv4: 152.19.134.192
-eth0_nm: 255.255.255.128
 has_ipv6: yes
 eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed9"
 eth0_ipv6_nm: 104
@@ -15,6 +13,32 @@ postfix_maincf: "postfix/main.cf/main.cf.noc02.fedoraproject.org"
 postfix_mastercf: "postfix/master.cf/master.cf.noc02.fedoraproject.org"
 postfix_transport_filename: transports.noc02.fedoraproject.org
 
+dns1: 152.2.21.1
+dns2: 152.2.253.100
+
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
+
+network_connections:
+  - name: eth0
+    mac: "{{ ansible_default_ipv4.macaddress }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address:
+      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+      - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
+      dns:
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      - 2001:4860:4860::8888
+      dns_search:
+      - "{{ dns_search1 }}"
+      - "{{ dns_search2 }}"
+      dhcp4: no
+      auto6: no
 
 vmhost: ibiblio01.fedoraproject.org
 datacenter: ibiblio

inventory/host_vars/ns02.fedoraproject.org

@@ -1,12 +1,10 @@
 ---
-nm: 255.255.255.128
+eth0_ipv4_nm: 255.255.255.128
-gw: 152.19.134.129
+eth0_ipv4_gw: 152.19.134.129
-dns: 8.8.8.8
 
 volgroup: /dev/vg_guests
 
 eth0_ip: 152.19.134.139
-eth0_nm: 255.255.255.128
 has_ipv6: yes
 eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed7"
 eth0_ipv6_nm: 104
@@ -21,6 +19,32 @@ datacenter: ibiblio
 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
 ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
 
+dns1: 152.2.21.1
+dns2: 152.2.253.100
+
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
+
+network_connections:
+  - name: eth0
+    mac: "{{ ansible_default_ipv4.macaddress }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address:
+      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+      - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
+      dns:
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      - 2001:4860:4860::8888
+      dns_search:
+      - "{{ dns_search1 }}"
+      - "{{ dns_search2 }}"
+      dhcp4: no
+      auto6: no
 
 csi_relationship: |
 

inventory/host_vars/people02.fedoraproject.org

@@ -2,12 +2,10 @@
 freezes: false
 #host_backup_targets: ['/srv/web']
 
-nm: 255.255.255.128
-gw: 152.19.134.129
-dns: 8.8.8.8
 volgroup: /dev/vg_guests
 eth0_ip: 152.19.134.199
-eth0_nm: 255.255.255.128
+eth0_ipv4_nm: 255.255.255.128
+eth0_ipv4_gw: 152.19.134.129
 has_ipv6: yes
 eth0_ipv6: "2600:2701:4000:5211:dead:beef:00a7:9474"
 eth0_ipv6_nm: 104
@@ -40,3 +38,30 @@ ssh_hostnames:
 sar_script: "/usr/bin/tree /home/fedora/$SAR_USERNAME -DFgXfpsu --timefmt %Y-%m-%dT%H:%M:%SZ"
 sar_script_user: "root"
 sar_output_file: "fedora_people.xml"
+
+dns1: 152.2.21.1
+dns2: 152.2.253.100
+
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
+
+network_connections:
+  - name: eth0
+    mac: "{{ ansible_default_ipv4.macaddress }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address:
+      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+      - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
+      dns:
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      - 2001:4860:4860::8888
+      dns_search:
+      - "{{ dns_search1 }}"
+      - "{{ dns_search2 }}"
+      dhcp4: no
+      auto6: no

inventory/host_vars/proxy04.fedoraproject.org

@@ -16,8 +16,8 @@ num_cpus: 8
 ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
 ks_repo: http://38.145.60.16/pub/fedora/linux/releases/34/Server/x86_64/os/
 
-dns1: 8.8.8.8
+dns1: 152.2.21.1
-dns2: 8.8.4.4
+dns2: 152.2.153.100
 
 dns_search1: "vpn.fedoraproject.org"
 dns_search2: "fedoraproject.org"

inventory/host_vars/proxy12.fedoraproject.org

@@ -16,8 +16,8 @@ num_cpus: 8
 ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
 ks_repo: http://38.145.60.16/pub/fedora/linux/releases/34/Server/x86_64/os/
 
-dns1: 8.8.8.8
+dns1: 152.2.21.1
-dns2: 8.8.4.4
+dns2: 152.2.153.100
 
 dns_search1: "vpn.fedoraproject.org"
 dns_search2: "fedoraproject.org"

inventory/host_vars/smtp-mm-ib01.fedoraproject.org

@@ -1,10 +1,8 @@
 ---
-nm: 255.255.255.128
-gw: 152.19.134.129
-dns: 152.2.21.1 152.2.253.100
 volgroup: /dev/vg_guests
 eth0_ip: 152.19.134.143
-eth0_nm: 255.255.255.128
+eth0_ipv4_nm: 255.255.255.128
+eth0_ipv4_gw: 152.19.134.129
 has_ipv6: yes
 eth0_ipv6: "2600:2701:4000:5211:dead:beef:0058:5c17"
 eth0_ipv6_nm: 104
@@ -14,3 +12,30 @@ vmhost: ibiblio05.fedoraproject.org
 datacenter: ibiblio
 ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
 ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
+
+dns1: 152.2.21.1
+dns2: 152.2.253.100
+
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
+
+network_connections:
+  - name: eth0
+    mac: "{{ ansible_default_ipv4.macaddress }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address:
+      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+      - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
+      dns:
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      - 2001:4860:4860::8888
+      dns_search:
+      - "{{ dns_search1 }}"
+      - "{{ dns_search2 }}"
+      dhcp4: no
+      auto6: no

inventory/host_vars/torrent02.fedoraproject.org

@@ -1,12 +1,9 @@
 ---
-nm: 255.255.255.128
-gw: 152.19.134.129
-dns: 8.8.8.8
-
 volgroup: /dev/vg_guests
 
 eth0_ip: 152.19.134.148
-eth0_nm: 255.255.255.128
+eth0_ipv4_nm: 255.255.255.128
+eth0_ipv4_gw: 152.19.134.129
 has_ipv6: yes
 eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed7"
 eth0_ipv6_nm: 104
@@ -33,3 +30,31 @@ csi_relationship: |
 
     * Things that rely on this host:
     - if this host is down, Fedora will lose a release distribution channel
+
+dns1: 152.2.21.1
+dns2: 152.2.253.100
+
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
+
+network_connections:
+  - name: eth0
+    mac: "{{ ansible_default_ipv4.macaddress }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address:
+      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+      - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
+      dns:
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      - 2001:4860:4860::8888
+      dns_search:
+      - "{{ dns_search1 }}"
+      - "{{ dns_search2 }}"
+      dhcp4: no
+      auto6: no
+

inventory/host_vars/unbound-ib01.fedoraproject.org

@@ -1,12 +1,10 @@
 ---
-nm: 255.255.255.128
-gw: 152.19.134.129
-dns: 152.2.21.1
 ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext
 ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/
 volgroup: /dev/vg_guests
 eth0_ip: 152.19.134.150
-eth0_nm: 255.255.255.128
+eth0_ipv4_nm: 255.255.255.128
+eth0_ipv4_gw: 152.19.134.129
 has_ipv6: yes
 eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed1"
 eth0_ipv6_nm: 104
@@ -15,3 +13,31 @@ vmhost: ibiblio05.fedoraproject.org
 datacenter: ibiblio
 postfix_group: vpn
 vpn: true
+
+dns1: 152.2.21.1
+dns2: 152.2.253.100
+
+dns_search1: vpn.fedoraproject.org
+dns_search2: fedoraproject.org
+
+network_connections:
+  - name: eth0
+    mac: "{{ ansible_default_ipv4.macaddress }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address:
+      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+      - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+      gateway6: "{{ eth0_ipv6_gw }}"
+      dns:
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      - 2001:4860:4860::8888
+      dns_search:
+      - "{{ dns_search1 }}"
+      - "{{ dns_search2 }}"
+      dhcp4: no
+      auto6: no
+