From 49c0a2d1343c0c295e2f42328e7756eb0bf54480 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <ssmoogen@redhat.com>
Date: Feb 25 2021 17:45:14 +0000
Subject: FBR: Add in dhcp/bastion host for rdu-cc networks.


This should set up the bridge and controls on the new vmhosts in
RDU-CC so that we can deploy a dhcp host which will allow mgmt to be
brought up for power and similar hardware.

Signed-off-by: Stephen Smoogen <ssmoogen@redhat.com>

---

diff --git a/inventory/host_vars/cloud-noc-os01.rdu-cc.fedoraproject.org b/inventory/host_vars/cloud-noc-os01.rdu-cc.fedoraproject.org
new file mode 100644
index 0000000..fc2c77e
--- /dev/null
+++ b/inventory/host_vars/cloud-noc-os01.rdu-cc.fedoraproject.org
@@ -0,0 +1,65 @@
+---
+freezes: false
+
+datacenter: rdu-cc
+vmhost: vmhost-x64-cc05.rdu-cc.fedoraproject.org
+volgroup: /dev/vg_guests
+mem_size: 8192
+num_cpus: 4
+lvm_size: 20000
+
+
+ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-8-ext
+ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL8-x86_64/
+
+dns1: 8.8.8.8
+dns2: 8.8.4.4
+
+has_ipv4: yes
+eth0_ipv4: 8.43.85.49
+eth0_ipv4_nm: 23
+eth0_ipv4_gw: 8.43.85.254
+eth1_ipv4: 172.29.160.2
+eth1_ipv4_nm: 24
+
+mac0: 52:54:00:46:ed:ba
+mac1: 52:54:00:24:8e:bc
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address: 
+      - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+      gateway4: "{{ eth0_ipv4_gw }}"
+      dns: 
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      dns_search: 
+      - rdu-cc.fedoraproject.org
+      - fedoraproject.org
+      dhcp4: no
+      auto6: no
+  - name: eth1
+    mac: "{{ mac1 }}"
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address: 
+      - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+      dhcp4: no
+      auto6: no
+
+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 }}
+                 --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={{ dns }}
+                  ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
+                  ip={{ eth1_ip }}:::{{ 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
diff --git a/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org
index 4deb9fe..35d9e90 100644
--- a/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-cc05.rdu-cc.fedoraproject.org
@@ -15,6 +15,8 @@ has_ipv4: yes
 br0_ipv4: 8.43.85.84
 br0_ipv4_nm: 23
 br0_ipv4_gw: "{{ gw }}"
+br1_ipv4: 172.29.160.1
+br1_ipv4_nm: 24
 
 has_ipv6: yes
 br0_ipv6: "2620:52:3:1:dead:beef:cafe:f005"
@@ -27,6 +29,7 @@ mac2: "ec:f4:bb:d2:97:78"
 mac3: "ec:f4:bb:d2:97:7a"
 
 br0_port0_mac: "{{ mac0 }}"
+br1_port0_mac: "{{ mac1 }}"
 
 network_connections:
   - name: br0
@@ -54,3 +57,17 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
+  - name: br1
+    state: up
+    type: bridge
+    autoconnect: yes
+    ip:
+      address: 
+      - "{{ br1_ipv4 }}/{{ br1_ipv4_nm }}"
+      dhcp4: no
+      auto6: no
+  - name: br1-port0
+    state: up
+    type: ethernet
+    master: br1
+    mac: "{{ br1_port0_mac }}"
diff --git a/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org b/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org
index e82a83a..0280263 100644
--- a/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-cc06.rdu-cc.fedoraproject.org
@@ -15,6 +15,8 @@ has_ipv4: yes
 br0_ipv4: 8.43.85.85
 br0_ipv4_nm: 23
 br0_ipv4_gw: "{{ gw }}"
+br1_ipv4: 172.29.161.1
+br1_ipv4_nm: 24
 
 has_ipv6: yes
 br0_ipv6: "2620:52:3:1:dead:beef:cafe:f006"
@@ -27,6 +29,7 @@ mac2: "ec:f4:bb:cd:aa:a0"
 mac3: "ec:f4:bb:cd:aa:a2"
 
 br0_port0_mac: "{{ mac0 }}"
+br1_port0_mac: "{{ mac1 }}"
 
 network_connections:
   - name: br0
@@ -54,3 +57,17 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
+  - name: br1
+    state: up
+    type: bridge
+    autoconnect: yes
+    ip:
+      address: 
+      - "{{ br1_ipv4 }}/{{ br1_ipv4_nm }}"
+      dhcp4: no
+      auto6: no
+  - name: br1-port0
+    state: up
+    type: ethernet
+    master: br1
+    mac: "{{ br1_port0_mac }}"