diff --git a/inventory/group_vars/bodhi_backend b/inventory/group_vars/bodhi_backend index 9618c94a32..14a55a0a48 100644 --- a/inventory/group_vars/bodhi_backend +++ b/inventory/group_vars/bodhi_backend @@ -25,7 +25,6 @@ mem_size: 16384 ## XXX -- note that the fedmsg_certs declaration does not happen here, but # happens instead at the inventory/host_vars/ level s nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" -nm: 255.255.255.0 nrpe_procs_crit: 1000 # With 16 cpus, theres a bunch more kernel threads nrpe_procs_warn: 900 diff --git a/inventory/group_vars/bodhi_backend_stg b/inventory/group_vars/bodhi_backend_stg index 1e3b52c5c3..3a1bc65b8a 100644 --- a/inventory/group_vars/bodhi_backend_stg +++ b/inventory/group_vars/bodhi_backend_stg @@ -43,7 +43,6 @@ ipa_host_group: bodhi ipa_host_group_desc: Bodhi update service lvm_size: 100000 mem_size: 4096 -nm: 255.255.255.0 nrpe_procs_crit: 1000 # With 16 cpus, theres a bunch more kernel threads nrpe_procs_warn: 900 diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm index e08fc592bd..740d294478 100644 --- a/inventory/group_vars/buildvm +++ b/inventory/group_vars/buildvm @@ -11,7 +11,6 @@ csi_security_category: High dns: 10.3.163.33 docker_registry: "candidate-registry.fedoraproject.org" eth0_ipv4_gw: 10.3.169.254 -eth0_ipv4_nm: 255.255.255.0 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder @@ -26,7 +25,6 @@ ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora lvm_size: 262144 max_mem_size: "{{ mem_size }}" mem_size: 15360 -nm: 255.255.255.0 num_cpus: 6 # These variables are for koji-containerbuild/osbs osbs_url: "osbs.fedoraproject.org" diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64 index 644d64df3a..6ba3c00185 100644 --- a/inventory/group_vars/buildvm_aarch64 +++ b/inventory/group_vars/buildvm_aarch64 @@ -26,7 +26,6 @@ lvm_size: 140000 max_cpu: "{{ num_cpus }}" max_mem_size: "{{ mem_size }}" mem_size: 40960 -nm: 255.255.255.0 num_cpus: 5 # These variables are for koji-containerbuild/osbs osbs_url: "osbs.fedoraproject.org" diff --git a/inventory/group_vars/buildvm_aarch64_stg b/inventory/group_vars/buildvm_aarch64_stg index fdab70a5a1..a92270ceac 100644 --- a/inventory/group_vars/buildvm_aarch64_stg +++ b/inventory/group_vars/buildvm_aarch64_stg @@ -33,7 +33,6 @@ max_cpu: "{{ num_cpus }}" max_mem_size: "{{ mem_size }}" mem_size: 40960 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" -nm: 255.255.255.0 num_cpus: 5 # These variables are for koji-containerbuild/osbs osbs_url: "osbs.stg.fedoraproject.org" diff --git a/inventory/group_vars/buildvm_armv7 b/inventory/group_vars/buildvm_armv7 index 7919e9c9d8..2df91cd553 100644 --- a/inventory/group_vars/buildvm_armv7 +++ b/inventory/group_vars/buildvm_armv7 @@ -26,7 +26,6 @@ lvm_size: 140000 max_cpu: "{{ num_cpus }}" max_mem_size: "{{ mem_size }}" mem_size: 40960 -nm: 255.255.255.0 num_cpus: 5 # These variables are for koji-containerbuild/osbs osbs_url: "osbs.fedoraproject.org" diff --git a/inventory/group_vars/buildvm_armv7_stg b/inventory/group_vars/buildvm_armv7_stg index 0573668100..5412fba68c 100644 --- a/inventory/group_vars/buildvm_armv7_stg +++ b/inventory/group_vars/buildvm_armv7_stg @@ -33,7 +33,6 @@ max_cpu: "{{ num_cpus }}" max_mem_size: "{{ mem_size }}" mem_size: 40960 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" -nm: 255.255.255.0 num_cpus: 5 # These variables are for koji-containerbuild/osbs osbs_url: "osbs.stg.fedoraproject.org" diff --git a/inventory/group_vars/buildvm_ppc64le b/inventory/group_vars/buildvm_ppc64le index 93dc56f3d6..f3b79a5f69 100644 --- a/inventory/group_vars/buildvm_ppc64le +++ b/inventory/group_vars/buildvm_ppc64le @@ -31,7 +31,6 @@ lvm_size: 600000 main_bridge: br0 max_mem_size: 20480 mem_size: 20480 -nm: 255.255.255.0 num_cpus: 8 virt_install_command: "{{ virt_install_command_ppc64le_one_nic_unsafe }}" volgroup: /dev/vg_guests diff --git a/inventory/group_vars/buildvm_ppc64le_stg b/inventory/group_vars/buildvm_ppc64le_stg index dce6e51d06..b870d853b5 100644 --- a/inventory/group_vars/buildvm_ppc64le_stg +++ b/inventory/group_vars/buildvm_ppc64le_stg @@ -33,7 +33,6 @@ main_bridge: br0 max_mem_size: "{{ mem_size }}" mem_size: 10240 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" -nm: 255.255.255.0 num_cpus: 4 # These variables are for koji-containerbuild/osbs osbs_url: "osbs.stg.fedoraproject.org" diff --git a/inventory/group_vars/buildvm_s390x b/inventory/group_vars/buildvm_s390x index 30cfe45353..93f3c9c045 100644 --- a/inventory/group_vars/buildvm_s390x +++ b/inventory/group_vars/buildvm_s390x @@ -21,7 +21,6 @@ lvm_size: 102400 main_bridge: vmbr max_mem_size: "{{ mem_size }}" mem_size: 10240 -nm: 255.255.255.0 num_cpus: 2 varnish_group: s390kojipkgs virt_install_command: "{{ virt_install_command_s390x_one_nic }}" diff --git a/inventory/group_vars/buildvm_stg b/inventory/group_vars/buildvm_stg index 7bafbbdf6f..e54e4dadac 100644 --- a/inventory/group_vars/buildvm_stg +++ b/inventory/group_vars/buildvm_stg @@ -12,7 +12,6 @@ datacenter: staging dns1: 10.3.163.33 docker_registry: "candidate-registry.stg.fedoraproject.org" eth0_ipv4_gw: 10.3.167.254 -eth0_ipv4_nm: 255.255.255.0 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder @@ -33,7 +32,6 @@ lvm_size: 150000 max_mem_size: "{{ mem_size }}" mem_size: 10240 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4" -nm: 255.255.255.0 num_cpus: 4 # These variables are for koji-containerbuild/osbs osbs_url: "osbs.stg.fedoraproject.org" diff --git a/inventory/group_vars/rabbitmq_stg b/inventory/group_vars/rabbitmq_stg index 6a5a691d22..0ae289bb53 100644 --- a/inventory/group_vars/rabbitmq_stg +++ b/inventory/group_vars/rabbitmq_stg @@ -18,7 +18,6 @@ ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2 # Define resources for this group of hosts here. lvm_size: 20000 mem_size: 4096 -nm: 255.255.255.0 num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file diff --git a/inventory/group_vars/releng_compose b/inventory/group_vars/releng_compose index 037ae3c169..909e6c8df9 100644 --- a/inventory/group_vars/releng_compose +++ b/inventory/group_vars/releng_compose @@ -48,7 +48,6 @@ lvm_size: 100000 max_mem_size: "{{ mem_size }}" mem_size: 131072 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" -nm: 255.255.255.0 nrpe_procs_crit: 1000 # With 16 cpus, theres a bunch more kernel threads nrpe_procs_warn: 900