voxpupuli · bastelfreak · Feb 21, 2023 · Feb 20, 2023
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
@@ -56,10 +56,7 @@ def pe_dir(version)
 
     BASE_CONFIG = {
       'HOSTS' => {},
-      'CONFIG' => {
-        'nfs_server' => 'none',
-        'consoleport' => 443,
-      }
+      'CONFIG' => {},
     }
 
     def base_host_config(options)

diff --git a/test/fixtures/generated/default/aix53-POWERa b/test/fixtures/generated/default/aix53-POWERa
@@ -9,7 +9,5 @@ expected_hash:
       roles:
       - agent
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/aix61-POWERu b/test/fixtures/generated/default/aix61-POWERu
@@ -10,7 +10,5 @@ expected_hash:
       - agent
       - ca
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/aix71-POWERl b/test/fixtures/generated/default/aix71-POWERl
@@ -10,7 +10,5 @@ expected_hash:
       - agent
       - classifier
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/aix72-POWERc b/test/fixtures/generated/default/aix72-POWERc
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - dashboard
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/almalinux8-64u b/test/fixtures/generated/default/almalinux8-64u
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - ca
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/amazon6-64d b/test/fixtures/generated/default/amazon6-64d
@@ -10,7 +10,5 @@ expected_hash:
       - agent
       - database
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/amazon7-64f b/test/fixtures/generated/default/amazon7-64f
@@ -10,7 +10,5 @@ expected_hash:
       - agent
       - frictionless
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/amazon7-ARM64m b/test/fixtures/generated/default/amazon7-ARM64m
@@ -10,7 +10,5 @@ expected_hash:
       - agent
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/archlinuxrolling-64a b/test/fixtures/generated/default/archlinuxrolling-64a
@@ -9,6 +9,4 @@ expected_hash:
       roles:
       - agent
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
diff --git a/test/fixtures/generated/default/archlinuxrolling-64c b/test/fixtures/generated/default/archlinuxrolling-64c
@@ -10,6 +10,4 @@ expected_hash:
       - agent
       - dashboard
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
diff --git a/test/fixtures/generated/default/archlinuxrolling-64l b/test/fixtures/generated/default/archlinuxrolling-64l
@@ -10,6 +10,4 @@ expected_hash:
       - agent
       - classifier
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
diff --git a/test/fixtures/generated/default/archlinuxrolling-64u b/test/fixtures/generated/default/archlinuxrolling-64u
@@ -10,6 +10,4 @@ expected_hash:
       - agent
       - ca
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
diff --git a/test/fixtures/generated/default/arista4-32d b/test/fixtures/generated/default/arista4-32d
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - database
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/centos4-32f b/test/fixtures/generated/default/centos4-32f
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - frictionless
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/centos4-64m b/test/fixtures/generated/default/centos4-64m
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/centos5-32aulcdfm b/test/fixtures/generated/default/centos5-32aulcdfm
@@ -16,7 +16,5 @@ expected_hash:
       - frictionless
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/centos5-64a b/test/fixtures/generated/default/centos5-64a
@@ -10,7 +10,5 @@ expected_hash:
       roles:
       - agent
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/centos6-32u b/test/fixtures/generated/default/centos6-32u
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - ca
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/centos6-64l b/test/fixtures/generated/default/centos6-64l
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - classifier
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/centos7-64c b/test/fixtures/generated/default/centos7-64c
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - dashboard
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/centos8-64aulcdfm b/test/fixtures/generated/default/centos8-64aulcdfm
@@ -16,7 +16,5 @@ expected_hash:
       - frictionless
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/cisco_ios_c2960-HWm b/test/fixtures/generated/default/cisco_ios_c2960-HWm
@@ -12,7 +12,5 @@ expected_hash:
       - agent
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_ios_c3560-HWaulcdfm b/test/fixtures/generated/default/cisco_ios_c3560-HWaulcdfm
@@ -17,7 +17,5 @@ expected_hash:
       - frictionless
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_ios_c3750-HWa b/test/fixtures/generated/default/cisco_ios_c3750-HWa
@@ -11,7 +11,5 @@ expected_hash:
       roles:
       - agent
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_ios_c4507r-HWu b/test/fixtures/generated/default/cisco_ios_c4507r-HWu
@@ -12,7 +12,5 @@ expected_hash:
       - agent
       - ca
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_ios_c4948-HWl b/test/fixtures/generated/default/cisco_ios_c4948-HWl
@@ -12,7 +12,5 @@ expected_hash:
       - agent
       - classifier
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_ios_c6503-HWc b/test/fixtures/generated/default/cisco_ios_c6503-HWc
@@ -12,7 +12,5 @@ expected_hash:
       - agent
       - dashboard
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_iosxe_c3650-HWd b/test/fixtures/generated/default/cisco_iosxe_c3650-HWd
@@ -12,7 +12,5 @@ expected_hash:
       - agent
       - database
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_iosxe_c4503-HWf b/test/fixtures/generated/default/cisco_iosxe_c4503-HWf
@@ -12,7 +12,5 @@ expected_hash:
       - agent
       - frictionless
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_n7k-HWc b/test/fixtures/generated/default/cisco_n7k-HWc
@@ -14,7 +14,5 @@ expected_hash:
       - agent
       - dashboard
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_n7k_vdc-HWd b/test/fixtures/generated/default/cisco_n7k_vdc-HWd
@@ -14,7 +14,5 @@ expected_hash:
       - agent
       - database
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_n9k-HWf b/test/fixtures/generated/default/cisco_n9k-HWf
@@ -14,7 +14,5 @@ expected_hash:
       - agent
       - frictionless
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_n9k-VMl b/test/fixtures/generated/default/cisco_n9k-VMl
@@ -15,7 +15,5 @@ expected_hash:
       - agent
       - classifier
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisco_xr_9k-VMm b/test/fixtures/generated/default/cisco_xr_9k-VMm
@@ -12,7 +12,5 @@ expected_hash:
       - agent
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/ciscon7k-64a b/test/fixtures/generated/default/ciscon7k-64a
@@ -13,7 +13,5 @@ expected_hash:
       roles:
       - agent
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisconx-64aulcdfm b/test/fixtures/generated/default/cisconx-64aulcdfm
@@ -20,7 +20,5 @@ expected_hash:
       - frictionless
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisconx-64d b/test/fixtures/generated/default/cisconx-64d
@@ -15,7 +15,5 @@ expected_hash:
       - agent
       - database
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/cisconxhw-64f b/test/fixtures/generated/default/cisconxhw-64f
@@ -14,7 +14,5 @@ expected_hash:
       - agent
       - frictionless
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cisconxhw-64u b/test/fixtures/generated/default/cisconxhw-64u
@@ -14,7 +14,5 @@ expected_hash:
       - agent
       - ca
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/cumulus25-64m b/test/fixtures/generated/default/cumulus25-64m
@@ -12,7 +12,5 @@ expected_hash:
       - agent
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/debian10-32d b/test/fixtures/generated/default/debian10-32d
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - database
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/debian10-64c b/test/fixtures/generated/default/debian10-64c
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - dashboard
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/debian11-64m b/test/fixtures/generated/default/debian11-64m
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: 
diff --git a/test/fixtures/generated/default/debian6-32aulcdfm b/test/fixtures/generated/default/debian6-32aulcdfm
@@ -16,7 +16,5 @@ expected_hash:
       - frictionless
       - master
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/debian6-64a b/test/fixtures/generated/default/debian6-64a
@@ -10,7 +10,5 @@ expected_hash:
       roles:
       - agent
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/debian7-32u b/test/fixtures/generated/default/debian7-32u
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - ca
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/debian7-64l b/test/fixtures/generated/default/debian7-64l
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - classifier
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/debian8-32c b/test/fixtures/generated/default/debian8-32c
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - dashboard
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception:
diff --git a/test/fixtures/generated/default/debian8-64d b/test/fixtures/generated/default/debian8-64d
@@ -11,7 +11,5 @@ expected_hash:
       - agent
       - database
   CONFIG:
-    nfs_server: none
-    consoleport: 443
     pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
 expected_exception: