diff --git a/test/data/manifests/centos_8-aarch64-edge_commit-boot.json b/test/data/manifests/centos_8-aarch64-edge_commit-boot.json index a313ec65a..b5f9ce522 100644 --- a/test/data/manifests/centos_8-aarch64-edge_commit-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_commit-boot.json @@ -12324,6 +12324,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-aarch64-openstack-boot.json b/test/data/manifests/centos_8-aarch64-openstack-boot.json index 79af29e29..127e12310 100644 --- a/test/data/manifests/centos_8-aarch64-openstack-boot.json +++ b/test/data/manifests/centos_8-aarch64-openstack-boot.json @@ -13767,6 +13767,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json b/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json index 044b309f3..2e99503b0 100644 --- a/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json @@ -15785,6 +15785,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json b/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json index 1b6b76c47..63530e686 100644 --- a/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json @@ -17207,6 +17207,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-x86_64-edge_commit-boot.json b/test/data/manifests/centos_8-x86_64-edge_commit-boot.json index 3b08222da..feb84e06c 100644 --- a/test/data/manifests/centos_8-x86_64-edge_commit-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_commit-boot.json @@ -12726,6 +12726,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-x86_64-edge_commit_rt-boot.json b/test/data/manifests/centos_8-x86_64-edge_commit_rt-boot.json index 904e13689..880f5b3be 100644 --- a/test/data/manifests/centos_8-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_commit_rt-boot.json @@ -12676,6 +12676,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-x86_64-openstack-boot.json b/test/data/manifests/centos_8-x86_64-openstack-boot.json index abb078853..af8cd1e0c 100644 --- a/test/data/manifests/centos_8-x86_64-openstack-boot.json +++ b/test/data/manifests/centos_8-x86_64-openstack-boot.json @@ -14016,6 +14016,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json b/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json index 2868a342d..1a3eacf1e 100644 --- a/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json @@ -16026,6 +16026,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-x86_64-vhd-boot.json b/test/data/manifests/centos_8-x86_64-vhd-boot.json index 8940b37cf..c411eb1a5 100644 --- a/test/data/manifests/centos_8-x86_64-vhd-boot.json +++ b/test/data/manifests/centos_8-x86_64-vhd-boot.json @@ -13949,6 +13949,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_8-x86_64-vmdk-boot.json b/test/data/manifests/centos_8-x86_64-vmdk-boot.json index de4e59a18..65559301d 100644 --- a/test/data/manifests/centos_8-x86_64-vmdk-boot.json +++ b/test/data/manifests/centos_8-x86_64-vmdk-boot.json @@ -14017,6 +14017,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-aarch64-edge_commit-boot.json b/test/data/manifests/centos_9-aarch64-edge_commit-boot.json index dca5a2551..6b4373cab 100644 --- a/test/data/manifests/centos_9-aarch64-edge_commit-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_commit-boot.json @@ -11261,6 +11261,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-aarch64-openstack-boot.json b/test/data/manifests/centos_9-aarch64-openstack-boot.json index eb44ee044..f08a33861 100644 --- a/test/data/manifests/centos_9-aarch64-openstack-boot.json +++ b/test/data/manifests/centos_9-aarch64-openstack-boot.json @@ -12177,6 +12177,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json index 914c66067..144c2cb24 100644 --- a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json @@ -14474,6 +14474,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json b/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json index c97e918bf..96a2f8d20 100644 --- a/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json @@ -15618,6 +15618,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json b/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json index a56174da7..17b8d4e66 100644 --- a/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json @@ -16803,6 +16803,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-x86_64-edge_commit-boot.json b/test/data/manifests/centos_9-x86_64-edge_commit-boot.json index 9ef7fda85..6dcdaed99 100644 --- a/test/data/manifests/centos_9-x86_64-edge_commit-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_commit-boot.json @@ -11746,6 +11746,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-x86_64-edge_commit_rt-boot.json b/test/data/manifests/centos_9-x86_64-edge_commit_rt-boot.json index a0bf77737..f422dd0a2 100644 --- a/test/data/manifests/centos_9-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_commit_rt-boot.json @@ -12991,6 +12991,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-x86_64-openstack-boot.json b/test/data/manifests/centos_9-x86_64-openstack-boot.json index 5a23061e5..93ffaab29 100644 --- a/test/data/manifests/centos_9-x86_64-openstack-boot.json +++ b/test/data/manifests/centos_9-x86_64-openstack-boot.json @@ -12758,6 +12758,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json index 66de89283..917788bce 100644 --- a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json @@ -15067,6 +15067,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-x86_64-vhd-boot.json b/test/data/manifests/centos_9-x86_64-vhd-boot.json index a3e72b2f2..a9ea542f9 100644 --- a/test/data/manifests/centos_9-x86_64-vhd-boot.json +++ b/test/data/manifests/centos_9-x86_64-vhd-boot.json @@ -12628,6 +12628,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/centos_9-x86_64-vmdk-boot.json b/test/data/manifests/centos_9-x86_64-vmdk-boot.json index 4d721204e..2b8f9ef76 100644 --- a/test/data/manifests/centos_9-x86_64-vmdk-boot.json +++ b/test/data/manifests/centos_9-x86_64-vmdk-boot.json @@ -12759,6 +12759,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/fedora_34-aarch64-ami-boot.json b/test/data/manifests/fedora_34-aarch64-ami-boot.json index cb71c53bb..c1e116e9d 100644 --- a/test/data/manifests/fedora_34-aarch64-ami-boot.json +++ b/test/data/manifests/fedora_34-aarch64-ami-boot.json @@ -9503,6 +9503,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_34-aarch64-openstack-boot.json b/test/data/manifests/fedora_34-aarch64-openstack-boot.json index d7c5776dd..edfa5b3f2 100644 --- a/test/data/manifests/fedora_34-aarch64-openstack-boot.json +++ b/test/data/manifests/fedora_34-aarch64-openstack-boot.json @@ -9852,6 +9852,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_34-x86_64-ami-boot.json b/test/data/manifests/fedora_34-x86_64-ami-boot.json index 8c5096fb4..14f58e083 100644 --- a/test/data/manifests/fedora_34-x86_64-ami-boot.json +++ b/test/data/manifests/fedora_34-x86_64-ami-boot.json @@ -9456,6 +9456,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json index 035b91fed..c8220a99c 100644 --- a/test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json +++ b/test/data/manifests/fedora_34-x86_64-fedora_iot_commit-boot.json @@ -10976,6 +10976,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json index 412ec45cc..5919ee35c 100644 --- a/test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json +++ b/test/data/manifests/fedora_34-x86_64-fedora_iot_commit_debug-boot.json @@ -10982,6 +10982,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_34-x86_64-openstack-boot.json b/test/data/manifests/fedora_34-x86_64-openstack-boot.json index 6b8e37fbe..35033b09c 100644 --- a/test/data/manifests/fedora_34-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_34-x86_64-openstack-boot.json @@ -9805,6 +9805,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_34-x86_64-vhd-boot.json b/test/data/manifests/fedora_34-x86_64-vhd-boot.json index c18cc532a..cd7b98f38 100644 --- a/test/data/manifests/fedora_34-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_34-x86_64-vhd-boot.json @@ -8917,6 +8917,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_35-aarch64-ami-boot.json b/test/data/manifests/fedora_35-aarch64-ami-boot.json index 57dac3f52..9c2c41a73 100644 --- a/test/data/manifests/fedora_35-aarch64-ami-boot.json +++ b/test/data/manifests/fedora_35-aarch64-ami-boot.json @@ -9794,6 +9794,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_35-aarch64-openstack-boot.json b/test/data/manifests/fedora_35-aarch64-openstack-boot.json index fb604f65c..dba76bce6 100644 --- a/test/data/manifests/fedora_35-aarch64-openstack-boot.json +++ b/test/data/manifests/fedora_35-aarch64-openstack-boot.json @@ -10143,6 +10143,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_35-x86_64-ami-boot.json b/test/data/manifests/fedora_35-x86_64-ami-boot.json index c2b9ec426..ac73b20e4 100644 --- a/test/data/manifests/fedora_35-x86_64-ami-boot.json +++ b/test/data/manifests/fedora_35-x86_64-ami-boot.json @@ -9747,6 +9747,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json index 864cff0cd..4e32fa796 100644 --- a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json +++ b/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json @@ -11015,6 +11015,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json index 7fbe31d95..63f2c83bb 100644 --- a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json +++ b/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json @@ -11021,6 +11021,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_35-x86_64-openstack-boot.json b/test/data/manifests/fedora_35-x86_64-openstack-boot.json index 6bdc05da8..ff9e8442b 100644 --- a/test/data/manifests/fedora_35-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_35-x86_64-openstack-boot.json @@ -10096,6 +10096,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/fedora_35-x86_64-vhd-boot.json b/test/data/manifests/fedora_35-x86_64-vhd-boot.json index 4652b15f4..3f18ffa69 100644 --- a/test/data/manifests/fedora_35-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_35-x86_64-vhd-boot.json @@ -9174,6 +9174,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "mdns", diff --git a/test/data/manifests/rhel_8-aarch64-openstack-boot.json b/test/data/manifests/rhel_8-aarch64-openstack-boot.json index a81d0869a..e1cbfabe4 100644 --- a/test/data/manifests/rhel_8-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_8-aarch64-openstack-boot.json @@ -9212,6 +9212,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_8-aarch64-rhel_edge_commit-boot.json b/test/data/manifests/rhel_8-aarch64-rhel_edge_commit-boot.json index d6fd233b2..b2d892953 100644 --- a/test/data/manifests/rhel_8-aarch64-rhel_edge_commit-boot.json +++ b/test/data/manifests/rhel_8-aarch64-rhel_edge_commit-boot.json @@ -8263,6 +8263,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_8-x86_64-openstack-boot.json b/test/data/manifests/rhel_8-x86_64-openstack-boot.json index 8482a0aaf..faba581a8 100644 --- a/test/data/manifests/rhel_8-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_8-x86_64-openstack-boot.json @@ -9226,6 +9226,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_8-x86_64-rhel_edge_commit-boot.json b/test/data/manifests/rhel_8-x86_64-rhel_edge_commit-boot.json index 4cb7f188d..89839e085 100644 --- a/test/data/manifests/rhel_8-x86_64-rhel_edge_commit-boot.json +++ b/test/data/manifests/rhel_8-x86_64-rhel_edge_commit-boot.json @@ -8561,6 +8561,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_8-x86_64-rhel_edge_commit_rt-boot.json b/test/data/manifests/rhel_8-x86_64-rhel_edge_commit_rt-boot.json index aff7ae455..6bc524cc9 100644 --- a/test/data/manifests/rhel_8-x86_64-rhel_edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_8-x86_64-rhel_edge_commit_rt-boot.json @@ -8965,6 +8965,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_8-x86_64-vhd-boot.json b/test/data/manifests/rhel_8-x86_64-vhd-boot.json index d6ed81e43..8d01cf7ba 100644 --- a/test/data/manifests/rhel_8-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_8-x86_64-vhd-boot.json @@ -9175,6 +9175,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_8-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8-x86_64-vmdk-boot.json index f091125d9..27d52cec4 100644 --- a/test/data/manifests/rhel_8-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_8-x86_64-vmdk-boot.json @@ -8674,6 +8674,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_84-aarch64-openstack-boot.json b/test/data/manifests/rhel_84-aarch64-openstack-boot.json index 47c9a8821..a6b0f8b7c 100644 --- a/test/data/manifests/rhel_84-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_84-aarch64-openstack-boot.json @@ -9730,6 +9730,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json b/test/data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json index 91b7c4862..953a66f5d 100644 --- a/test/data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json +++ b/test/data/manifests/rhel_84-aarch64-rhel_edge_commit-boot.json @@ -8637,6 +8637,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_84-x86_64-openstack-boot.json b/test/data/manifests/rhel_84-x86_64-openstack-boot.json index 158a94d6a..46ec1d68a 100644 --- a/test/data/manifests/rhel_84-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_84-x86_64-openstack-boot.json @@ -9909,6 +9909,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json b/test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json index 72d38ddd0..31fa3b838 100644 --- a/test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json +++ b/test/data/manifests/rhel_84-x86_64-rhel_edge_commit-boot.json @@ -8935,6 +8935,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json b/test/data/manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json index b9d22f782..353b7abbb 100644 --- a/test/data/manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_84-x86_64-rhel_edge_commit_rt-boot.json @@ -9292,6 +9292,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_84-x86_64-vhd-boot.json index 13e94486b..bcfab29f9 100644 --- a/test/data/manifests/rhel_84-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_84-x86_64-vhd-boot.json @@ -9960,6 +9960,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json index db3ddcaab..a0e4108b7 100644 --- a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json @@ -9567,6 +9567,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json index f0a4c34b6..a3d1defe3 100644 --- a/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_85-aarch64-edge_commit-boot.json @@ -9064,6 +9064,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-aarch64-openstack-boot.json b/test/data/manifests/rhel_85-aarch64-openstack-boot.json index 2075b3445..23002620b 100644 --- a/test/data/manifests/rhel_85-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_85-aarch64-openstack-boot.json @@ -10229,6 +10229,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json index 776e40cb4..d5a5c21d8 100644 --- a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json @@ -12468,6 +12468,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json index d8b539561..276078324 100644 --- a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json @@ -13593,6 +13593,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json index 31fc9daad..8fcf7214a 100644 --- a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json @@ -13772,6 +13772,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-x86_64-openstack-boot.json b/test/data/manifests/rhel_85-x86_64-openstack-boot.json index 7f14c2ef7..a75f4a353 100644 --- a/test/data/manifests/rhel_85-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_85-x86_64-openstack-boot.json @@ -10439,6 +10439,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json index 216c31959..34d3cd0a2 100644 --- a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json @@ -12679,6 +12679,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-x86_64-vhd-boot.json b/test/data/manifests/rhel_85-x86_64-vhd-boot.json index e3f6dc702..6adf9821a 100644 --- a/test/data/manifests/rhel_85-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_85-x86_64-vhd-boot.json @@ -10496,6 +10496,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json b/test/data/manifests/rhel_85-x86_64-vmdk-boot.json index 83fc41891..a273cb2f3 100644 --- a/test/data/manifests/rhel_85-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_85-x86_64-vmdk-boot.json @@ -10427,6 +10427,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json index a19a0d5d5..53f5b91fc 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_commit-boot.json @@ -9070,6 +9070,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-aarch64-openstack-boot.json b/test/data/manifests/rhel_86-aarch64-openstack-boot.json index c583648a3..d4f7ca529 100644 --- a/test/data/manifests/rhel_86-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_86-aarch64-openstack-boot.json @@ -10381,6 +10381,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json index 94c0447f0..2d2c633df 100644 --- a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json @@ -12440,6 +12440,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json index 26562e311..0c230abeb 100644 --- a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json @@ -13555,6 +13555,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json index d8c3c8042..c30f152b6 100644 --- a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json @@ -13639,6 +13639,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json index 0a494c048..7fd11b691 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_commit-boot.json @@ -9367,6 +9367,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json index af9957be8..90b6ddb5e 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_commit_rt-boot.json @@ -10052,6 +10052,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-x86_64-openstack-boot.json b/test/data/manifests/rhel_86-x86_64-openstack-boot.json index 0f76b0e63..ea557c20b 100644 --- a/test/data/manifests/rhel_86-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_86-x86_64-openstack-boot.json @@ -10591,6 +10591,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json index 701e83469..cdc750284 100644 --- a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json @@ -12651,6 +12651,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-x86_64-vhd-boot.json b/test/data/manifests/rhel_86-x86_64-vhd-boot.json index 6db741cdd..7aa8a1e43 100644 --- a/test/data/manifests/rhel_86-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_86-x86_64-vhd-boot.json @@ -10544,6 +10544,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_86-x86_64-vmdk-boot.json b/test/data/manifests/rhel_86-x86_64-vmdk-boot.json index dfe4a8eeb..3c933a379 100644 --- a/test/data/manifests/rhel_86-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_86-x86_64-vmdk-boot.json @@ -10592,6 +10592,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json index 11757cbc2..7cdbcfe7e 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_commit-boot.json @@ -8211,6 +8211,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-aarch64-openstack-boot.json b/test/data/manifests/rhel_90-aarch64-openstack-boot.json index a3954ea7a..5f83a1747 100644 --- a/test/data/manifests/rhel_90-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_90-aarch64-openstack-boot.json @@ -9130,6 +9130,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json index 4dba8104c..bc9795fc7 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json @@ -11438,6 +11438,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json index 0affed026..51774653d 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json @@ -12304,6 +12304,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json index 7b9dc8e90..7ffcf36a9 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json @@ -13050,6 +13050,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json index f89e5aab5..5b40cd0c8 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_commit-boot.json @@ -8558,6 +8558,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json index eeb877e7c..fa67f192f 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_commit_rt-boot.json @@ -10464,6 +10464,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-x86_64-openstack-boot.json b/test/data/manifests/rhel_90-x86_64-openstack-boot.json index 9785d96cc..80fe9a6d3 100644 --- a/test/data/manifests/rhel_90-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_90-x86_64-openstack-boot.json @@ -9569,6 +9569,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json index 49b63cd68..4656285b3 100644 --- a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json @@ -11896,6 +11896,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-x86_64-vhd-boot.json b/test/data/manifests/rhel_90-x86_64-vhd-boot.json index e492a71ef..e419a2596 100644 --- a/test/data/manifests/rhel_90-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_90-x86_64-vhd-boot.json @@ -9479,6 +9479,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json index 0abca2a9a..9423a2b32 100644 --- a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json @@ -9570,6 +9570,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-aarch64-edge_commit-boot.json b/test/data/manifests/rhel_90_beta-aarch64-edge_commit-boot.json index 827bae9bf..416ceae55 100644 --- a/test/data/manifests/rhel_90_beta-aarch64-edge_commit-boot.json +++ b/test/data/manifests/rhel_90_beta-aarch64-edge_commit-boot.json @@ -8237,6 +8237,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-aarch64-openstack-boot.json b/test/data/manifests/rhel_90_beta-aarch64-openstack-boot.json index f7dedb27c..b7b05f6e8 100644 --- a/test/data/manifests/rhel_90_beta-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_90_beta-aarch64-openstack-boot.json @@ -9080,6 +9080,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_90_beta-aarch64-qcow2_customize-boot.json index ffbf63d6a..3e2da5b7d 100644 --- a/test/data/manifests/rhel_90_beta-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90_beta-aarch64-qcow2_customize-boot.json @@ -11399,6 +11399,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_90_beta-ppc64le-qcow2_customize-boot.json index c2d222868..4bf8a496c 100644 --- a/test/data/manifests/rhel_90_beta-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90_beta-ppc64le-qcow2_customize-boot.json @@ -12249,6 +12249,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_90_beta-s390x-qcow2_customize-boot.json index 4da0d9edb..0c72b632b 100644 --- a/test/data/manifests/rhel_90_beta-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90_beta-s390x-qcow2_customize-boot.json @@ -13014,6 +13014,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-x86_64-edge_commit-boot.json b/test/data/manifests/rhel_90_beta-x86_64-edge_commit-boot.json index eaa3fcbdc..c85993f7c 100644 --- a/test/data/manifests/rhel_90_beta-x86_64-edge_commit-boot.json +++ b/test/data/manifests/rhel_90_beta-x86_64-edge_commit-boot.json @@ -8584,6 +8584,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-x86_64-edge_commit_rt-boot.json b/test/data/manifests/rhel_90_beta-x86_64-edge_commit_rt-boot.json index 8692fb689..bfc97b3d4 100644 --- a/test/data/manifests/rhel_90_beta-x86_64-edge_commit_rt-boot.json +++ b/test/data/manifests/rhel_90_beta-x86_64-edge_commit_rt-boot.json @@ -10546,6 +10546,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-x86_64-openstack-boot.json b/test/data/manifests/rhel_90_beta-x86_64-openstack-boot.json index 8bf12853d..4ac9a04c9 100644 --- a/test/data/manifests/rhel_90_beta-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_90_beta-x86_64-openstack-boot.json @@ -9505,6 +9505,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_90_beta-x86_64-qcow2_customize-boot.json index 4586c8c18..2776f6c8c 100644 --- a/test/data/manifests/rhel_90_beta-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90_beta-x86_64-qcow2_customize-boot.json @@ -11843,6 +11843,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-x86_64-vhd-boot.json b/test/data/manifests/rhel_90_beta-x86_64-vhd-boot.json index ad09f34d9..3c82b500f 100644 --- a/test/data/manifests/rhel_90_beta-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_90_beta-x86_64-vhd-boot.json @@ -9415,6 +9415,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/test/data/manifests/rhel_90_beta-x86_64-vmdk-boot.json b/test/data/manifests/rhel_90_beta-x86_64-vmdk-boot.json index 7a05e074f..357021fa8 100644 --- a/test/data/manifests/rhel_90_beta-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_90_beta-x86_64-vmdk-boot.json @@ -9079,6 +9079,7 @@ } } }, + "firewall-default-zone": "public", "firewall-enabled": [ "ssh", "dhcpv6-client", diff --git a/tools/image-info b/tools/image-info index acc47ad3c..e071fdfc5 100755 --- a/tools/image-info +++ b/tools/image-info @@ -554,6 +554,24 @@ def read_default_target(tree): return subprocess_check_output(["systemctl", f"--root={tree}", "get-default"]).rstrip() +def read_firewall_default_zone(tree): + """ + Read the name of the default firewall zone + + Returns: a string with the zone name. If the firewall configuration doesn't + exist, an empty string is returned. + + An example return value: + "trusted" + """ + try: + with open(f"{tree}/etc/firewalld/firewalld.conf") as f: + conf = parse_environment_vars(f.read()) + return conf["DefaultZone"] + except FileNotFoundError: + return "" + + def read_firewall_zone(tree): """ Read enabled services from the configuration of the default firewall zone. @@ -568,11 +586,8 @@ def read_firewall_zone(tree): "cockpit" ] """ - try: - with open(f"{tree}/etc/firewalld/firewalld.conf") as f: - conf = parse_environment_vars(f.read()) - default = conf["DefaultZone"] - except FileNotFoundError: + default = read_firewall_default_zone(tree) + if default == "": default = "public" r = [] @@ -2273,6 +2288,10 @@ def append_filesystem(report, tree, *, is_ostree=False): with contextlib.suppress(FileNotFoundError): report["firewall-enabled"] = read_firewall_zone(tree) + firewall_default_zone = read_firewall_default_zone(tree) + if firewall_default_zone: + report["firewall-default-zone"] = firewall_default_zone + fstab = read_fstab(tree) if fstab: report["fstab"] = fstab