From 7bf2ceb68f2d4dd29984f757ecd1c0892d626c51 Mon Sep 17 00:00:00 2001 From: Markus Urbanczyk Date: Fri, 14 Aug 2026 19:28:36 +0200 Subject: [PATCH 1/3] remove Upgrades header Signed-off-by: Markus Urbanczyk --- lib/puppet/provider/package/yum.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb index 27af23513b..91333a75ad 100644 --- a/lib/puppet/provider/package/yum.rb +++ b/lib/puppet/provider/package/yum.rb @@ -133,7 +133,7 @@ def self.check_updates(disablerepo, enablerepo, disableexcludes) def self.parse_updates(str) # Strip off all content that contains Obsoleting, Security: or Update body = str.partition(/^(Obsoleting|Security:|Update)/).first - + body = body.gsub(/^Upgrades.*?$/m, '') updates = Hash.new { |h, k| h[k] = [] } body.split(/^\s*\n/).each do |line| From e58b6b2e59413c469613fba6de19114a32410389 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 18 Aug 2026 13:02:10 +0200 Subject: [PATCH 2/3] CI: Delete legacy nodesets Signed-off-by: Tim Meusel --- acceptance/config/nodes/aix-53-power.yaml | 16 ---------- acceptance/config/nodes/aix-61-power.yaml | 16 ---------- acceptance/config/nodes/aix-71-power.yaml | 16 ---------- acceptance/config/nodes/gem.yaml | 30 ------------------- .../config/nodes/huaweios-6-powerpc.yaml | 15 ---------- .../config/nodes/pe/centos-5-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/centos-5-32mda | 22 -------------- .../config/nodes/pe/centos-5-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/centos-5-64mda | 22 -------------- .../config/nodes/pe/centos-6-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/centos-6-32mda | 22 -------------- .../config/nodes/pe/centos-6-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/centos-6-64mda | 22 -------------- .../config/nodes/pe/centos-6-64mda-sol-10-64a | 22 -------------- .../config/nodes/pe/debian-6-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/debian-6-32mda | 22 -------------- .../config/nodes/pe/debian-6-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/debian-6-64mda | 22 -------------- .../config/nodes/pe/debian-7-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/debian-7-32mda | 22 -------------- .../config/nodes/pe/debian-7-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/debian-7-64mda | 22 -------------- acceptance/config/nodes/pe/debian-7-i386 | 16 ---------- .../config/nodes/pe/oracle-5-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/oracle-5-32mda | 22 -------------- .../config/nodes/pe/oracle-5-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/oracle-5-64mda | 22 -------------- .../config/nodes/pe/oracle-6-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/oracle-6-32mda | 22 -------------- .../config/nodes/pe/oracle-6-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/oracle-6-64mda | 22 -------------- .../config/nodes/pe/redhat-5-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/redhat-5-32mda | 22 -------------- .../config/nodes/pe/redhat-5-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/redhat-5-64mda | 22 -------------- .../config/nodes/pe/redhat-6-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/redhat-6-32mda | 22 -------------- .../config/nodes/pe/redhat-6-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/redhat-6-64mda | 22 -------------- .../nodes/pe/scientific-5-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/scientific-5-32mda | 22 -------------- .../nodes/pe/scientific-5-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/scientific-5-64mda | 22 -------------- .../nodes/pe/scientific-6-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/scientific-6-32mda | 22 -------------- .../nodes/pe/scientific-6-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/scientific-6-64mda | 22 -------------- .../config/nodes/pe/sles-11-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/sles-11-32mda | 22 -------------- .../config/nodes/pe/sles-11-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/sles-11-64mda | 22 -------------- acceptance/config/nodes/pe/solaris-10-64a | 18 ----------- acceptance/config/nodes/pe/solaris-11-64a | 18 ----------- .../nodes/pe/ubuntu-1004-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/ubuntu-1004-32mda | 22 -------------- .../nodes/pe/ubuntu-1004-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/ubuntu-1004-64mda | 22 -------------- .../nodes/pe/ubuntu-1204-32ma-32da-32da | 28 ----------------- acceptance/config/nodes/pe/ubuntu-1204-32mda | 22 -------------- .../nodes/pe/ubuntu-1204-64ma-64da-64da | 28 ----------------- acceptance/config/nodes/pe/ubuntu-1204-64mda | 22 -------------- acceptance/config/nodes/solaris-10-sparc.yaml | 17 ----------- acceptance/config/nodes/solaris-11-sparc.yaml | 17 ----------- 63 files changed, 1501 deletions(-) delete mode 100644 acceptance/config/nodes/aix-53-power.yaml delete mode 100644 acceptance/config/nodes/aix-61-power.yaml delete mode 100644 acceptance/config/nodes/aix-71-power.yaml delete mode 100644 acceptance/config/nodes/gem.yaml delete mode 100644 acceptance/config/nodes/huaweios-6-powerpc.yaml delete mode 100644 acceptance/config/nodes/pe/centos-5-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/centos-5-32mda delete mode 100644 acceptance/config/nodes/pe/centos-5-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/centos-5-64mda delete mode 100644 acceptance/config/nodes/pe/centos-6-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/centos-6-32mda delete mode 100644 acceptance/config/nodes/pe/centos-6-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/centos-6-64mda delete mode 100644 acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a delete mode 100644 acceptance/config/nodes/pe/debian-6-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/debian-6-32mda delete mode 100644 acceptance/config/nodes/pe/debian-6-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/debian-6-64mda delete mode 100644 acceptance/config/nodes/pe/debian-7-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/debian-7-32mda delete mode 100644 acceptance/config/nodes/pe/debian-7-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/debian-7-64mda delete mode 100644 acceptance/config/nodes/pe/debian-7-i386 delete mode 100644 acceptance/config/nodes/pe/oracle-5-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/oracle-5-32mda delete mode 100644 acceptance/config/nodes/pe/oracle-5-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/oracle-5-64mda delete mode 100644 acceptance/config/nodes/pe/oracle-6-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/oracle-6-32mda delete mode 100644 acceptance/config/nodes/pe/oracle-6-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/oracle-6-64mda delete mode 100644 acceptance/config/nodes/pe/redhat-5-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/redhat-5-32mda delete mode 100644 acceptance/config/nodes/pe/redhat-5-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/redhat-5-64mda delete mode 100644 acceptance/config/nodes/pe/redhat-6-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/redhat-6-32mda delete mode 100644 acceptance/config/nodes/pe/redhat-6-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/redhat-6-64mda delete mode 100644 acceptance/config/nodes/pe/scientific-5-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/scientific-5-32mda delete mode 100644 acceptance/config/nodes/pe/scientific-5-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/scientific-5-64mda delete mode 100644 acceptance/config/nodes/pe/scientific-6-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/scientific-6-32mda delete mode 100644 acceptance/config/nodes/pe/scientific-6-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/scientific-6-64mda delete mode 100644 acceptance/config/nodes/pe/sles-11-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/sles-11-32mda delete mode 100644 acceptance/config/nodes/pe/sles-11-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/sles-11-64mda delete mode 100644 acceptance/config/nodes/pe/solaris-10-64a delete mode 100644 acceptance/config/nodes/pe/solaris-11-64a delete mode 100644 acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/ubuntu-1004-32mda delete mode 100644 acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/ubuntu-1004-64mda delete mode 100644 acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da delete mode 100644 acceptance/config/nodes/pe/ubuntu-1204-32mda delete mode 100644 acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da delete mode 100644 acceptance/config/nodes/pe/ubuntu-1204-64mda delete mode 100644 acceptance/config/nodes/solaris-10-sparc.yaml delete mode 100644 acceptance/config/nodes/solaris-11-sparc.yaml diff --git a/acceptance/config/nodes/aix-53-power.yaml b/acceptance/config/nodes/aix-53-power.yaml deleted file mode 100644 index c5b731893d..0000000000 --- a/acceptance/config/nodes/aix-53-power.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - master: - roles: - - master - platform: el-7-x86_64 - hypervisor: vmpooler - template: redhat-7-x86_64 - pe-aix-53-acceptance: - roles: - - agent - platform: aix-5.3-power - hypervisor: none - vmhostname: pe-aix-53-acceptance.delivery.puppetlabs.net -CONFIG: - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/aix-61-power.yaml b/acceptance/config/nodes/aix-61-power.yaml deleted file mode 100644 index 7fed705a78..0000000000 --- a/acceptance/config/nodes/aix-61-power.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - master: - roles: - - master - platform: el-7-x86_64 - hypervisor: vmpooler - template: redhat-7-x86_64 - pe-aix-61-acceptance: - roles: - - agent - platform: aix-6.1-power - hypervisor: none - vmhostname: pe-aix-61-acceptance.delivery.puppetlabs.net -CONFIG: - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/aix-71-power.yaml b/acceptance/config/nodes/aix-71-power.yaml deleted file mode 100644 index b1b73d3a6c..0000000000 --- a/acceptance/config/nodes/aix-71-power.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -HOSTS: - master: - roles: - - master - platform: el-7-x86_64 - hypervisor: vmpooler - template: redhat-7-x86_64 - pe-aix-71-acceptance: - roles: - - agent - platform: aix-7.1-power - hypervisor: none - vmhostname: pe-aix-71-acceptance.delivery.puppetlabs.net -CONFIG: - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/gem.yaml b/acceptance/config/nodes/gem.yaml deleted file mode 100644 index 477d99f230..0000000000 --- a/acceptance/config/nodes/gem.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -HOSTS: - win-2012r2-rubyx86: - roles: - - agent - platform: windows-2012r2-64 - ruby_arch: x86 - hypervisor: vmpooler - template: win-2012r2-x86_64 - win-2012r2-rubyx64: - roles: - - agent - platform: windows-2012r2-64 - ruby_arch: x64 - hypervisor: vmpooler - template: win-2012r2-x86_64 - osx-1010: - roles: - - agent - platform: osx-10.10-x86_64 - hypervisor: vmpooler - template: osx-1010-x86_64 - redhat-7: - roles: - - agent - platform: el-7-x86_64 - hypervisor: vmpooler - template: redhat-7-x86_64 -CONFIG: - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/huaweios-6-powerpc.yaml b/acceptance/config/nodes/huaweios-6-powerpc.yaml deleted file mode 100644 index 62a88e3e4b..0000000000 --- a/acceptance/config/nodes/huaweios-6-powerpc.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -HOSTS: - master: - roles: - - master - platform: el-7-x86_64 - hypervisor: vmpooler - template: redhat-7-x86_64 - huawei-ce6850-2-debian-vm-eth0.ops.puppetlabs.net: - roles: - - agent - platform: huaweios-6-powerpc - hypervisor: none -CONFIG: - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/pe/centos-5-32ma-32da-32da b/acceptance/config/nodes/pe/centos-5-32ma-32da-32da deleted file mode 100644 index efb3c47d02..0000000000 --- a/acceptance/config/nodes/pe/centos-5-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - centos-5-i386-master: - roles: - - master - - agent - platform: el-5-i386 - template: centos-5-i386 - hypervisor: vcloud - centos-5-i386-dashboard: - roles: - - dashboard - - agent - platform: el-5-i386 - template: centos-5-i386 - hypervisor: vcloud - centos-5-i386-database: - roles: - - database - - agent - platform: el-5-i386 - template: centos-5-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-5-32mda b/acceptance/config/nodes/pe/centos-5-32mda deleted file mode 100644 index b7c9a81e77..0000000000 --- a/acceptance/config/nodes/pe/centos-5-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - centos-5-i386: - roles: - - master - - dashboard - - database - - agent - platform: el-5-i386 - template: centos-5-i386 - hypervisor: vcloud - centos-5-i386-agent: - roles: - - agent - platform: el-5-i386 - template: centos-5-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-5-64ma-64da-64da b/acceptance/config/nodes/pe/centos-5-64ma-64da-64da deleted file mode 100644 index d1ab0463e4..0000000000 --- a/acceptance/config/nodes/pe/centos-5-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - centos-5-x86_64-master: - roles: - - master - - agent - platform: el-5-x86_64 - template: centos-5-x86_64 - hypervisor: vcloud - centos-5-x86_64-dashboard: - roles: - - dashboard - - agent - platform: el-5-x86_64 - template: centos-5-x86_64 - hypervisor: vcloud - centos-5-x86_64-database: - roles: - - database - - agent - platform: el-5-x86_64 - template: centos-5-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-5-64mda b/acceptance/config/nodes/pe/centos-5-64mda deleted file mode 100644 index 3f3552d8c1..0000000000 --- a/acceptance/config/nodes/pe/centos-5-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - centos-5-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-5-x86_64 - template: centos-5-x86_64 - hypervisor: vcloud - centos-5-x86_64-agent: - roles: - - agent - platform: el-5-x86_64 - template: centos-5-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-32ma-32da-32da b/acceptance/config/nodes/pe/centos-6-32ma-32da-32da deleted file mode 100644 index 1b0f010b8a..0000000000 --- a/acceptance/config/nodes/pe/centos-6-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - centos-6-i386-master: - roles: - - master - - agent - platform: el-6-i386 - template: centos-6-i386 - hypervisor: vcloud - centos-6-i386-dashboard: - roles: - - dashboard - - agent - platform: el-6-i386 - template: centos-6-i386 - hypervisor: vcloud - centos-6-i386-database: - roles: - - database - - agent - platform: el-6-i386 - template: centos-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-32mda b/acceptance/config/nodes/pe/centos-6-32mda deleted file mode 100644 index 2d27975636..0000000000 --- a/acceptance/config/nodes/pe/centos-6-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - centos-6-i386: - roles: - - master - - dashboard - - database - - agent - platform: el-6-i386 - template: centos-6-i386 - hypervisor: vcloud - centos-6-i386-agent: - roles: - - agent - platform: el-6-i386 - template: centos-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-64ma-64da-64da b/acceptance/config/nodes/pe/centos-6-64ma-64da-64da deleted file mode 100644 index 81aa349c68..0000000000 --- a/acceptance/config/nodes/pe/centos-6-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - centos-6-x86_64-master: - roles: - - master - - agent - platform: el-6-x86_64 - template: centos-6-x86_64 - hypervisor: vcloud - centos-6-x86_64-dashboard: - roles: - - dashboard - - agent - platform: el-6-x86_64 - template: centos-6-x86_64 - hypervisor: vcloud - centos-6-x86_64-database: - roles: - - database - - agent - platform: el-6-x86_64 - template: centos-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-64mda b/acceptance/config/nodes/pe/centos-6-64mda deleted file mode 100644 index a6647dfafc..0000000000 --- a/acceptance/config/nodes/pe/centos-6-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - centos-6-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-6-x86_64 - template: centos-6-x86_64 - hypervisor: vcloud - centos-6-x86_64-agent: - roles: - - agent - platform: el-6-x86_64 - template: centos-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a b/acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a deleted file mode 100644 index d787bc1677..0000000000 --- a/acceptance/config/nodes/pe/centos-6-64mda-sol-10-64a +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - centos-6-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-6-x86_64 - template: centos-6-x86_64 - hypervisor: vcloud - solaris-10-x86_64-agent: - roles: - - agent - platform: solaris-10-i386 - template: solaris-10-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-6-32ma-32da-32da b/acceptance/config/nodes/pe/debian-6-32ma-32da-32da deleted file mode 100644 index 6243edf912..0000000000 --- a/acceptance/config/nodes/pe/debian-6-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - debian-6-i386-master: - roles: - - master - - agent - platform: debian-6-i386 - template: debian-6-i386 - hypervisor: vcloud - debian-6-i386-dashboard: - roles: - - dashboard - - agent - platform: debian-6-i386 - template: debian-6-i386 - hypervisor: vcloud - debian-6-i386-database: - roles: - - database - - agent - platform: debian-6-i386 - template: debian-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-6-32mda b/acceptance/config/nodes/pe/debian-6-32mda deleted file mode 100644 index 0e786fc2eb..0000000000 --- a/acceptance/config/nodes/pe/debian-6-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - debian-6-i386: - roles: - - master - - dashboard - - database - - agent - platform: debian-6-i386 - template: debian-6-i386 - hypervisor: vcloud - debian-6-i386-agent: - roles: - - agent - platform: debian-6-i386 - template: debian-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-6-64ma-64da-64da b/acceptance/config/nodes/pe/debian-6-64ma-64da-64da deleted file mode 100644 index 26e49d6eea..0000000000 --- a/acceptance/config/nodes/pe/debian-6-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - debian-6-amd64-master: - roles: - - master - - agent - platform: debian-6-amd64 - template: debian-6-x86_64 - hypervisor: vcloud - debian-6-amd64-dashboard: - roles: - - dashboard - - agent - platform: debian-6-amd64 - template: debian-6-x86_64 - hypervisor: vcloud - debian-6-amd64-database: - roles: - - database - - agent - platform: debian-6-amd64 - template: debian-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-6-64mda b/acceptance/config/nodes/pe/debian-6-64mda deleted file mode 100644 index 04ec5e7bd2..0000000000 --- a/acceptance/config/nodes/pe/debian-6-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - debian-6-amd64: - roles: - - master - - dashboard - - database - - agent - platform: debian-6-amd64 - template: debian-6-x86_64 - hypervisor: vcloud - debian-6-amd64-agent: - roles: - - agent - platform: debian-6-amd64 - template: debian-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-7-32ma-32da-32da b/acceptance/config/nodes/pe/debian-7-32ma-32da-32da deleted file mode 100644 index efe5cbd012..0000000000 --- a/acceptance/config/nodes/pe/debian-7-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - debian-7-i386-master: - roles: - - master - - agent - platform: debian-7-i386 - template: debian-7-i386 - hypervisor: vcloud - debian-7-i386-dashboard: - roles: - - dashboard - - agent - platform: debian-7-i386 - template: debian-7-i386 - hypervisor: vcloud - debian-7-i386-database: - roles: - - database - - agent - platform: debian-7-i386 - template: debian-7-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-7-32mda b/acceptance/config/nodes/pe/debian-7-32mda deleted file mode 100644 index b42cc924ee..0000000000 --- a/acceptance/config/nodes/pe/debian-7-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - debian-7-i386: - roles: - - master - - dashboard - - database - - agent - platform: debian-7-i386 - template: debian-7-i386 - hypervisor: vcloud - debian-7-i386-agent: - roles: - - agent - platform: debian-7-i386 - template: debian-7-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-7-64ma-64da-64da b/acceptance/config/nodes/pe/debian-7-64ma-64da-64da deleted file mode 100644 index e30552a11a..0000000000 --- a/acceptance/config/nodes/pe/debian-7-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - debian-7-amd64-master: - roles: - - master - - agent - platform: debian-7-amd64 - template: debian-7-x86_64 - hypervisor: vcloud - debian-7-amd64-dashboard: - roles: - - dashboard - - agent - platform: debian-7-amd64 - template: debian-7-x86_64 - hypervisor: vcloud - debian-7-amd64-database: - roles: - - database - - agent - platform: debian-7-amd64 - template: debian-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-7-64mda b/acceptance/config/nodes/pe/debian-7-64mda deleted file mode 100644 index 9f2f2ca796..0000000000 --- a/acceptance/config/nodes/pe/debian-7-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - debian-7-amd64: - roles: - - master - - dashboard - - database - - agent - platform: debian-7-amd64 - template: debian-7-x86_64 - hypervisor: vcloud - debian-7-amd64-agent: - roles: - - agent - platform: debian-7-amd64 - template: debian-7-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/debian-7-i386 b/acceptance/config/nodes/pe/debian-7-i386 deleted file mode 100644 index 691739de40..0000000000 --- a/acceptance/config/nodes/pe/debian-7-i386 +++ /dev/null @@ -1,16 +0,0 @@ -HOSTS: - debian-7-i386: - roles: - - master - - dashboard - - database - - agent - platform: debian-7-i386 - template: debian-7-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-5-32ma-32da-32da b/acceptance/config/nodes/pe/oracle-5-32ma-32da-32da deleted file mode 100644 index 07d0140edd..0000000000 --- a/acceptance/config/nodes/pe/oracle-5-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - oracle-5-i386-master: - roles: - - master - - agent - platform: el-5-i386 - template: oracle-5-i386 - hypervisor: vcloud - oracle-5-i386-dashboard: - roles: - - dashboard - - agent - platform: el-5-i386 - template: oracle-5-i386 - hypervisor: vcloud - oracle-5-i386-database: - roles: - - database - - agent - platform: el-5-i386 - template: oracle-5-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-5-32mda b/acceptance/config/nodes/pe/oracle-5-32mda deleted file mode 100644 index dc5ca19eeb..0000000000 --- a/acceptance/config/nodes/pe/oracle-5-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - oracle-5-i386: - roles: - - master - - dashboard - - database - - agent - platform: el-5-i386 - template: oracle-5-i386 - hypervisor: vcloud - oracle-5-i386-agent: - roles: - - agent - platform: el-5-i386 - template: oracle-5-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-5-64ma-64da-64da b/acceptance/config/nodes/pe/oracle-5-64ma-64da-64da deleted file mode 100644 index 1007f8402b..0000000000 --- a/acceptance/config/nodes/pe/oracle-5-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - oracle-5-x86_64-master: - roles: - - master - - agent - platform: el-5-x86_64 - template: oracle-5-x86_64 - hypervisor: vcloud - oracle-5-x86_64-dashboard: - roles: - - dashboard - - agent - platform: el-5-x86_64 - template: oracle-5-x86_64 - hypervisor: vcloud - oracle-5-x86_64-database: - roles: - - database - - agent - platform: el-5-x86_64 - template: oracle-5-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-5-64mda b/acceptance/config/nodes/pe/oracle-5-64mda deleted file mode 100644 index 5db926a925..0000000000 --- a/acceptance/config/nodes/pe/oracle-5-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - oracle-5-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-5-x86_64 - template: oracle-5-x86_64 - hypervisor: vcloud - oracle-5-x86_64-agent: - roles: - - agent - platform: el-5-x86_64 - template: oracle-5-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-6-32ma-32da-32da b/acceptance/config/nodes/pe/oracle-6-32ma-32da-32da deleted file mode 100644 index 0ab5ec6f6f..0000000000 --- a/acceptance/config/nodes/pe/oracle-6-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - oracle-6-i386-master: - roles: - - master - - agent - platform: el-6-i386 - template: oracle-6-i386 - hypervisor: vcloud - oracle-6-i386-dashboard: - roles: - - dashboard - - agent - platform: el-6-i386 - template: oracle-6-i386 - hypervisor: vcloud - oracle-6-i386-database: - roles: - - database - - agent - platform: el-6-i386 - template: oracle-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-6-32mda b/acceptance/config/nodes/pe/oracle-6-32mda deleted file mode 100644 index 93e9620f78..0000000000 --- a/acceptance/config/nodes/pe/oracle-6-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - oracle-6-i386: - roles: - - master - - dashboard - - database - - agent - platform: el-6-i386 - template: oracle-6-i386 - hypervisor: vcloud - oracle-6-i386-agent: - roles: - - agent - platform: el-6-i386 - template: oracle-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-6-64ma-64da-64da b/acceptance/config/nodes/pe/oracle-6-64ma-64da-64da deleted file mode 100644 index 1c4c361327..0000000000 --- a/acceptance/config/nodes/pe/oracle-6-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - oracle-6-x86_64-master: - roles: - - master - - agent - platform: el-6-x86_64 - template: oracle-6-x86_64 - hypervisor: vcloud - oracle-6-x86_64-dashboard: - roles: - - dashboard - - agent - platform: el-6-x86_64 - template: oracle-6-x86_64 - hypervisor: vcloud - oracle-6-x86_64-database: - roles: - - database - - agent - platform: el-6-x86_64 - template: oracle-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/oracle-6-64mda b/acceptance/config/nodes/pe/oracle-6-64mda deleted file mode 100644 index 3c21a1c93d..0000000000 --- a/acceptance/config/nodes/pe/oracle-6-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - oracle-6-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-6-x86_64 - template: oracle-6-x86_64 - hypervisor: vcloud - oracle-6-x86_64-agent: - roles: - - agent - platform: el-6-x86_64 - template: oracle-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-5-32ma-32da-32da b/acceptance/config/nodes/pe/redhat-5-32ma-32da-32da deleted file mode 100644 index 946440d7e2..0000000000 --- a/acceptance/config/nodes/pe/redhat-5-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - redhat-5-i386-master: - roles: - - master - - agent - platform: el-5-i386 - template: redhat-5-i386 - hypervisor: vcloud - redhat-5-i386-dashboard: - roles: - - dashboard - - agent - platform: el-5-i386 - template: redhat-5-i386 - hypervisor: vcloud - redhat-5-i386-database: - roles: - - database - - agent - platform: el-5-i386 - template: redhat-5-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-5-32mda b/acceptance/config/nodes/pe/redhat-5-32mda deleted file mode 100644 index a4704bbcef..0000000000 --- a/acceptance/config/nodes/pe/redhat-5-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - redhat-5-i386: - roles: - - master - - dashboard - - database - - agent - platform: el-5-i386 - template: redhat-5-i386 - hypervisor: vcloud - redhat-5-i386-agent: - roles: - - agent - platform: el-5-i386 - template: redhat-5-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-5-64ma-64da-64da b/acceptance/config/nodes/pe/redhat-5-64ma-64da-64da deleted file mode 100644 index eeaa242bd1..0000000000 --- a/acceptance/config/nodes/pe/redhat-5-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - redhat-5-x86_64-master: - roles: - - master - - agent - platform: el-5-x86_64 - template: redhat-5-x86_64 - hypervisor: vcloud - redhat-5-x86_64-dashboard: - roles: - - dashboard - - agent - platform: el-5-x86_64 - template: redhat-5-x86_64 - hypervisor: vcloud - redhat-5-x86_64-database: - roles: - - database - - agent - platform: el-5-x86_64 - template: redhat-5-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-5-64mda b/acceptance/config/nodes/pe/redhat-5-64mda deleted file mode 100644 index 245fdf9457..0000000000 --- a/acceptance/config/nodes/pe/redhat-5-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - redhat-5-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-5-x86_64 - template: redhat-5-x86_64 - hypervisor: vcloud - redhat-5-x86_64-agent: - roles: - - agent - platform: el-5-x86_64 - template: redhat-5-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-6-32ma-32da-32da b/acceptance/config/nodes/pe/redhat-6-32ma-32da-32da deleted file mode 100644 index 842bd83af2..0000000000 --- a/acceptance/config/nodes/pe/redhat-6-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - redhat-6-i386-master: - roles: - - master - - agent - platform: el-6-i386 - template: redhat-6-i386 - hypervisor: vcloud - redhat-6-i386-dashboard: - roles: - - dashboard - - agent - platform: el-6-i386 - template: redhat-6-i386 - hypervisor: vcloud - redhat-6-i386-database: - roles: - - database - - agent - platform: el-6-i386 - template: redhat-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-6-32mda b/acceptance/config/nodes/pe/redhat-6-32mda deleted file mode 100644 index 9c6af2a950..0000000000 --- a/acceptance/config/nodes/pe/redhat-6-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - redhat-6-i386: - roles: - - master - - dashboard - - database - - agent - platform: el-6-i386 - template: redhat-6-i386 - hypervisor: vcloud - redhat-6-i386-agent: - roles: - - agent - platform: el-6-i386 - template: redhat-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-6-64ma-64da-64da b/acceptance/config/nodes/pe/redhat-6-64ma-64da-64da deleted file mode 100644 index 38b8d40de5..0000000000 --- a/acceptance/config/nodes/pe/redhat-6-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - redhat-6-x86_64-master: - roles: - - master - - agent - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud - redhat-6-x86_64-dashboard: - roles: - - dashboard - - agent - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud - redhat-6-x86_64-database: - roles: - - database - - agent - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/redhat-6-64mda b/acceptance/config/nodes/pe/redhat-6-64mda deleted file mode 100644 index 62bfde9cc4..0000000000 --- a/acceptance/config/nodes/pe/redhat-6-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - redhat-6-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud - redhat-6-x86_64-agent: - roles: - - agent - platform: el-6-x86_64 - template: redhat-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-5-32ma-32da-32da b/acceptance/config/nodes/pe/scientific-5-32ma-32da-32da deleted file mode 100644 index f913e626ac..0000000000 --- a/acceptance/config/nodes/pe/scientific-5-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - scientific-5-i386-master: - roles: - - master - - agent - platform: el-5-i386 - template: scientific-5-i386 - hypervisor: vcloud - scientific-5-i386-dashboard: - roles: - - dashboard - - agent - platform: el-5-i386 - template: scientific-5-i386 - hypervisor: vcloud - scientific-5-i386-database: - roles: - - database - - agent - platform: el-5-i386 - template: scientific-5-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-5-32mda b/acceptance/config/nodes/pe/scientific-5-32mda deleted file mode 100644 index d4d059e656..0000000000 --- a/acceptance/config/nodes/pe/scientific-5-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - scientific-5-i386: - roles: - - master - - dashboard - - database - - agent - platform: el-5-i386 - template: scientific-5-i386 - hypervisor: vcloud - scientific-5-i386-agent: - roles: - - agent - platform: el-5-i386 - template: scientific-5-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-5-64ma-64da-64da b/acceptance/config/nodes/pe/scientific-5-64ma-64da-64da deleted file mode 100644 index 7d4bf76fea..0000000000 --- a/acceptance/config/nodes/pe/scientific-5-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - scientific-5-x86_64-master: - roles: - - master - - agent - platform: el-5-x86_64 - template: scientific-5-x86_64 - hypervisor: vcloud - scientific-5-x86_64-dashboard: - roles: - - dashboard - - agent - platform: el-5-x86_64 - template: scientific-5-x86_64 - hypervisor: vcloud - scientific-5-x86_64-database: - roles: - - database - - agent - platform: el-5-x86_64 - template: scientific-5-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-5-64mda b/acceptance/config/nodes/pe/scientific-5-64mda deleted file mode 100644 index 0867ac720b..0000000000 --- a/acceptance/config/nodes/pe/scientific-5-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - scientific-5-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-5-x86_64 - template: scientific-5-x86_64 - hypervisor: vcloud - scientific-5-x86_64-agent: - roles: - - agent - platform: el-5-x86_64 - template: scientific-5-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-6-32ma-32da-32da b/acceptance/config/nodes/pe/scientific-6-32ma-32da-32da deleted file mode 100644 index f39aa10a00..0000000000 --- a/acceptance/config/nodes/pe/scientific-6-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - scientific-6-i386-master: - roles: - - master - - agent - platform: el-6-i386 - template: scientific-6-i386 - hypervisor: vcloud - scientific-6-i386-dashboard: - roles: - - dashboard - - agent - platform: el-6-i386 - template: scientific-6-i386 - hypervisor: vcloud - scientific-6-i386-database: - roles: - - database - - agent - platform: el-6-i386 - template: scientific-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-6-32mda b/acceptance/config/nodes/pe/scientific-6-32mda deleted file mode 100644 index e28e6ac94e..0000000000 --- a/acceptance/config/nodes/pe/scientific-6-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - scientific-6-i386: - roles: - - master - - dashboard - - database - - agent - platform: el-6-i386 - template: scientific-6-i386 - hypervisor: vcloud - scientific-6-i386-agent: - roles: - - agent - platform: el-6-i386 - template: scientific-6-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-6-64ma-64da-64da b/acceptance/config/nodes/pe/scientific-6-64ma-64da-64da deleted file mode 100644 index c45c3affd5..0000000000 --- a/acceptance/config/nodes/pe/scientific-6-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - scientific-6-x86_64-master: - roles: - - master - - agent - platform: el-6-x86_64 - template: scientific-6-x86_64 - hypervisor: vcloud - scientific-6-x86_64-dashboard: - roles: - - dashboard - - agent - platform: el-6-x86_64 - template: scientific-6-x86_64 - hypervisor: vcloud - scientific-6-x86_64-database: - roles: - - database - - agent - platform: el-6-x86_64 - template: scientific-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/scientific-6-64mda b/acceptance/config/nodes/pe/scientific-6-64mda deleted file mode 100644 index 6ad577dd84..0000000000 --- a/acceptance/config/nodes/pe/scientific-6-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - scientific-6-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: el-6-x86_64 - template: scientific-6-x86_64 - hypervisor: vcloud - scientific-6-x86_64-agent: - roles: - - agent - platform: el-6-x86_64 - template: scientific-6-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/sles-11-32ma-32da-32da b/acceptance/config/nodes/pe/sles-11-32ma-32da-32da deleted file mode 100644 index 83e54654bd..0000000000 --- a/acceptance/config/nodes/pe/sles-11-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - sles-11-i386-master: - roles: - - master - - agent - platform: sles-11-i386 - template: sles-11-i386 - hypervisor: vcloud - sles-11-i386-dashboard: - roles: - - dashboard - - agent - platform: sles-11-i386 - template: sles-11-i386 - hypervisor: vcloud - sles-11-i386-database: - roles: - - database - - agent - platform: sles-11-i386 - template: sles-11-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/sles-11-32mda b/acceptance/config/nodes/pe/sles-11-32mda deleted file mode 100644 index ab028262f2..0000000000 --- a/acceptance/config/nodes/pe/sles-11-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - sles-11-i386: - roles: - - master - - dashboard - - database - - agent - platform: sles-11-i386 - template: sles-11-i386 - hypervisor: vcloud - sles-11-i386-agent: - roles: - - agent - platform: sles-11-i386 - template: sles-11-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/sles-11-64ma-64da-64da b/acceptance/config/nodes/pe/sles-11-64ma-64da-64da deleted file mode 100644 index 4490469cca..0000000000 --- a/acceptance/config/nodes/pe/sles-11-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - sles-11-x86_64-master: - roles: - - master - - agent - platform: sles-11-x86_64 - template: sles-11-x86_64 - hypervisor: vcloud - sles-11-x86_64-dashboard: - roles: - - dashboard - - agent - platform: sles-11-x86_64 - template: sles-11-x86_64 - hypervisor: vcloud - sles-11-x86_64-database: - roles: - - database - - agent - platform: sles-11-x86_64 - template: sles-11-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/sles-11-64mda b/acceptance/config/nodes/pe/sles-11-64mda deleted file mode 100644 index 6ba41e34bd..0000000000 --- a/acceptance/config/nodes/pe/sles-11-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - sles-11-x86_64: - roles: - - master - - dashboard - - database - - agent - platform: sles-11-x86_64 - template: sles-11-x86_64 - hypervisor: vcloud - sles-11-x86_64-agent: - roles: - - agent - platform: sles-11-x86_64 - template: sles-11-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/solaris-10-64a b/acceptance/config/nodes/pe/solaris-10-64a deleted file mode 100644 index 60818028e3..0000000000 --- a/acceptance/config/nodes/pe/solaris-10-64a +++ /dev/null @@ -1,18 +0,0 @@ -HOSTS: - master: - roles: - - master - platform: el-7-x86_64 - hypervisor: vcloud - template: redhat-7-x86_64 - agent: - roles: - - agent - platform: solaris-10-x86_64 - hypervisor: vcloud - template: solaris-10-x86_64 -CONFIG: - datastore: instance0 - resourcepool: delivery/Quality Assurance/FOSS/Dynamic - folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/pe/solaris-11-64a b/acceptance/config/nodes/pe/solaris-11-64a deleted file mode 100644 index 97d1189218..0000000000 --- a/acceptance/config/nodes/pe/solaris-11-64a +++ /dev/null @@ -1,18 +0,0 @@ -HOSTS: - master: - roles: - - master - platform: el-7-x86_64 - hypervisor: vcloud - template: redhat-7-x86_64 - agent: - roles: - - agent - platform: solaris-11-x86_64 - hypervisor: vcloud - template: solaris-11-x86_64 -CONFIG: - datastore: instance0 - resourcepool: delivery/Quality Assurance/FOSS/Dynamic - folder: Delivery/Quality Assurance/FOSS/Dynamic - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da b/acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da deleted file mode 100644 index f06acf5630..0000000000 --- a/acceptance/config/nodes/pe/ubuntu-1004-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - ubuntu-1004-i386-master: - roles: - - master - - agent - platform: ubuntu-10.04-i386 - template: ubuntu-1004-i386 - hypervisor: vcloud - ubuntu-1004-i386-dashboard: - roles: - - dashboard - - agent - platform: ubuntu-10.04-i386 - template: ubuntu-1004-i386 - hypervisor: vcloud - ubuntu-1004-i386-database: - roles: - - database - - agent - platform: ubuntu-10.04-i386 - template: ubuntu-1004-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1004-32mda b/acceptance/config/nodes/pe/ubuntu-1004-32mda deleted file mode 100644 index 420904873c..0000000000 --- a/acceptance/config/nodes/pe/ubuntu-1004-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - ubuntu-1004-i386: - roles: - - master - - dashboard - - database - - agent - platform: ubuntu-10.04-i386 - template: ubuntu-1004-i386 - hypervisor: vcloud - ubuntu-1004-agent: - roles: - - agent - platform: ubuntu-10.04-i386 - template: ubuntu-1004-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da b/acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da deleted file mode 100644 index f3e1824d58..0000000000 --- a/acceptance/config/nodes/pe/ubuntu-1004-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - ubuntu-1004-amd64-master: - roles: - - master - - agent - platform: ubuntu-10.04-amd64 - template: ubuntu-1004-x86_64 - hypervisor: vcloud - ubuntu-1004-amd64-dashboard: - roles: - - dashboard - - agent - platform: ubuntu-10.04-amd64 - template: ubuntu-1004-x86_64 - hypervisor: vcloud - ubuntu-1004-amd64-database: - roles: - - database - - agent - platform: ubuntu-10.04-amd64 - template: ubuntu-1004-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1004-64mda b/acceptance/config/nodes/pe/ubuntu-1004-64mda deleted file mode 100644 index d0be005c7a..0000000000 --- a/acceptance/config/nodes/pe/ubuntu-1004-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - ubuntu-1004-amd64: - roles: - - master - - dashboard - - database - - agent - platform: ubuntu-10.04-amd64 - template: ubuntu-1004-x86_64 - hypervisor: vcloud - ubuntu-1004-agent: - roles: - - agent - platform: ubuntu-10.04-amd64 - template: ubuntu-1004-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da b/acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da deleted file mode 100644 index 40519c3533..0000000000 --- a/acceptance/config/nodes/pe/ubuntu-1204-32ma-32da-32da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - ubuntu-1204-i386-master: - roles: - - master - - agent - platform: ubuntu-12.04-i386 - template: ubuntu-1204-i386 - hypervisor: vcloud - ubuntu-1204-i386-dashboard: - roles: - - dashboard - - agent - platform: ubuntu-12.04-i386 - template: ubuntu-1204-i386 - hypervisor: vcloud - ubuntu-1204-i386-database: - roles: - - database - - agent - platform: ubuntu-12.04-i386 - template: ubuntu-1204-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1204-32mda b/acceptance/config/nodes/pe/ubuntu-1204-32mda deleted file mode 100644 index 79ec14211c..0000000000 --- a/acceptance/config/nodes/pe/ubuntu-1204-32mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - ubuntu-1204-i386: - roles: - - master - - dashboard - - database - - agent - platform: ubuntu-12.04-i386 - template: ubuntu-1204-i386 - hypervisor: vcloud - ubuntu-1204-agent: - roles: - - agent - platform: ubuntu-12.04-i386 - template: ubuntu-1204-i386 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da b/acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da deleted file mode 100644 index 8e87ac8547..0000000000 --- a/acceptance/config/nodes/pe/ubuntu-1204-64ma-64da-64da +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - ubuntu-1204-amd64-master: - roles: - - master - - agent - platform: ubuntu-12.04-amd64 - template: ubuntu-1204-x86_64 - hypervisor: vcloud - ubuntu-1204-amd64-dashboard: - roles: - - dashboard - - agent - platform: ubuntu-12.04-amd64 - template: ubuntu-1204-x86_64 - hypervisor: vcloud - ubuntu-1204-amd64-database: - roles: - - database - - agent - platform: ubuntu-12.04-amd64 - template: ubuntu-1204-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/pe/ubuntu-1204-64mda b/acceptance/config/nodes/pe/ubuntu-1204-64mda deleted file mode 100644 index 9379fa8f4a..0000000000 --- a/acceptance/config/nodes/pe/ubuntu-1204-64mda +++ /dev/null @@ -1,22 +0,0 @@ -HOSTS: - ubuntu-1204-amd64: - roles: - - master - - dashboard - - database - - agent - platform: ubuntu-12.04-amd64 - template: ubuntu-1204-x86_64 - hypervisor: vcloud - ubuntu-1204-agent: - roles: - - agent - platform: ubuntu-12.04-amd64 - template: ubuntu-1204-x86_64 - hypervisor: vcloud -CONFIG: - nfs_server: none - consoleport: 443 - datastore: instance0 - folder: Delivery/Quality Assurance/Enterprise/Dynamic - resourcepool: delivery/Quality Assurance/Enterprise/Dynamic diff --git a/acceptance/config/nodes/solaris-10-sparc.yaml b/acceptance/config/nodes/solaris-10-sparc.yaml deleted file mode 100644 index d41d858307..0000000000 --- a/acceptance/config/nodes/solaris-10-sparc.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -HOSTS: - master: - roles: - - master - platform: el-7-x86_64 - hypervisor: vmpooler - template: redhat-7-x86_64 - solaris-10-sparc: - roles: - - agent - platform: solaris-10-sparc - hypervisor: none - ip: 10.32.121.124 - vmhostname: sol10-1.delivery.puppetlabs.net -CONFIG: - pooling_api: http://vmpooler.delivery.puppetlabs.net/ diff --git a/acceptance/config/nodes/solaris-11-sparc.yaml b/acceptance/config/nodes/solaris-11-sparc.yaml deleted file mode 100644 index 54895dd96a..0000000000 --- a/acceptance/config/nodes/solaris-11-sparc.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -HOSTS: - master: - roles: - - master - platform: el-7-x86_64 - hypervisor: vmpooler - template: redhat-7-x86_64 - solaris-11-sparc: - roles: - - agent - platform: solaris-11-sparc - hypervisor: none - ip: 10.32.114.245 - vmhostname: sol11-1.delivery.puppetlabs.net -CONFIG: - pooling_api: http://vmpooler.delivery.puppetlabs.net/ From 8fbb4464fbe98b2573d32b51efbfa955fef4c23c Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Tue, 18 Aug 2026 12:52:23 -0500 Subject: [PATCH 3/3] puppet generate: print module directory when types are missing When `puppet generate types` is run, it scans the `modulepath` in an environment and compiles environment-isolated implementations for each module that contains a `puppet/type/` sub-directory. When run with debug logging enabled, the command prints the name of each module skipped due to the types sub-directory not being visible. This commit updates the debug-level message to add the path to the module directory that was examined. Module discovery is done by walking the `modulepath`, which is a prioritized list of locations that modules can be loaded from. Including the directory path in the debug message gives users a signal that can indicate when a module has been shadowed by another directory with the same name, but higher precedence on the `modulepath`. Signed-off-by: Charlie Sharpsteen --- lib/puppet/generate/type.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/generate/type.rb b/lib/puppet/generate/type.rb index 53fbc757ad..aa95588cac 100644 --- a/lib/puppet/generate/type.rb +++ b/lib/puppet/generate/type.rb @@ -124,7 +124,7 @@ def self.find_inputs(format = :pcore, environment = Puppet.lookup(:current_envir environment.modules.each do |mod| directory = File.join(Puppet::Util::Autoload.cleanpath(mod.plugin_directory), 'puppet', 'type') unless Puppet::FileSystem.exist?(directory) - Puppet.debug "Skipping '#{mod.name}' module because it contains no custom types." + Puppet.debug "Skipping '#{mod.name}' module because there is no readable puppet/type/ directory under: #{directory}" next end