Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Try using network_connections for proxy02 to get it to rewrite ifcfg correctly

Browse source 
Signed-off-by: Stephen Smoogen <smooge@smoogespace.com>
This commit is contained in:
Stephen Smoogen 2021-03-31 14:25:33 -04:00
parent 8f76cd7a85
commit 68152bdfdb
2 changed files with 49 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
inventory/host_vars/cloud-noc-os01.rdu-cc.fedoraproject.org
View file

@ -26,18 +26,6 @@ mac0: 52:54:00:46:ed:ba
mac1: 52:54:00:24:8e:bc
public_hostname: cloud-noc-os01.rdu-cc.fedoraproject.org
virt_install_command: virt-install -n {{ inventory_hostname }}
--memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x
'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }} nameserver={{ dns1 }}
ip={{ eth0_ipv4 }}::{{ eth0_ipv4_gw }}:{{ eth0_ipv4_nm }}:{{ inventory_hostname }}:eth0:none
ip={{ eth1_ipv4 }}:::{{ eth1_ipv4_nm }}:{{ inventory_hostname_short }}-nfs:eth1:none'
--network bridge={{ main_bridge }},model=virtio,mac={{ mac0 }}
--network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac1 }}
--autostart --noautoconsole --watchdog default --rng /dev/random
network_connections:
- name: eth0
mac: "{{ mac0 }}"
@ -65,6 +53,18 @@ network_connections:
dhcp4: no
auto6: no
virt_install_command: virt-install -n {{ inventory_hostname }}
--memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x
'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }} nameserver={{ dns1 }}
ip={{ eth0_ipv4 }}::{{ eth0_ipv4_gw }}:{{ eth0_ipv4_nm }}:{{ inventory_hostname }}:eth0:none
ip={{ eth1_ipv4 }}:::{{ eth1_ipv4_nm }}:{{ inventory_hostname_short }}-nfs:eth1:none'
--network bridge={{ main_bridge }},model=virtio,mac={{ mac0 }}
--network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac1 }}
--autostart --noautoconsole --watchdog default --rng /dev/random
virt_install_command_two_nic: virt-install -n {{ inventory_hostname }}
--memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
@ -76,3 +76,4 @@ virt_install_command_two_nic: virt-install -n {{ inventory_hostname }}
--network bridge={{ main_bridge }},model=virtio,mac={{ mac0 }}
--network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac1 }}
--autostart --noautoconsole --watchdog default --rng /dev/random

44
inventory/host_vars/proxy02.fedoraproject.org
View file

@ -1,7 +1,4 @@
---
nm: 255.255.255.240
gw: 85.236.55.1
dns: 8.8.8.8
ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
@ -9,14 +6,45 @@ ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
vmhost: internetx01.fedoraproject.org
volgroup: /dev/vg_Server
eth0_ip: 85.236.55.6
eth0_nm: 255.255.255.240
has_ipv6: true
eth0_ipv6: "2001:4178:2:1269::fed2"
eth0_ipv6_gw: "2001:4178:2:1269::1"
dns: 8.8.8.8
dns1: 8.8.8.8
dns2: 8.8.4.4
has_ipv4: yes
eth0_ipv4: 85.236.55.6
eth0_ipv4_nm: 28
eth0_ipv4_gw: 85.236.55.1
has_ipv6: true
eth0_ipv6: "2001:4178:2:1269::fed2"
eth0_ipv6_nm: 64
eth0_ipv6_gw: "2001:4178:2:1269::1"
mac0: 52:54:00:8c:7c:1b
public_hostname: proxy02.fedoraproject.org
network_connections:
- name: eth0
state: up
type: bridge
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:
- fedoraproject.org
- vpn.fedoraproject.org
dhcp4: no
auto6: no
# This is consumed by the roles/fedora-web/main role
sponsor: internetx
datacenter: internetx