vmhost-x86-copr01/02/03: stop removing nftables

These hosts are rhel10 now and removing nftables takes out the entire
libvirt stack as it doesn't support iptables anymore.

This results in base removing libvirt and the hypervisor role
re-installing it every playbook run. It also means the network doesn't
work on guests at all.

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

inventory/group_vars/copr_hypervisor

@@ -17,6 +17,7 @@ ipa_host_group_desc: Copr hypervisors
 postfix_group: vpn
 primary_auth_source: ipa
 
+nbde: true
 nbde_device: /dev/md2
 nbde_client_bindings:
   - device: "{{ nbde_device }}"

inventory/host_vars/vmhost-p09-copr01.rdu3.fedoraproject.org

@@ -8,6 +8,7 @@ br0_ipv6_nm: 64
 datacenter: rdu3
 has_ipv4: yes
 has_ipv6: yes
+nbde: false
 mac0: "08:94:ef:81:d0:aa"
 mac1: "08:94:ef:81:d0:ab"
 mac2: "b8:ce:f6:c6:00:c6"

inventory/host_vars/vmhost-p09-copr02.rdu3.fedoraproject.org

@@ -21,7 +21,6 @@ mac6: ac:1f:6b:a5:4e:f4
 mac7: ac:1f:6b:a5:4e:f5
 mac8: ac:1f:6b:a5:4e:f6
 mac9: ac:1f:6b:a5:4e:f7
-nbde: true
 libvirt_host: "[{{ br0_ipv6_ip }}]"
 libvirt_pool: vmhost_p09_02
 libvirt_pool_order_id: 0

inventory/host_vars/vmhost-p09-copr03.rdu3.fedoraproject.org

@@ -21,7 +21,6 @@ mac6: ac:1f:6b:8a:9a:30
 mac7: ac:1f:6b:8a:9a:31
 mac8: ac:1f:6b:8a:9a:32
 mac9: ac:1f:6b:8a:9a:33
-nbde: true
 libvirt_host: "[{{ br0_ipv6_ip }}]"
 libvirt_pool: vmhost_p09_03
 libvirt_pool_order_id: 1

inventory/host_vars/vmhost-p09-copr04.rdu3.fedoraproject.org

@@ -21,7 +21,6 @@ mac6: ac:1f:6b:a4:e3:b0
 mac7: ac:1f:6b:a4:e3:b1
 mac8: ac:1f:6b:a4:e3:b2
 mac9: ac:1f:6b:a4:e3:b3
-nbde: true
 libvirt_host: "[{{ br0_ipv6_ip }}]"
 libvirt_pool: vmhost_p09_04
 libvirt_pool_order_id: 2

inventory/host_vars/vmhost-x86-copr01.rdu3.fedoraproject.org

@@ -22,7 +22,6 @@ mac8: f4:02:70:d3:15:95
 libvirt_pool: copr_hv_x86_64_01
 libvirt_pool_order_id: 7
 libvirt_arch: x86_64
-nftables: false
 network_connections:
    # Bridge profile
    - name: br0

inventory/host_vars/vmhost-x86-copr02.rdu3.fedoraproject.org

@@ -21,7 +21,6 @@ mac7: b4:96:91:63:3b:9f
 libvirt_pool: copr_hv_x86_64_02
 libvirt_pool_order_id: 8
 libvirt_arch: x86_64
-nftables: false
 network_connections:
    # Bridge profile
    - name: br0

inventory/host_vars/vmhost-x86-copr03.rdu3.fedoraproject.org

@@ -21,7 +21,6 @@ mac7: "b4:96:91:63:3b:53"
 libvirt_pool: copr_hv_x86_64_03
 libvirt_pool_order_id: 9
 libvirt_arch: x86_64
-nftables: false
 network_connections:
    # Bridge profile
    - name: br0

roles/openshift-apps/blockerbugs/templates/buildconfig.yml.j2

@@ -15,7 +15,7 @@ spec:
     git:
       uri: https://forge.fedoraproject.org/quality/blockerbugs
 {% if env == 'staging' %}
-      ref: "develop"
+      ref: "staging"
 {% else %}
       ref: "master"
 {% endif %}

roles/openshift-apps/testdays/templates/buildconfig.yml.j2

@@ -15,7 +15,7 @@ spec:
     git:
       uri: https://forge.fedoraproject.org/quality/testdays-web.git
 {% if env == 'staging' %}
-      ref: "develop"
+      ref: "staging"
 {% else %}
       ref: "master"
 {% endif %}